@financial-times/cp-content-pipeline-schema 2.15.0 → 3.0.0

package/lib/model/CapiResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"CapiResponse.js","sourceRoot":"","sources":["../../src/model/CapiResponse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CapiResponse.js","sourceRoot":"","sources":["../../src/model/CapiResponse.ts"],"names":[],"mappings":"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"}

package/lib/model/CapiResponse.test.js

@@ -15,24 +15,6 @@ describe('CAPI response', () => {
             expect(capiResponse.id()).toEqual('3071cae8-a27c-4ab4-a0d4-7bb00df1d477');
         });
     });
-    describe('Author URL mapping', () => {
-        test('converts any straight quotes in the author name to curly quotes', () => {
-            const straighQuoteAuthorName = `Sinéad O'Connor`;
-            const curlyQuoteAuthorName = `Sinéad O’Connor`;
-            const article = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
-            delete article.annotations;
-            article.annotations = [
-                {
-                    id: 'http://api.ft.com/things/eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee',
-                    predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
-                    prefLabel: straighQuoteAuthorName,
-                },
-            ];
-            const capiResponse = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
-            expect(capiResponse.getAuthorUrlMapping().get(curlyQuoteAuthorName)).toBeDefined();
-            expect(capiResponse.getAuthorUrlMapping().get(straighQuoteAuthorName)).toBeUndefined();
-        });
-    });
     describe('Content Type', () => {
         test(`uses first entry in types if there's no type`, () => {
             const article = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
@@ -67,6 +49,13 @@ describe('CAPI response', () => {
             expect(capiResponse.publishedTimestamp()).toEqual(1712052009935);
         });
     });
+    describe('Modified timestamp', () => {
+        test('generates a timestamp from the last modified date', () => {
+            const article = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
+            const capiResponse = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
+            expect(capiResponse.modifiedTimestamp()).toEqual(1712061296789);
+        });
+    });
     describe('liveBlogPosts', () => {
         test('returns a resolved array of the articles contained sorted by most recently published', async () => {
             const liveBlogPackage = (0, clone_deep_1.default)({

package/lib/model/CapiResponse.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"CapiResponse.test.js","sourceRoot":"","sources":["../../src/model/CapiResponse.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,uDAAuD;AACvD,4DAAkC;AAClC,4EAA8C;AAE9C,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAC5B,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;YACzC,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YAEvD,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAA;QAC3E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;YAC3E,MAAM,sBAAsB,GAAG,iBAAiB,CAAA;YAChD,MAAM,oBAAoB,GAAG,iBAAiB,CAAA;YAE9C,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;YACzC,OAAO,OAAO,CAAC,WAAW,CAAA;YAC1B,OAAO,CAAC,WAAW,GAAG;gBACpB;oBACE,EAAE,EAAE,+DAA+D;oBACnE,SAAS,EAAE,iDAAiD;oBAC5D,SAAS,EAAE,sBAAsB;iBAClC;aACF,CAAA;YACD,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YAEvD,MAAM,CACJ,YAAY,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAC7D,CAAC,WAAW,EAAE,CAAA;YACf,MAAM,CACJ,YAAY,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAC/D,CAAC,aAAa,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACxD,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;YACzC,OAAO,OAAO,CAAC,IAAI,CAAA;YACnB,MAAM,mBAAmB,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YAE9D,MAAM,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;YACzC,MAAM,eAAe,GAAG,IAAA,oBAAS,EAAC;gBAChC,GAAG,2BAAc;gBACjB,IAAI,EAAE,oDAAoD;aAC3D,CAAC,CAAA;YACF,MAAM,mBAAmB,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YAC9D,MAAM,2BAA2B,GAAG,IAAI,2BAAY,CAClD,eAAe,EACf,sBAAO,CACR,CAAA;YAED,MAAM,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YACrD,MAAM,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;QACvE,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC;gBACxB,GAAG,2BAAc;gBACjB,IAAI,EAAE,4CAA4C;aACnD,CAAC,CAAA;YACF,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YACvD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,YAAY,CAC5C,qEAAqE,CACtE,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACzD,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;YACzC,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,OAAO,EAAE,sBAAO,CAAC,CAAA;YAEvD,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,IAAI,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;YACtG,MAAM,eAAe,GAAG,IAAA,oBAAS,EAAC;gBAChC,GAAG,2BAAc;gBACjB,IAAI,EAAE,oDAAoD;gBAC1D,QAAQ,EAAE;oBACR;wBACE,EAAE,EAAE,gEAAgE;wBACpE,MAAM,EACJ,iEAAiE;qBACpE;oBACD;wBACE,EAAE,EAAE,gEAAgE;wBACpE,MAAM,EACJ,iEAAiE;qBACpE;oBACD;wBACE,EAAE,EAAE,gEAAgE;wBACpE,MAAM,EACJ,iEAAiE;qBACpE;iBACF;aACF,CAAC,CAAA;YAEF,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,eAAe,EAAE,sBAAO,CAAC,CAAA;YAC/D,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAA;YACxD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CACpC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CACpC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CACpC,sCAAsC,CACvC,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"CapiResponse.test.js","sourceRoot":"","sources":["../../src/model/CapiResponse.test.ts"],"names":[],"mappings":"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"}

package/lib/model/Clip.d.ts

@@ -1,4 +1,4 @@
-import { Clip as ClipMetadata } from '../types/internal-content';
+import { Clip as ClipMetadata } from './schemas/capi/internal-content';
 import { LiteralUnionScalarValues } from '../resolvers/literal-union';
 import { ClipFormat } from '../resolvers/scalars';
 type ClipSource = {

package/lib/model/Concept.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation } from '../types/internal-content';
+import type { Annotation } from './schemas/capi/internal-content';
 import type { QueryContext } from '..';
 type URLArguments = {
     vanity?: boolean | null;

package/lib/model/Concept.js

@@ -16,7 +16,6 @@ const isError_1 = __importDefault(require("../helpers/isError"));
 const n_concept_ids_1 = __importDefault(require("@financial-times/n-concept-ids"));
 const CAPI_ID_PREFIX = /^https?:\/\/(?:www|api)\.ft\.com\/things?\//;
 const BASE_URL = 'https://www.ft.com/stream/';
-const FT_URL = 'https://www.ft.com';
 exports.predicates = {
     hasAuthor: 'http://www.ft.com/ontology/annotation/hasAuthor',
     isClassifiedBy: 'http://www.ft.com/ontology/classification/isClassifiedBy',
@@ -122,7 +121,7 @@ class Concept {
             }
         }
         if (args?.relative) {
-            url = url.replace(FT_URL, '');
+            return new URL(url).pathname;
         }
         return url;
     }

package/lib/model/Concept.js.map

@@ -1 +1 @@
-{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":"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"}

package/lib/model/FlourishSource.d.ts

@@ -12,7 +12,7 @@ export declare class FlourishSource {
     constructor(flourishData: FlourishData, context: QueryContext);
     id(): string;
     type(): string;
-    format(): string;
+    format(): "standard";
     flourishUrl(): string;
     private getImageMetadata;
     width(): Promise<number>;

package/lib/model/FlourishSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlourishSource.js","sourceRoot":"","sources":["../../src/model/FlourishSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2EAAqD;AACrD,iEAAwC;AACxC,2DAAiE;AAiBjE,MAAa,cAAc;IAIzB,YACU,YAA0B,EAC1B,OAAqB;QADrB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAc;QAL/B,6CAAmB;QAOjB,uBAAA,IAAI,8BAAe,OAAO,CAAC,UAAU,IAAI,qBAAqB,MAAA,CAAA;IAChE,CAAC;IAED,EAAE;QACA,OAAO,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAA;IACpC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,UAAU,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,WAAW;QACT,kFAAkF;QAClF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;QAErE,OAAO,kCAAkC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,EAAE,0BAA0B,oBAAoB,EAAE,CAAA;IACnH,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAA;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAA;QAE3B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CACtE,IAAI,CAAC,WAAW,EAAE,CACnB,CAAA;YACD,IAAI,CAAC,aAAa,GAAG;gBACnB,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,aAAa;gBACvC,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,cAAc;aAC3C,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;oBACvB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,IAAI,EAAE,+BAA+B;wBACrC,OAAO,EAAE,8DAA8D,IAAI,CAAC,WAAW,EAAE,EAAE;wBAC3F,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,CAAC,aAAa,GAAG;gBACnB,KAAK,EAAE,aAAa;gBACpB,MAAM,EAAE,cAAc;aACvB,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAA;IAC3B,CAAC;IACD,KAAK,CAAC,KAAK;QACT,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACnD,OAAO,aAAa,CAAC,KAAK,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACnD,OAAO,aAAa,CAAC,MAAM,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;QAChC,MAAM,sBAAsB,GAAG,IAAA,sBAAe,EAAC;YAC7C,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE;YACvB,UAAU,EAAE,qBAAqB;YACjC,KAAK;SACN,CAAC,CAAA;QACF,OAAO,sBAAsB,CAAA;IAC/B,CAAC;CACF;AAnFD,wCAmFC"}
+{"version":3,"file":"FlourishSource.js","sourceRoot":"","sources":["../../src/model/FlourishSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2EAAqD;AACrD,iEAAwC;AACxC,2DAAiE;AAiBjE,MAAa,cAAc;IAIzB,YACU,YAA0B,EAC1B,OAAqB;QADrB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAc;QAL/B,6CAAmB;QAOjB,uBAAA,IAAI,8BAAe,OAAO,CAAC,UAAU,IAAI,qBAAqB,MAAA,CAAA;IAChE,CAAC;IAED,EAAE;QACA,OAAO,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAA;IACpC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,UAAU,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,OAAO,UAAmB,CAAA;IAC5B,CAAC;IAED,WAAW;QACT,kFAAkF;QAClF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;QAErE,OAAO,kCAAkC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,EAAE,0BAA0B,oBAAoB,EAAE,CAAA;IACnH,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAA;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAA;QAE3B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CACtE,IAAI,CAAC,WAAW,EAAE,CACnB,CAAA;YACD,IAAI,CAAC,aAAa,GAAG;gBACnB,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,aAAa;gBACvC,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,cAAc;aAC3C,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;oBACvB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,IAAI,EAAE,+BAA+B;wBACrC,OAAO,EAAE,8DAA8D,IAAI,CAAC,WAAW,EAAE,EAAE;wBAC3F,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,CAAC,aAAa,GAAG;gBACnB,KAAK,EAAE,aAAa;gBACpB,MAAM,EAAE,cAAc;aACvB,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAA;IAC3B,CAAC;IACD,KAAK,CAAC,KAAK;QACT,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACnD,OAAO,aAAa,CAAC,KAAK,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACnD,OAAO,aAAa,CAAC,MAAM,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;QAChC,MAAM,sBAAsB,GAAG,IAAA,sBAAe,EAAC;YAC7C,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE;YACvB,UAAU,EAAE,qBAAqB;YACjC,KAAK;SACN,CAAC,CAAA;QACF,OAAO,sBAAsB,CAAA;IAC/B,CAAC;CACF;AAnFD,wCAmFC"}

package/lib/model/Image.d.ts

@@ -1,4 +1,4 @@
-import type { Image as InternalContentImage, LeadImage } from '../types/internal-content';
+import type { Image as InternalContentImage, LeadImage } from './schemas/capi/internal-content';
 import type { QueryContext } from '..';
 import { LiteralUnionScalarValues } from '../resolvers/literal-union';
 import { ImageFormat, ImageType } from '../resolvers/scalars';

package/lib/model/LeadFlourish.test.js

@@ -27,6 +27,7 @@ describe('LeadFlourish', () => {
         clonedBase.topper = {
             layout: 'flourish',
             layoutWidth: 'full-width',
+            backgroundColour: 'paper',
         };
         const capiResponse = new CapiResponse_1.CapiResponse(clonedBase, context);
         leadFlourish = new LeadFlourish_1.LeadFlourish(capiResponse, context);

package/lib/model/LeadFlourish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"LeadFlourish.test.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,qDAAiD;AACjD,iDAA6C;AAC7C,uDAAuD;AAEvD,4DAAkC;AAElC,MAAM,OAAO,GAAG,EAA6B,CAAA;AAE7C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;IACjC,OAAO;QACL,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KACzD,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG;IACvB,EAAE,EAAE,SAAS;IACb,WAAW,EAAE,kBAAkB;IAC/B,IAAI,EAAE,WAAW;CAClB,CAAA;AAED,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,YAA0B,CAAA;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,UAAU,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;QAC5C,UAAU,CAAC,YAAY,GAAG,gBAAgB,CAAA;QAC1C,UAAU,CAAC,MAAM,GAAG;YAClB,MAAM,EAAE,UAAU;YAClB,WAAW,EAAE,YAAY;SAC1B,CAAA;QACD,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAC1D,YAAY,GAAG,IAAI,2BAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,YAAY,CAAC,aAAa,EAAE,CAAA;YAElC,MAAM,CAAC,+BAAc,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QAClB,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC9B,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,CAAA;YAEhC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;YAElC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAA;YACzE,YAAY,CAAC,WAAW,GAAG,eAAe,CAAA;YAE1C,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAA;YAEzC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YAC3C,MAAM,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC5C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"LeadFlourish.test.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,qDAAiD;AACjD,iDAA6C;AAC7C,uDAAuD;AAEvD,4DAAkC;AAElC,MAAM,OAAO,GAAG,EAA6B,CAAA;AAE7C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;IACjC,OAAO;QACL,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KACzD,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG;IACvB,EAAE,EAAE,SAAS;IACb,WAAW,EAAE,kBAAkB;IAC/B,IAAI,EAAE,WAAW;CAClB,CAAA;AAED,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,YAA0B,CAAA;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,UAAU,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;QAC5C,UAAU,CAAC,YAAY,GAAG,gBAAgB,CAAA;QAC1C,UAAU,CAAC,MAAM,GAAG;YAClB,MAAM,EAAE,UAAU;YAClB,WAAW,EAAE,YAAY;YACzB,gBAAgB,EAAE,OAAO;SAC1B,CAAA;QACD,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAC1D,YAAY,GAAG,IAAI,2BAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,YAAY,CAAC,aAAa,EAAE,CAAA;YAElC,MAAM,CAAC,+BAAc,CAAC,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QAClB,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC9B,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,CAAA;YAEhC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;YAElC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAA;YACzE,YAAY,CAAC,WAAW,GAAG,eAAe,CAAA;YAE1C,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAA;YAEzC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YAC3C,MAAM,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC5C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/model/Person.d.ts

@@ -1,21 +1,15 @@
 import type { QueryContext } from '..';
-import { Concept } from './Concept';
-import { CapiResponse } from './CapiResponse';
-type HeadshotArguments = {
-    width?: number | null;
-    dpr?: number | null;
-};
+import { CapiPerson } from './schemas/capi/internal-content';
+import { PersonHeadshotArgs } from '../generated';
 export declare class Person {
     #private;
-    private concept;
-    private capiResponse;
+    private person;
     private context;
-    constructor(concept: Concept, capiResponse: CapiResponse, context: QueryContext);
+    static fromJson(data: unknown, context: QueryContext): Person;
+    constructor(person: CapiPerson, context: QueryContext);
     prefLabel(): string;
     uuid(): string;
     streamPage(): string;
     apiUrl(): string;
-    isAuthor(): boolean;
-    headshot(args?: HeadshotArguments): Promise<string | null>;
+    headshot(args: PersonHeadshotArgs): string | null;
 }
-export {};

package/lib/model/Person.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -40,65 +17,61 @@ var _Person_systemCode;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Person = void 0;
 const imageService_1 = __importDefault(require("../helpers/imageService"));
-const isError_1 = __importDefault(require("../helpers/isError"));
-const decorateHeadshotUrl_1 = __importStar(require("../helpers/decorateHeadshotUrl"));
+const decorateHeadshotUrl_1 = __importDefault(require("../helpers/decorateHeadshotUrl"));
 const errors_1 = require("@dotcom-reliability-kit/errors");
-const predicates = {
-    hasAuthor: 'http://www.ft.com/ontology/annotation/hasAuthor',
-};
+const base_schema_1 = require("./schemas/capi/base-schema");
+const flatten_formatted_zod_errors_1 = __importDefault(require("../helpers/flatten-formatted-zod-errors"));
+const metadata_1 = require("../helpers/metadata");
 class Person {
-    constructor(concept, capiResponse, context) {
-        this.concept = concept;
-        this.capiResponse = capiResponse;
+    static fromJson(data, context) {
+        const result = base_schema_1.CapiPerson.safeParse(data);
+        if (!result.success) {
+            context.logger.warn({
+                event: 'RECOVERABLE_ERROR',
+                error: new errors_1.OperationalError({
+                    message: 'The data received from the CAPI data source does not match our data source schema. It is likely that our schema will require updating to handle all possible responses from CAPI.',
+                    code: 'CAPI_SCHEMA_VALIDATION_FAILURE',
+                    schemaError: (0, flatten_formatted_zod_errors_1.default)(result.error.format(), data),
+                    contentId: data.id,
+                    contentType: 'Person',
+                }),
+            });
+            context.metrics?.count(`graphql.datasource.CapiDataSource.Person.validation.failure.count`, 1);
+        }
+        else {
+            context.metrics?.count(`graphql.datasource.CapiDataSource.Person.validation.success.count`, 1);
+        }
+        return new Person(data, context);
+    }
+    constructor(person, context) {
+        this.person = person;
         this.context = context;
         _Person_systemCode.set(this, void 0);
         __classPrivateFieldSet(this, _Person_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
     }
     prefLabel() {
-        return this.concept.prefLabel();
+        return this.person.prefLabel;
     }
     uuid() {
-        return this.concept.uuid();
+        return (0, metadata_1.uuidFromUrl)(this.person.id);
     }
     streamPage() {
         const uuid = this.uuid();
         return `https://www.ft.com/stream/${uuid}`;
     }
     apiUrl() {
-        return this.concept.apiUrl();
-    }
-    isAuthor() {
-        return this.concept.predicate() === predicates.hasAuthor;
+        return this.person.apiUrl;
     }
-    async headshot(args) {
-        try {
-            const uuid = this.apiUrl().match(decorateHeadshotUrl_1.UUID_REGEX)?.[0];
-            if (!this.isAuthor() || !uuid || !this.capiResponse)
-                return null;
-            const person = await this.context.dataSources.capi.getPerson(uuid);
-            const url = (0, decorateHeadshotUrl_1.default)(person);
-            return url
-                ? (0, imageService_1.default)({
-                    url,
-                    systemCode: __classPrivateFieldGet(this, _Person_systemCode, "f"),
-                    width: args?.width || 150,
-                    dpr: args?.dpr ?? undefined,
-                })
-                : null;
-        }
-        catch (error) {
-            if ((0, isError_1.default)(error)) {
-                this.context.logger.warn({
-                    event: 'RECOVERABLE_ERROR',
-                    error: new errors_1.OperationalError({
-                        message: `Error fetching CAPI Person for headshot URL for ${this.prefLabel()}`,
-                        code: 'HEADSHOT_PERSON_FETCH_ERROR',
-                        cause: error,
-                    }),
-                });
-            }
-            return null;
-        }
+    headshot(args) {
+        const url = (0, decorateHeadshotUrl_1.default)(this.person);
+        return url
+            ? (0, imageService_1.default)({
+                url,
+                systemCode: __classPrivateFieldGet(this, _Person_systemCode, "f"),
+                width: args.width || 150,
+                dpr: args.dpr ?? undefined,
+            })
+            : null;
     }
 }
 exports.Person = Person;

package/lib/model/Person.js.map

@@ -1 +1 @@
-{"version":3,"file":"Person.js","sourceRoot":"","sources":["../../src/model/Person.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,2EAAqD;AACrD,iEAAwC;AACxC,sFAAgF;AAChF,2DAAiE;AAOjE,MAAM,UAAU,GAAG;IACjB,SAAS,EAAE,iDAAiD;CACpD,CAAA;AAEV,MAAa,MAAM;IAGjB,YACU,OAAgB,EAChB,YAA0B,EAC1B,OAAqB;QAFrB,YAAO,GAAP,OAAO,CAAS;QAChB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAc;QAL/B,qCAAmB;QAOjB,uBAAA,IAAI,sBAAe,OAAO,CAAC,UAAU,IAAI,qBAAqB,MAAA,CAAA;IAChE,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;IACjC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAC5B,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,6BAA6B,IAAI,EAAE,CAAA;IAC5C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAA;IAC9B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,UAAU,CAAC,SAAS,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAwB;QACrC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACjD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAA;YAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAClE,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAA;YAEvC,OAAO,GAAG;gBACR,CAAC,CAAC,IAAA,sBAAe,EAAC;oBACd,GAAG;oBACH,UAAU,EAAE,uBAAA,IAAI,0BAAY;oBAC5B,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,GAAG;oBACzB,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,SAAS;iBAC5B,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAA;QACV,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;oBACvB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,OAAO,EAAE,mDAAmD,IAAI,CAAC,SAAS,EAAE,EAAE;wBAC9E,IAAI,EAAE,6BAA6B;wBACnC,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF;AA7DD,wBA6DC"}
+{"version":3,"file":"Person.js","sourceRoot":"","sources":["../../src/model/Person.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,2EAAqD;AACrD,yFAAgE;AAChE,2DAAiE;AACjE,4DAA2E;AAE3E,2GAA+E;AAE/E,kDAAiD;AAEjD,MAAa,MAAM;IAGjB,MAAM,CAAC,QAAQ,CAAC,IAAa,EAAE,OAAqB;QAClD,MAAM,MAAM,GAAG,wBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,mBAAmB;gBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;oBAC1B,OAAO,EACL,mLAAmL;oBACrL,IAAI,EAAE,gCAAgC;oBACtC,WAAW,EAAE,IAAA,sCAAyB,EAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC;oBACnE,SAAS,EAAG,IAAwB,CAAC,EAAE;oBACvC,WAAW,EAAE,QAAQ;iBACtB,CAAC;aACH,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,EAAE,KAAK,CACpB,mEAAmE,EACnE,CAAC,CACF,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,OAAO,EAAE,KAAK,CACpB,mEAAmE,EACnE,CAAC,CACF,CAAA;QACH,CAAC;QAED,OAAO,IAAI,MAAM,CAAC,IAAkB,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,YAAoB,MAAkB,EAAU,OAAqB;QAAjD,WAAM,GAAN,MAAM,CAAY;QAAU,YAAO,GAAP,OAAO,CAAc;QA9BrE,qCAAmB;QA+BjB,uBAAA,IAAI,sBAAe,OAAO,CAAC,UAAU,IAAI,qBAAqB,MAAA,CAAA;IAChE,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAI;QACF,OAAO,IAAA,sBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,6BAA6B,IAAI,EAAE,CAAA;IAC5C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAC3B,CAAC;IAED,QAAQ,CAAC,IAAwB;QAC/B,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE5C,OAAO,GAAG;YACR,CAAC,CAAC,IAAA,sBAAe,EAAC;gBACd,GAAG;gBACH,UAAU,EAAE,uBAAA,IAAI,0BAAY;gBAC5B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,GAAG;gBACxB,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS;aAC3B,CAAC;YACJ,CAAC,CAAC,IAAI,CAAA;IACV,CAAC;CACF;AAhED,wBAgEC"}

package/lib/model/Person.test.js

@@ -1,15 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Person_1 = require("./Person");
 const globals_1 = require("@jest/globals");
-const Concept_1 = require("./Concept");
-const CapiResponse_1 = require("./CapiResponse");
-const capiObject_1 = require("../fixtures/capiObject");
 const capiPerson_1 = require("../fixtures/capiPerson");
-const clone_deep_1 = __importDefault(require("clone-deep"));
 const logger_1 = require("@dotcom-reliability-kit/logger");
 const vanityMock = globals_1.jest.fn();
 const getPersonMock = globals_1.jest.fn();
@@ -22,73 +15,27 @@ const context = {
     systemCode: 'image-test',
     logger: new logger_1.Logger(),
 };
-const topic = {
-    apiUrl: 'http://api.ft.com/things/6b32f2c1-da43-4e19-80b9-8aef4ab640d7',
-    directType: 'http://www.ft.com/ontology/Topic',
-    id: 'http://api.ft.com/things/6b32f2c1-da43-4e19-80b9-8aef4ab640d7',
-    predicate: 'http://www.ft.com/ontology/annotation/about',
-    prefLabel: 'Technology sector',
-    type: 'TOPIC',
-    types: [
-        'http://www.ft.com/ontology/core/Thing',
-        'http://www.ft.com/ontology/concept/Concept',
-        'http://www.ft.com/ontology/Topic',
-    ],
-};
-const author = {
-    apiUrl: 'http://api.ft.com/people/4076f4fd-723b-4ce5-9934-fb29416554fa',
-    directType: 'http://www.ft.com/ontology/person/Person',
-    id: 'http://api.ft.com/things/4076f4fd-723b-4ce5-9934-fb29416554fa',
-    predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
-    prefLabel: 'Robert Shrimsley',
-    type: 'PERSON',
-    types: [
-        'http://www.ft.com/ontology/core/Thing',
-        'http://www.ft.com/ontology/concept/Concept',
-        'http://www.ft.com/ontology/person/Person',
-    ],
-};
 describe('Person model', () => {
-    let clonedBase;
-    let capiResponse;
-    let topicConcept;
-    let authorConcept;
     beforeEach(() => {
         globals_1.jest.resetAllMocks();
-        clonedBase = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
-        capiResponse = new CapiResponse_1.CapiResponse(clonedBase, context);
-        topicConcept = new Concept_1.Concept(topic, context);
-        authorConcept = new Concept_1.Concept(author, context);
     });
-    describe('headshot()', () => {
-        it('returns null if the concept is not for an author', async () => {
-            const model = new Person_1.Person(topicConcept, capiResponse, context);
-            expect(await model.headshot()).toEqual(null);
-        });
+    describe('headshot', () => {
         it('returns the headshot for an author', async () => {
-            getPersonMock.mockResolvedValue(capiPerson_1.capiPerson);
-            const model = new Person_1.Person(authorConcept, capiResponse, context);
-            expect(await model.headshot()).toEqual('https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2Fuploaded-files%2Ffthead-v1_robert-shrimsley-cc467908-15d6-474d-94d8-171594ceabb9.png?source=image-test&fit=scale-down&quality=highest&width=150&dpr=1');
+            const model = new Person_1.Person(capiPerson_1.capiPerson, context);
+            expect(await model.headshot({})).toEqual('https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2Fuploaded-files%2Ffthead-v1_robert-shrimsley-cc467908-15d6-474d-94d8-171594ceabb9.png?source=image-test&fit=scale-down&quality=highest&width=150&dpr=1');
         });
         it('can resize headshot and provide high resolution version', async () => {
-            getPersonMock.mockResolvedValue(capiPerson_1.capiPerson);
-            const model = new Person_1.Person(authorConcept, capiResponse, context);
+            const model = new Person_1.Person(capiPerson_1.capiPerson, context);
             expect(await model.headshot({ width: 300, dpr: 2 })).toEqual('https://www.ft.com/__origami/service/image/v2/images/raw/https%3A%2F%2Fd1e00ek4ebabms.cloudfront.net%2Fproduction%2Fuploaded-files%2Ffthead-v1_robert-shrimsley-cc467908-15d6-474d-94d8-171594ceabb9.png?source=image-test&fit=scale-down&quality=highest&width=300&dpr=2');
         });
-        it('returns null if there is an error getting the person data', async () => {
-            getPersonMock.mockRejectedValue(new Error('error getting person'));
-            const model = new Person_1.Person(authorConcept, capiResponse, context);
-            expect(await model.headshot({ width: 300, dpr: 2 })).toEqual(null);
-        });
         it("returns null if the author doesn't have a headshot", async () => {
-            getPersonMock.mockResolvedValue({ ...capiPerson_1.capiPerson, _imageUrl: undefined });
-            const model = new Person_1.Person(authorConcept, capiResponse, context);
-            expect(await model.headshot()).toEqual(null);
+            const model = new Person_1.Person({ ...capiPerson_1.capiPerson, _imageUrl: undefined }, context);
+            expect(await model.headshot({})).toEqual(null);
         });
     });
     describe('streamPage()', () => {
         it('returns the stream URL', () => {
-            const model = new Person_1.Person(authorConcept, capiResponse, context);
+            const model = new Person_1.Person(capiPerson_1.capiPerson, context);
             expect(model.streamPage()).toEqual('https://www.ft.com/stream/4076f4fd-723b-4ce5-9934-fb29416554fa');
         });
     });

package/lib/model/Person.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Person.test.js","sourceRoot":"","sources":["../../src/model/Person.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Person.test.js","sourceRoot":"","sources":["../../src/model/Person.test.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AACjC,2CAAoC;AAEpC,uDAAmD;AAGnD,2DAAuD;AAGvD,MAAM,UAAU,GAAG,cAAI,CAAC,EAAE,EAAkC,CAAA;AAC5D,MAAM,aAAa,GAAG,cAAI,CAAC,EAAE,EAA+B,CAAA;AAC5D,MAAM,OAAO,GAAG;IACd,WAAW,EAAE;QACX,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE;QAClC,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE;KAChC;IACD,UAAU,EAAE,YAAY;IACxB,MAAM,EAAE,IAAI,eAAM,EAAE;CACM,CAAA;AAE5B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,UAAU,CAAC,GAAG,EAAE;QACd,cAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,uBAAwB,EAAE,OAAO,CAAC,CAAA;YAC3D,MAAM,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CACtC,2QAA2Q,CAC5Q,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,uBAAwB,EAAE,OAAO,CAAC,CAAA;YAC3D,MAAM,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAC1D,2QAA2Q,CAC5Q,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,KAAK,GAAG,IAAI,eAAM,CACtB,EAAE,GAAG,uBAAU,EAAE,SAAS,EAAE,SAAS,EAAgB,EACrD,OAAO,CACR,CAAA;YACD,MAAM,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,uBAAwB,EAAE,OAAO,CAAC,CAAA;YAC3D,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAChC,gEAAgE,CACjE,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/model/Picture.d.ts

@@ -1,5 +1,5 @@
 import { QueryContext } from '..';
-import { ImageSet } from '../types/internal-content';
+import { ImageSet } from './schemas/capi/internal-content';
 import { Image } from './Image';
 type LayoutWidth = 'full-grid' | 'inset-left' | 'standard';
 export declare class Picture {

package/lib/model/RichText.d.ts

@@ -2,7 +2,6 @@ import { LiteralUnionScalarValues } from '../resolvers/literal-union';
 import { RichTextSource } from '../resolvers/scalars';
 import { CapiResponse } from './CapiResponse';
 import { QueryContext } from '..';
-import { Body } from '../resolvers/content-tree/Workarounds';
 export declare class RichText {
     source: LiteralUnionScalarValues<typeof RichTextSource>;
     private value;
@@ -10,7 +9,7 @@ export declare class RichText {
     constructor(source: LiteralUnionScalarValues<typeof RichTextSource>, value: string | null, contentApiData?: CapiResponse | undefined);
     raw(): string | null;
     structured(context?: QueryContext): Promise<{
-        tree: Body;
+        tree: import("@financial-times/content-tree").ContentTree.Parent;
         text: string;
         references: import("../resolvers/content-tree/references").ReferenceWithCAPIData[];
     }>;

package/lib/model/Topper.d.ts

@@ -35,6 +35,6 @@ export declare class Topper {
         layout?: "default" | "wide";
     };
     imageService(args: TopperWithHeadshotHeadshotArgs): string | null;
-    headshot(args: TopperWithHeadshotHeadshotArgs): string | Promise<string | null> | null;
+    headshot(args: TopperWithHeadshotHeadshotArgs): Promise<string | null>;
 }
 export {};

package/lib/model/Topper.js

@@ -22,6 +22,7 @@ const scalars_1 = require("../resolvers/scalars");
 const RichText_1 = require("./RichText");
 const imageService_1 = __importDefault(require("../helpers/imageService"));
 const LeadFlourish_1 = require("./LeadFlourish");
+const Concept_1 = require("./Concept");
 function isDarkBackground(backgroundColour) {
     const darkColours = [
         'black',
@@ -225,7 +226,9 @@ class Topper {
         return 'standard';
     }
     columnist() {
-        const authors = this.capiResponse.getAuthors();
+        const authors = this.capiResponse.annotations({
+            byPredicate: Concept_1.predicates.hasAuthor,
+        });
         const isOpinionOrColumn = this.type() === 'OpinionTopper' || this.capiResponse.isColumn();
         return isOpinionOrColumn && authors[0] ? authors[0] : null;
     }
@@ -257,16 +260,15 @@ class Topper {
             });
         return null;
     }
-    headshot(args) {
+    async headshot(args) {
         if (this.capiResponse.isPodcast()) {
-            args.url = this.capiResponse.mainImage()?.url();
-            return this.imageService(args);
+            return this.imageService({
+                ...args,
+                url: this.capiResponse.mainImage()?.url(),
+            });
         }
         if (this.capiResponse.isOpinion()) {
-            const authors = this.capiResponse.authors();
-            if (authors && authors[0]) {
-                return authors[0].headshot(args);
-            }
+            return (await this.capiResponse.primaryAuthor())?.headshot(args) ?? null;
         }
         return null;
     }