@financial-times/cp-content-pipeline-schema 2.15.1 → 3.0.1

package/lib/resolvers/topper.d.ts

@@ -23,11 +23,11 @@ declare const resolvers: {
         genreConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     TopperWithHeadshot: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => string | Promise<string | null> | null;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").TopperWithHeadshotHeadshotArgs>) => Promise<string | null>;
     };
     PodcastTopper: {
         brandConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => string | Promise<string | null> | null;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => Promise<string | null>;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
@@ -42,7 +42,7 @@ declare const resolvers: {
         textShadow: import("../generated").Resolver<import("../generated").Maybe<import("../generated").ResolverTypeWrapper<boolean>>, import("../model/Topper").Topper, import("..").QueryContext, {}>;
     };
     OpinionTopper: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => string | Promise<string | null> | null;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => Promise<string | null>;
         isLargeHeadline: (topper: import("../model/Topper").Topper) => boolean;
         layout: (topper: import("../model/Topper").Topper) => string;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;

package/package.json

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

package/queries/article.graphql

@@ -1,4 +1,4 @@
-fragment Concept on Concept {
+fragment Concept on ConceptInterface {
   id
   prefLabel
   types
@@ -6,10 +6,22 @@ fragment Concept on Concept {
   directType
   isPackageBrand
   predicate
+
+  ...ConceptURLs
+  ...Author
+}
+
+fragment ConceptURLs on ConceptInterface {
   url(vanity: $useVanities)
   relativeUrl: url(relative: true, vanity: $useVanities)
 }
 
+fragment Author on Author {
+  person {
+    ...Person
+  }
+}
+
 fragment StructuredTree on StructuredContent {
   tree
 }
@@ -17,14 +29,13 @@ fragment StructuredTree on StructuredContent {
 fragment MetaLink on MetaLink {
   ... on Concept {
     id
-    url
-    relativeUrl: url(relative: true)
     prefLabel
+    ...ConceptURLs
   }
   ... on ContentPackage {
     id
-    url
-    relativeUrl: url(relative: true)
+    url: url(vanity: $useVanities)
+    relativeUrl: url(vanity: $useVanities, relative: true)
     prefLabel: title
   }
 }
@@ -82,6 +93,7 @@ fragment Person on Person {
 }
 
 fragment FlourishSource on FlourishSource {
+  id
   url
   type
   format
@@ -361,10 +373,6 @@ fragment Transcript on RichText {
 
 fragment ClipSet on ClipSet {
   type
-  autoplay
-  loop
-  muted
-  dataLayout
   id
   noAudio
   caption
@@ -483,6 +491,19 @@ fragment Indicators on Indicators {
   isOpinion
 }
 
+fragment BylineAuthor on AuthorReference {
+  concept {
+    ...ConceptURLs
+  }
+}
+
+fragment Byline on StructuredContent {
+  tree
+  references {
+    ...BylineAuthor
+  }
+}
+
 fragment PinnedPost on Content {
   __typename
   id
@@ -500,8 +521,8 @@ fragment PinnedPost on Content {
   altTitle {
     promotionalTitle
   }
-  byline(vanity: $useVanities) {
-    tree
+  byline {
+    ...Byline
   }
   accessLevel
   canBeSyndicated
@@ -538,6 +559,7 @@ fragment Content on Content {
   publishedDate
   publishedTimestamp
   firstPublishedDate
+  modifiedTimestamp
   publishReference
   standfirst
   topper {
@@ -555,8 +577,8 @@ fragment Content on Content {
   altTitle {
     promotionalTitle
   }
-  byline(vanity: $useVanities) {
-    tree
+  byline {
+    ...Byline
   }
   annotations {
     ...Concept

package/src/datasources/capi.test.ts

@@ -3,7 +3,7 @@ import { CapiDataSource } from './capi'
 import { QueryContext } from '..'
 import { KeyValueCache } from '@apollo/utils.keyvaluecache'
 import { CapiResponse } from '../model/CapiResponse'
-import { ContentTypeSchemas } from '../types/internal-content'
+import { ContentTypeSchemas } from '../model/schemas/capi/internal-content'
 
 const logger = new Logger()
 const metrics = { count: jest.fn() }
@@ -63,8 +63,8 @@ describe('CapiDataSource', () => {
         expect.arrayContaining([
           expect.objectContaining({
             prefix: 'contentPipelineArticle',
-            id
-          })
+            id,
+          }),
         ])
       )
     })

package/src/datasources/capi.ts

@@ -1,6 +1,5 @@
 import { CapiResponse } from '../model/CapiResponse'
 import { InstrumentedRESTDataSource } from './instrumented'
-import { CapiPerson } from '../types/internal-content'
 import { AugmentedRequest } from '@apollo/datasource-rest'
 import {
   KeyValueCache,
@@ -8,6 +7,7 @@ import {
 } from '@apollo/utils.keyvaluecache'
 import { CapiList } from '../model/CapiList'
 import TimeoutError from '../helpers/timeout-error'
+import { Person } from '../model/Person'
 
 const REQUEST_TIMEOUT = process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT
   ? parseInt(process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT)
@@ -79,10 +79,12 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
     return CapiResponse.fromJSON(content, this.context, packageContainer)
   }
 
-  getPerson(uuid: string): Promise<CapiPerson> {
-    return this.get(`people/${uuid}`, {
+  async getPerson(uuid: string): Promise<Person> {
+    const person = await this.get(`people/${uuid}`, {
       cacheOptions: { ttl: this.peopleCacheTTL },
     })
+
+    return Person.fromJson(person, this.context)
   }
 
   async getList(uuid: string): Promise<CapiList> {

package/src/datasources/twitter.ts

@@ -1,4 +1,6 @@
 import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
+import * as z from 'zod'
+
 import { InstrumentedRESTDataSource } from './instrumented'
 import TimeoutError from '../helpers/timeout-error'
 
@@ -6,6 +8,8 @@ const REQUEST_TIMEOUT = process.env.TWITTER_DATASOURCE_REQUEST_TIMEOUT
   ? parseInt(process.env.TWITTER_DATASOURCE_REQUEST_TIMEOUT)
   : 1000
 
+const Tweet = z.object({ html: z.string() })
+
 export class TwitterDataSource extends InstrumentedRESTDataSource {
   baseURL = 'https://publish.twitter.com'
   get backendSystemCode() {
@@ -35,7 +39,7 @@ export class TwitterDataSource extends InstrumentedRESTDataSource {
       this.timeout = undefined
     }
 
-    return tweet
+    return Tweet.parse(tweet)
   }
 
   cacheOptionsFor(): CacheOptions {

package/src/fixtures/capiObject.ts

@@ -1,6 +1,6 @@
-import { InternalContent } from '../types/internal-content'
+import { Article } from '../model/schemas/capi/internal-content'
 
-export const baseCapiObject: InternalContent = {
+export const baseCapiObject: Article = {
   id: 'http://www.ft.com/thing/3071cae8-a27c-4ab4-a0d4-7bb00df1d477',
   type: 'http://www.ft.com/ontology/content/Article',
   types: ['http://www.ft.com/ontology/content/Article'],
@@ -57,5 +57,7 @@ export const baseCapiObject: InternalContent = {
   accessLevel: 'premium' as const,
   embeds: [],
   publishedDate: '2024-04-02T10:00:09.935Z',
+  lastModified: '2024-04-02T12:34:56.789Z',
   firstPublishedDate: '',
+  canBeSyndicated: 'yes',
 }

package/src/fixtures/capiPerson.ts

@@ -1,4 +1,4 @@
-import type { CapiPerson } from '../types/internal-content'
+import type { CapiPerson } from '../model/schemas/capi/internal-content'
 
 export const capiPerson: CapiPerson =
   // http://api.ft.com/people/4076f4fd-723b-4ce5-9934-fb29416554fa