@financial-times/cp-content-pipeline-schema 3.7.3 → 3.9.0

package/lib/resolvers/list.d.ts

@@ -1,14 +1,14 @@
 declare const _default: {
     List: {
-        id: (parent: import("../model/CapiList").CapiList) => string;
-        apiUrl: (parent: import("../model/CapiList").CapiList) => string;
-        title: (parent: import("../model/CapiList").CapiList) => string;
-        items: (parent: import("../model/CapiList").CapiList) => Promise<import("../model/CapiResponse").CapiResponse[]>;
-        listType: (parent: import("../model/CapiList").CapiList) => "OpinionAnalysis" | "Promotional" | "Recommended" | "TopStories" | "TopStoriesBeta" | "KeyDevelopments";
-        publishedDate: (parent: import("../model/CapiList").CapiList) => string;
-        layoutHint: (parent: import("../model/CapiList").CapiList) => "landscape" | "standaloneimage" | "bigstory" | "assassination" | null;
-        publication: (parent: import("../model/CapiList").CapiList) => string[] | null;
-        publishReference: (parent: import("../model/CapiList").CapiList) => string | null;
+        id: (parent: import("../model/List").List) => string;
+        apiUrl: (parent: import("../model/List").List) => string;
+        title: (parent: import("../model/List").List) => string;
+        items: (parent: import("../model/List").List) => Promise<import("../model/Content").Content[]>;
+        listType: (parent: import("../model/List").List) => "OpinionAnalysis" | "Promotional" | "Recommended" | "TopStories" | "TopStoriesBeta" | "KeyDevelopments";
+        publishedDate: (parent: import("../model/List").List) => string;
+        layoutHint: (parent: import("../model/List").List) => "landscape" | "standaloneimage" | "bigstory" | "assassination" | null;
+        publication: (parent: import("../model/List").List) => string[] | null;
+        publishReference: (parent: import("../model/List").List) => string | null;
     };
 };
 export default _default;

package/lib/resolvers/teaser.d.ts

@@ -1,13 +1,13 @@
 declare const resolvers: {
     Teaser: {
-        url: (parent: import("../model/CapiResponse").CapiResponse, args: Partial<import("../generated").TeaserUrlArgs>) => Promise<string>;
-        type: (parent: import("../model/CapiResponse").CapiResponse) => string;
-        metaLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | import("../model/CapiResponse").CapiResponse | null>;
-        metaAltLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | null>;
-        metaPrefixText: (parent: import("../model/CapiResponse").CapiResponse) => Promise<string | null>;
+        url: (parent: import("../model/Content").Content, args: Partial<import("../generated").TeaserUrlArgs>) => Promise<string>;
+        type: (parent: import("../model/Content").Content) => string;
+        metaLink: (parent: import("../model/Content").Content) => Promise<import("../model/Concept").Concept | import("../model/Content").Content | null>;
+        metaAltLink: (parent: import("../model/Content").Content) => Promise<import("../model/Concept").Concept | null>;
+        metaPrefixText: (parent: import("../model/Content").Content) => Promise<string | null>;
         metaSuffixText: () => null;
-        image: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Image").CAPIImage | null;
-        indicators(parent: import("../model/CapiResponse").CapiResponse): {
+        image: (parent: import("../model/Content").Content) => import("../model/Image").CAPIImage | null;
+        indicators(parent: import("../model/Content").Content): {
             accessLevel: "premium" | "subscribed" | "registered" | "free";
             isOpinion: boolean;
             isColumn: boolean;
@@ -15,13 +15,14 @@ declare const resolvers: {
             isEditorsChoice: boolean;
             isExclusive: boolean;
             isScoop: boolean;
+            isFTEdit: boolean;
         };
-        standfirst: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
-        firstPublishedDate: (parent: import("../model/CapiResponse").CapiResponse) => string;
-        id: (parent: import("../model/CapiResponse").CapiResponse) => string;
-        publishedDate: (parent: import("../model/CapiResponse").CapiResponse) => string;
-        theme: (parent: import("../model/CapiResponse").CapiResponse) => "special-report" | "extra" | "basic" | "extra-wide";
-        title: (parent: import("../model/CapiResponse").CapiResponse) => string;
+        standfirst: (parent: import("../model/Content").Content) => string | null;
+        firstPublishedDate: (parent: import("../model/Content").Content) => string;
+        id: (parent: import("../model/Content").Content) => string;
+        publishedDate: (parent: import("../model/Content").Content) => string;
+        theme: (parent: import("../model/Content").Content) => "special-report" | "extra" | "basic" | "extra-wide";
+        title: (parent: import("../model/Content").Content) => string;
     };
     TeaserIndicators: {
         accessLevel: (parent: import("../generated").TeaserIndicators) => "premium" | "subscribed" | "registered" | "free";
@@ -31,6 +32,7 @@ declare const resolvers: {
         isEditorsChoice: (parent: import("../generated").TeaserIndicators) => boolean | null;
         isExclusive: (parent: import("../generated").TeaserIndicators) => boolean | null;
         isScoop: (parent: import("../generated").TeaserIndicators) => boolean | null;
+        isFTEdit: (parent: import("../generated").TeaserIndicators) => boolean | null;
     };
 };
 export default resolvers;

package/lib/resolvers/teaser.js

@@ -23,6 +23,7 @@ const resolvers = {
                 isEditorsChoice: parent.isEditorsChoice(),
                 isExclusive: parent.isExclusive(),
                 isScoop: parent.isScoop(),
+                isFTEdit: parent.isFTEdit(),
             };
         },
         standfirst: (parent) => parent.standfirst(),
@@ -40,6 +41,7 @@ const resolvers = {
         isEditorsChoice: (parent) => parent.isEditorsChoice ?? null,
         isExclusive: (parent) => parent.isExclusive ?? null,
         isScoop: (parent) => parent.isScoop ?? null,
+        isFTEdit: (parent) => parent.isFTEdit ?? null,
     },
 };
 exports.default = resolvers;

package/lib/resolvers/teaser.js.map

@@ -1 +1 @@
-{"version":3,"file":"teaser.js","sourceRoot":"","sources":["../../src/resolvers/teaser.ts"],"names":[],"mappings":";;AAEA,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE;QACN,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QACvC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CACf,MAAM;aACH,IAAI,EAAE;aACN,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;aACzD,KAAK,CAAC,CAAC,CAAC;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvC,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QAC7C,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QACnD,sEAAsE;QACtE,6DAA6D;QAC7D,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;QAC1B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QACvC,UAAU,CAAC,MAAM;YACf,OAAO;gBACL,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;gBACjC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;gBAC7B,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE;gBACzC,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;gBACjC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;aAC1B,CAAA;QACH,CAAC;QACD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QAC3C,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE;QAC3D,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;QAC3B,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QACjD,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK;QACxC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;KAClC;IACD,gBAAgB,EAAE;QAChB,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW;QAC3C,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;QAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI;QAC7C,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;QAC/C,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,IAAI,IAAI;QAC3D,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI;QACnD,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI;KAC5C;CAIF,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"teaser.js","sourceRoot":"","sources":["../../src/resolvers/teaser.ts"],"names":[],"mappings":";;AAEA,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE;QACN,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QACvC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CACf,MAAM;aACH,IAAI,EAAE;aACN,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;aACzD,KAAK,CAAC,CAAC,CAAC;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvC,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QAC7C,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QACnD,sEAAsE;QACtE,6DAA6D;QAC7D,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI;QAC1B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QACvC,UAAU,CAAC,MAAM;YACf,OAAO;gBACL,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;gBACjC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;gBAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;gBAC7B,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE;gBACzC,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;gBACjC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC5B,CAAA;QACH,CAAC;QACD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QAC3C,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE;QAC3D,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;QAC3B,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QACjD,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK;QACxC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;KAClC;IACD,gBAAgB,EAAE;QAChB,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW;QAC3C,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;QAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI;QAC7C,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;QAC/C,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,IAAI,IAAI;QAC3D,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI;QACnD,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI;QAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI;KAC9C;CAIF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/package.json

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

package/queries/article.graphql

@@ -63,6 +63,7 @@ fragment Teaser on Teaser {
     isEditorsChoice
     isExclusive
     isScoop
+    isFTEdit
   }
 }
 
@@ -506,6 +507,7 @@ fragment Media on Media {
 
 fragment Indicators on Indicators {
   isOpinion
+  isFTEdit
 }
 
 fragment BylineAuthor on AuthorReference {
@@ -649,12 +651,16 @@ fragment ArticleFields on Content {
     clientName
     indicators {
       isPartnerContent
+      isFTEdit
     }
   }
   ... on Placeholder {
     containedIn {
       ...PackageContainer
     }
+    indicators {
+      isFTEdit
+    }
   }
   ... on LiveBlogPost {
     containedIn {
@@ -687,17 +693,31 @@ fragment ArticleFields on Content {
       ...PinnedPost
     }
     realtime
+    indicators {
+      isFTEdit
+    }
   }
   ... on ContentPackage {
     contains {
       ...Teaser
       standfirst
     }
+    indicators {
+      isFTEdit
+    }
   }
   ... on Audio {
     media {
       ...Media
     }
+    indicators {
+      isFTEdit
+    }
+  }
+  ... on Video {
+    indicators {
+      isFTEdit
+    }
   }
 }
 

package/src/datasources/capi.test.ts

@@ -2,7 +2,7 @@ import { Logger } from '@dotcom-reliability-kit/logger'
 import { CapiDataSource } from './capi'
 import { QueryContext } from '..'
 import { KeyValueCache } from '@apollo/utils.keyvaluecache'
-import { CapiResponse } from '../model/CapiResponse'
+import { Content } from '../model/Content'
 import { ContentTypeSchemas } from '../model/schemas/capi/internal-content'
 
 const logger = new Logger()
@@ -38,10 +38,10 @@ describe('CapiDataSource', () => {
     )
 
     jest
-      .spyOn(CapiResponse, 'fromJSON')
+      .spyOn(Content, 'fromJSON')
       .mockImplementation(
         (content, context) =>
-          new CapiResponse(content as ContentTypeSchemas, context)
+          new Content(content as ContentTypeSchemas, context)
       )
   })
 

package/src/datasources/capi.ts

@@ -1,11 +1,11 @@
-import { CapiResponse } from '../model/CapiResponse'
+import { Content } from '../model/Content'
 import { InstrumentedRESTDataSource } from './instrumented'
 import { AugmentedRequest } from '@apollo/datasource-rest'
 import {
   KeyValueCache,
   PrefixingKeyValueCache,
 } from '@apollo/utils.keyvaluecache'
-import { CapiList } from '../model/CapiList'
+import { List } from '../model/List'
 import { Person } from '../model/Person'
 
 const REQUEST_TIMEOUT = process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT
@@ -46,10 +46,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     request.headers['x-api-key'] = this.capiKey
   }
 
-  async getContent(
-    uuid: string,
-    packageContainer?: CapiResponse
-  ): Promise<CapiResponse> {
+  async getContent(uuid: string, packageContainer?: Content): Promise<Content> {
     this.context.addSurrogateKeys([
       {
         prefix: 'contentPipelineArticle',
@@ -63,7 +60,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     this.context.contentRequestedOnce = true
     this.calls.push(uuid)
 
-    return CapiResponse.fromJSON(content, this.context, packageContainer)
+    return Content.fromJSON(content, this.context, packageContainer)
   }
 
   async getPerson(uuid: string): Promise<Person> {
@@ -74,7 +71,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     return Person.fromJson(person, this.context)
   }
 
-  async getList(uuid: string): Promise<CapiList> {
+  async getList(uuid: string): Promise<List> {
     this.context.addSurrogateKeys([
       {
         prefix: 'contentPipelineList',
@@ -83,7 +80,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     ])
 
     const list = await this.get(`lists/${uuid}`)
-    return CapiList.fromJSON(list, this.context)
+    return List.fromJSON(list, this.context)
   }
 
   // replicates the logic implicit in PrefixingKeyValueCache to

package/src/fixtures/dummyContext.ts

@@ -1,4 +1,4 @@
-import { CapiResponse } from '../model/CapiResponse'
+import { Content } from '../model/Content'
 import { baseCapiObject } from './capiObject'
 import cloneDeep from 'clone-deep'
 import { QueryContext } from '..'
@@ -18,7 +18,7 @@ export default {
     capi: {
       getContent: (id: string) =>
         Promise.resolve(
-          new CapiResponse(
+          new Content(
             cloneDeep({
               ...baseCapiObject,
               id,

package/src/generated/index.ts

@@ -1,8 +1,8 @@
 import type { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from 'graphql';
 import type { Concept as ConceptModel } from '../model/Concept';
 import type { Person as PersonModel } from '../model/Person';
-import type { CapiList } from '../model/CapiList';
-import type { CapiResponse } from '../model/CapiResponse';
+import type { List as ListModel } from '../model/List';
+import type { Content as ContentModel } from '../model/Content';
 import type { Image as ImageModel } from '../model/Image';
 import type { Clip as ClipModel } from '../model/Clip';
 import type { Picture as PictureModel } from '../model/Picture';
@@ -168,6 +168,8 @@ export type Audio = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
+  /** An object of several flags indicating the nature of the content, eg. if it's in an FT Edit edition */
+  readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
@@ -558,6 +560,8 @@ export type ContentPackage = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
+  /** An object of several flags indicating the nature of the content, eg. if it's in an FT Edit edition */
+  readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
@@ -1050,6 +1054,8 @@ export type ImageWideSourceSetArgs = {
 };
 
 export type Indicators = {
+  /** Whether the article is included in an FT Edit editorial curation. */
+  readonly isFTEdit?: Maybe<Scalars['Boolean']['output']>;
   /** Whether the content is an opinion piece. */
   readonly isOpinion?: Maybe<Scalars['Boolean']['output']>;
   /** Whether the content is Commercial Partner Content. */
@@ -1121,6 +1127,8 @@ export type LiveBlogPackage = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
+  /** An object of flags indicating the nature of the content, eg. if it's in an FT Edit edition */
+  readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
   /** The child articles of this live blog package. */
@@ -1220,7 +1228,7 @@ export type LiveBlogPost = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
-  /** An object indicating whether the article is an opinion piece. */
+  /** An object of several flags indicating the nature of the content, eg. if it's in an FT Edit edition */
   readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
@@ -1481,6 +1489,8 @@ export type Placeholder = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
+  /** An object of several flags indicating the nature of the content, eg. if it's in an FT Edit edition */
+  readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
@@ -1718,6 +1728,8 @@ export type TeaserIndicators = {
   readonly isEditorsChoice?: Maybe<Scalars['Boolean']['output']>;
   /** Whether the teaser is exclusive. */
   readonly isExclusive?: Maybe<Scalars['Boolean']['output']>;
+  /** Whether the article is included in an FT Edit editorial curation. */
+  readonly isFTEdit?: Maybe<Scalars['Boolean']['output']>;
   /** Whether the teaser is an opinion piece. */
   readonly isOpinion?: Maybe<Scalars['Boolean']['output']>;
   /** Whether the teaser is a podcast. */
@@ -1844,6 +1856,8 @@ export type Video = Content & {
   readonly firstPublishedDate: Scalars['String']['output'];
   /** The unique identifier of the article -  a uuid or a url. */
   readonly id: Scalars['ID']['output'];
+  /** An object of several flags indicating the nature of the content, eg. if it's in an FT Edit edition */
+  readonly indicators?: Maybe<Indicators>;
   /** The concept to use for instant alert CTAs. */
   readonly instantAlertConcept?: Maybe<Concept>;
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
@@ -1967,13 +1981,13 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 
 /** Mapping of union types */
 export type ResolversUnionTypes<RefType extends Record<string, unknown>> = ResolversObject<{
-  MetaLink: ( ConceptModel ) | ( CapiResponse );
+  MetaLink: ( ConceptModel ) | ( ContentModel );
 }>;
 
 /** Mapping of interface types */
 export type ResolversInterfaceTypes<RefType extends Record<string, unknown>> = ResolversObject<{
   ConceptInterface: ( ConceptModel ) | ( ConceptModel );
-  Content: ( CapiResponse ) | ( CapiResponse ) | ( CapiResponse ) | ( CapiResponse ) | ( CapiResponse ) | ( CapiResponse ) | ( CapiResponse );
+  Content: ( ContentModel ) | ( ContentModel ) | ( ContentModel ) | ( ContentModel ) | ( ContentModel ) | ( ContentModel ) | ( ContentModel );
   Image: ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel ) | ( ImageModel );
   Picture: ( PictureModel ) | ( PictureModel ) | ( PictureModel );
   Reference: ( ReferenceWithCAPIData<AuthorNode> ) | ( ReferenceWithCAPIData<ClipSetNode|OldClipNode> ) | ( ReferenceWithCAPIData<ContentTree.CustomCodeComponent> ) | ( 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> );
@@ -1991,8 +2005,8 @@ export type ResolversTypes = ResolversObject<{
   Accessibility: ResolverTypeWrapper<Omit<Accessibility, 'transcript'> & { transcript: Maybe<ResolversTypes['RichText']> }>;
   AltStandfirst: ResolverTypeWrapper<AltStandfirst>;
   AltTitle: ResolverTypeWrapper<AltTitle>;
-  Article: ResolverTypeWrapper<CapiResponse>;
-  Audio: ResolverTypeWrapper<CapiResponse>;
+  Article: ResolverTypeWrapper<ContentModel>;
+  Audio: ResolverTypeWrapper<ContentModel>;
   Author: ResolverTypeWrapper<ConceptModel>;
   AuthorReference: ResolverTypeWrapper<ReferenceWithCAPIData<AuthorNode>>;
   BasicTopper: ResolverTypeWrapper<TopperModel>;
@@ -2009,7 +2023,7 @@ export type ResolversTypes = ResolversObject<{
   Content: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Content']>;
   ContentConnection: ResolverTypeWrapper<Omit<ContentConnection, 'edges'> & { edges: ReadonlyArray<Maybe<ResolversTypes['ContentEdge']>> }>;
   ContentEdge: ResolverTypeWrapper<Omit<ContentEdge, 'node'> & { node: Maybe<ResolversTypes['Content']> }>;
-  ContentPackage: ResolverTypeWrapper<CapiResponse>;
+  ContentPackage: ResolverTypeWrapper<ContentModel>;
   ContentType: ResolverTypeWrapper<Scalars['ContentType']['output']>;
   CustomCodeComponent: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.CustomCodeComponent>>;
   DeepLandscapeTopper: ResolverTypeWrapper<TopperModel>;
@@ -2041,10 +2055,10 @@ export type ResolversTypes = ResolversObject<{
   LayoutHint: ResolverTypeWrapper<Scalars['LayoutHint']['output']>;
   LayoutImage: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.LayoutImage>>;
   LeadFlourish: ResolverTypeWrapper<LeadFlourishModel>;
-  List: ResolverTypeWrapper<CapiList>;
+  List: ResolverTypeWrapper<ListModel>;
   ListType: ResolverTypeWrapper<Scalars['ListType']['output']>;
-  LiveBlogPackage: ResolverTypeWrapper<CapiResponse>;
-  LiveBlogPost: ResolverTypeWrapper<CapiResponse>;
+  LiveBlogPackage: ResolverTypeWrapper<ContentModel>;
+  LiveBlogPost: ResolverTypeWrapper<ContentModel>;
   MainImage: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.ImageSet>>;
   Media: ResolverTypeWrapper<Media>;
   MetaLink: ResolverTypeWrapper<ResolversUnionTypes<ResolversTypes>['MetaLink']>;
@@ -2058,7 +2072,7 @@ export type ResolversTypes = ResolversObject<{
   PictureFullBleed: ResolverTypeWrapper<PictureModel>;
   PictureInline: ResolverTypeWrapper<PictureModel>;
   PictureStandard: ResolverTypeWrapper<PictureModel>;
-  Placeholder: ResolverTypeWrapper<CapiResponse>;
+  Placeholder: ResolverTypeWrapper<ContentModel>;
   PodcastTopper: ResolverTypeWrapper<TopperModel>;
   Query: ResolverTypeWrapper<{}>;
   RawImage: ResolverTypeWrapper<ReferenceWithCAPIData<RawImageNode>>;
@@ -2071,7 +2085,7 @@ export type ResolversTypes = ResolversObject<{
   String: ResolverTypeWrapper<Scalars['String']['output']>;
   StructuredContent: ResolverTypeWrapper<Omit<StructuredContent, 'references'> & { references: ReadonlyArray<ResolversTypes['Reference']> }>;
   TableOfContents: ResolverTypeWrapper<TableOfContents>;
-  Teaser: ResolverTypeWrapper<CapiResponse>;
+  Teaser: ResolverTypeWrapper<ContentModel>;
   TeaserIndicators: ResolverTypeWrapper<TeaserIndicators>;
   Topper: ResolverTypeWrapper<TopperModel>;
   TopperBackgroundColour: ResolverTypeWrapper<Scalars['TopperBackgroundColour']['output']>;
@@ -2082,7 +2096,7 @@ export type ResolversTypes = ResolversObject<{
   TopperWithPackage: ResolverTypeWrapper<TopperModel>;
   TopperWithTheme: ResolverTypeWrapper<TopperModel>;
   Tweet: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.Tweet>>;
-  Video: ResolverTypeWrapper<CapiResponse>;
+  Video: ResolverTypeWrapper<ContentModel>;
   VideoReference: ResolverTypeWrapper<ReferenceWithCAPIData<VideoNode>>;
 }>;
 
@@ -2092,8 +2106,8 @@ export type ResolversParentTypes = ResolversObject<{
   Accessibility: Omit<Accessibility, 'transcript'> & { transcript: Maybe<ResolversParentTypes['RichText']> };
   AltStandfirst: AltStandfirst;
   AltTitle: AltTitle;
-  Article: CapiResponse;
-  Audio: CapiResponse;
+  Article: ContentModel;
+  Audio: ContentModel;
   Author: ConceptModel;
   AuthorReference: ReferenceWithCAPIData<AuthorNode>;
   BasicTopper: TopperModel;
@@ -2110,7 +2124,7 @@ export type ResolversParentTypes = ResolversObject<{
   Content: ResolversInterfaceTypes<ResolversParentTypes>['Content'];
   ContentConnection: Omit<ContentConnection, 'edges'> & { edges: ReadonlyArray<Maybe<ResolversParentTypes['ContentEdge']>> };
   ContentEdge: Omit<ContentEdge, 'node'> & { node: Maybe<ResolversParentTypes['Content']> };
-  ContentPackage: CapiResponse;
+  ContentPackage: ContentModel;
   ContentType: Scalars['ContentType']['output'];
   CustomCodeComponent: ReferenceWithCAPIData<ContentTree.CustomCodeComponent>;
   DeepLandscapeTopper: TopperModel;
@@ -2142,10 +2156,10 @@ export type ResolversParentTypes = ResolversObject<{
   LayoutHint: Scalars['LayoutHint']['output'];
   LayoutImage: ReferenceWithCAPIData<ContentTree.LayoutImage>;
   LeadFlourish: LeadFlourishModel;
-  List: CapiList;
+  List: ListModel;
   ListType: Scalars['ListType']['output'];
-  LiveBlogPackage: CapiResponse;
-  LiveBlogPost: CapiResponse;
+  LiveBlogPackage: ContentModel;
+  LiveBlogPost: ContentModel;
   MainImage: ReferenceWithCAPIData<ContentTree.ImageSet>;
   Media: Media;
   MetaLink: ResolversUnionTypes<ResolversParentTypes>['MetaLink'];
@@ -2159,7 +2173,7 @@ export type ResolversParentTypes = ResolversObject<{
   PictureFullBleed: PictureModel;
   PictureInline: PictureModel;
   PictureStandard: PictureModel;
-  Placeholder: CapiResponse;
+  Placeholder: ContentModel;
   PodcastTopper: TopperModel;
   Query: {};
   RawImage: ReferenceWithCAPIData<RawImageNode>;
@@ -2172,7 +2186,7 @@ export type ResolversParentTypes = ResolversObject<{
   String: Scalars['String']['output'];
   StructuredContent: Omit<StructuredContent, 'references'> & { references: ReadonlyArray<ResolversParentTypes['Reference']> };
   TableOfContents: TableOfContents;
-  Teaser: CapiResponse;
+  Teaser: ContentModel;
   TeaserIndicators: TeaserIndicators;
   Topper: TopperModel;
   TopperBackgroundColour: Scalars['TopperBackgroundColour']['output'];
@@ -2183,7 +2197,7 @@ export type ResolversParentTypes = ResolversObject<{
   TopperWithPackage: TopperModel;
   TopperWithTheme: TopperModel;
   Tweet: ReferenceWithCAPIData<ContentTree.Tweet>;
-  Video: CapiResponse;
+  Video: ContentModel;
   VideoReference: ReferenceWithCAPIData<VideoNode>;
 }>;
 
@@ -2255,6 +2269,7 @@ export type AudioResolvers<ContextType = QueryContext, ParentType extends Resolv
   editorialDesk: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   firstPublishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  indicators: Resolver<Maybe<ResolversTypes['Indicators']>, ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
   media: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Media']>>>, ParentType, ContextType>;
@@ -2459,6 +2474,7 @@ export type ContentPackageResolvers<ContextType = QueryContext, ParentType exten
   editorialDesk: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   firstPublishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  indicators: Resolver<Maybe<ResolversTypes['Indicators']>, ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
   modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
@@ -2730,6 +2746,7 @@ export type ImageWideResolvers<ContextType = QueryContext, ParentType extends Re
 }>;
 
 export type IndicatorsResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Indicators'] = ResolversParentTypes['Indicators']> = ResolversObject<{
+  isFTEdit: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isOpinion: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isPartnerContent: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -2788,6 +2805,7 @@ export type LiveBlogPackageResolvers<ContextType = QueryContext, ParentType exte
   editorialDesk: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   firstPublishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  indicators: Resolver<Maybe<ResolversTypes['Indicators']>, ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   liveBlogPosts: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Content']>>>, ParentType, ContextType, Partial<LiveBlogPackageLiveBlogPostsArgs>>;
   liveBlogPostsConnection: Resolver<Maybe<ResolversTypes['ContentConnection']>, ParentType, ContextType, Partial<LiveBlogPackageLiveBlogPostsConnectionArgs>>;
@@ -2974,6 +2992,7 @@ export type PlaceholderResolvers<ContextType = QueryContext, ParentType extends
   editorialDesk: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   firstPublishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  indicators: Resolver<Maybe<ResolversTypes['Indicators']>, ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
   modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
@@ -3103,6 +3122,7 @@ export type TeaserIndicatorsResolvers<ContextType = QueryContext, ParentType ext
   isColumn: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isEditorsChoice: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isExclusive: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  isFTEdit: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isOpinion: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isPodcast: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   isScoop: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
@@ -3189,6 +3209,7 @@ export type VideoResolvers<ContextType = QueryContext, ParentType extends Resolv
   editorialDesk: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   firstPublishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  indicators: Resolver<Maybe<ResolversTypes['Indicators']>, ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
   modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;

package/src/model/Byline.ts

@@ -5,7 +5,7 @@ import {
   Author as AuthorNode,
 } from '../resolvers/content-tree/Workarounds'
 import updateTreeWithReferenceIds from '../resolvers/content-tree/updateTreeWithReferenceIds'
-import { CapiResponse } from './CapiResponse'
+import { Content } from './Content'
 
 export class Byline {
   static normaliseQuotes(str: string) {
@@ -16,7 +16,7 @@ export class Byline {
     private byline: string,
     private vanity: boolean,
     private authors: Concept[],
-    private contentApiData?: CapiResponse
+    private contentApiData?: Content
   ) {}
 
   async buildBylineTree() {