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

package/lib/helpers/decorateHeadshotUrl.d.ts

@@ -1,3 +1,2 @@
-import { CapiPerson } from '../types/internal-content';
-export declare const UUID_REGEX: RegExp;
+import { CapiPerson } from '../model/schemas/capi/internal-content';
 export default function decorateHeadshotUrl(person: CapiPerson): string | null | undefined;

package/lib/helpers/decorateHeadshotUrl.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUID_REGEX = void 0;
 exports.default = decorateHeadshotUrl;
-exports.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 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)?\:[^?]+/;
 function decorateHeadshotUrl(person) {
     const url = person?._imageUrl;
@@ -31,7 +30,7 @@ function isCloudfrontUrl(url) {
     }
 }
 function executeFtcmsMatch(url) {
-    return exports.UUID_REGEX.exec(url);
+    return UUID_REGEX.exec(url);
 }
 function executeFtheadMatch(url) {
     return IMAGESET_REGEX.exec(url);

package/lib/helpers/decorateHeadshotUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorateHeadshotUrl.js","sourceRoot":"","sources":["../../src/helpers/decorateHeadshotUrl.ts"],"names":[],"mappings":";;;AAOA,sCAoBC;AAzBY,QAAA,UAAU,GACrB,8EAA8E,CAAA;AAEhF,MAAM,cAAc,GAAG,wBAAwB,CAAA;AAE/C,SAAwB,mBAAmB,CAAC,MAAkB;IAC5D,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,CAAA;IAE7B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAA;IAErB,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAEzC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,SAAS,UAAU,CAAC,GAAG,EAAE,EAAE,CAAA;IACpC,CAAC;IAED,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAEjD,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,uBAAuB,GAAG,+BAA+B,CAAA;IAE/D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;QACzC,OAAO,WAAW,IAAI,WAAW,KAAK,uBAAuB,CAAA;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,kBAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAW;IACrC,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC"}
+{"version":3,"file":"decorateHeadshotUrl.js","sourceRoot":"","sources":["../../src/helpers/decorateHeadshotUrl.ts"],"names":[],"mappings":";;AAOA,sCAoBC;AAzBD,MAAM,UAAU,GACd,8EAA8E,CAAA;AAEhF,MAAM,cAAc,GAAG,wBAAwB,CAAA;AAE/C,SAAwB,mBAAmB,CAAC,MAAkB;IAC5D,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,CAAA;IAE7B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAA;IAErB,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAEzC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,SAAS,UAAU,CAAC,GAAG,EAAE,EAAE,CAAA;IACpC,CAAC;IAED,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAEjD,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,uBAAuB,GAAG,+BAA+B,CAAA;IAE/D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;QACzC,OAAO,WAAW,IAAI,WAAW,KAAK,uBAAuB,CAAA;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAW;IACrC,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC"}

package/lib/model/Byline.d.ts

@@ -1,18 +1,16 @@
 import { ContentTree } from '@financial-times/content-tree';
-import { AuthorLink } from '../resolvers/content-tree/Workarounds';
-import { QueryContext } from '..';
+import { Concept } from './Concept';
+import { CapiResponse } from './CapiResponse';
 export declare class Byline {
     #private;
     private byline;
     private vanity;
-    private authorUrlMapping;
-    private context;
-    constructor(byline: string, vanity: boolean, authorUrlMapping: Map<string, string>, context: QueryContext);
+    private authors;
+    private contentApiData?;
+    static normaliseQuotes(str: string): string;
+    constructor(byline: string, vanity: boolean, authors: Concept[], contentApiData?: CapiResponse | undefined);
     buildBylineTree(): Promise<{
-        tree: {
-            type: string;
-            children: (AuthorLink | ContentTree.Text)[];
-        };
-        references: never[];
+        tree: ContentTree.Parent;
+        references: import("../resolvers/content-tree/references").ReferenceWithCAPIData[];
     }>;
 }

package/lib/model/Byline.js

@@ -4,24 +4,49 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Byline_instances, _Byline_splitBylineByName, _Byline_buildUrlTree;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _Byline_instances, _Byline_splitBylineByName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Byline = void 0;
+const updateTreeWithReferenceIds_1 = __importDefault(require("../resolvers/content-tree/updateTreeWithReferenceIds"));
 class Byline {
-    constructor(byline, vanity, authorUrlMapping, context) {
+    static normaliseQuotes(str) {
+        return str.replaceAll("'", '’');
+    }
+    constructor(byline, vanity, authors, contentApiData) {
         _Byline_instances.add(this);
         this.byline = byline;
         this.vanity = vanity;
-        this.authorUrlMapping = authorUrlMapping;
-        this.context = context;
+        this.authors = authors;
+        this.contentApiData = contentApiData;
     }
     async buildBylineTree() {
         // Normalise apostrophes in byline string
-        const bylineWithCorrectApostrophes = this.byline.replace("'", '’');
-        const split = __classPrivateFieldGet(this, _Byline_instances, "m", _Byline_splitBylineByName).call(this, bylineWithCorrectApostrophes, [
-            ...this.authorUrlMapping.keys(),
-        ]);
-        return __classPrivateFieldGet(this, _Byline_instances, "m", _Byline_buildUrlTree).call(this, this.authorUrlMapping, split);
+        const normalisedByline = Byline.normaliseQuotes(this.byline);
+        const bylineParts = __classPrivateFieldGet(this, _Byline_instances, "m", _Byline_splitBylineByName).call(this, normalisedByline, this.authors.map((author) => Byline.normaliseQuotes(author.prefLabel())));
+        const authorNameMapping = Object.fromEntries(this.authors.map((author) => {
+            return [Byline.normaliseQuotes(author.prefLabel()), author];
+        }));
+        const children = bylineParts.map((part) => {
+            const author = authorNameMapping[part];
+            const text = {
+                type: 'text',
+                value: part,
+            };
+            return author
+                ? {
+                    type: 'author',
+                    id: author.uuid(),
+                    children: [text],
+                }
+                : text;
+        });
+        return (0, updateTreeWithReferenceIds_1.default)({
+            type: 'byline',
+            children,
+        }, this.contentApiData);
     }
 }
 exports.Byline = Byline;
@@ -30,29 +55,5 @@ _Byline_instances = new WeakSet(), _Byline_splitBylineByName = function _Byline_
         return [byline];
     const regex = new RegExp(`(${names.join('|')})`, 'ig');
     return byline.split(regex).filter((string) => string !== '');
-}, _Byline_buildUrlTree = async function _Byline_buildUrlTree(urlMapping, parts) {
-    const children = await Promise.all(parts.map(async (part) => {
-        const fullUrl = urlMapping.get(part);
-        const vanityUrl = this.vanity && fullUrl
-            ? await this.context.dataSources.vanityUrls.get(fullUrl)
-            : null;
-        if (fullUrl) {
-            return {
-                type: 'author-link',
-                href: vanityUrl || fullUrl,
-                children: [{ type: 'text', value: part }],
-            };
-        }
-        else {
-            return {
-                type: 'text',
-                value: part,
-            };
-        }
-    }));
-    return {
-        tree: { type: 'root', children },
-        references: [],
-    };
 };
 //# sourceMappingURL=Byline.js.map

package/lib/model/Byline.js.map

@@ -1 +1 @@
-{"version":3,"file":"Byline.js","sourceRoot":"","sources":["../../src/model/Byline.ts"],"names":[],"mappings":";;;;;;;;;AAIA,MAAa,MAAM;IACjB,YACU,MAAc,EACd,MAAe,EACf,gBAAqC,EACrC,OAAqB;;QAHrB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAS;QACf,qBAAgB,GAAhB,gBAAgB,CAAqB;QACrC,YAAO,GAAP,OAAO,CAAc;IAC5B,CAAC;IAEJ,KAAK,CAAC,eAAe;QACnB,yCAAyC;QACzC,MAAM,4BAA4B,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAElE,MAAM,KAAK,GAAG,uBAAA,IAAI,oDAAmB,MAAvB,IAAI,EAAoB,4BAA4B,EAAE;YAClE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;SAChC,CAAC,CAAA;QACF,OAAO,uBAAA,IAAI,+CAAc,MAAlB,IAAI,EAAe,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;IACzD,CAAC;CAqCF;AArDD,wBAqDC;kGAnCoB,MAAc,EAAE,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC,yBAED,KAAK,+BAAe,UAA+B,EAAE,KAAe;IAClE,MAAM,QAAQ,GAAsC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,SAAS,GACb,IAAI,CAAC,MAAM,IAAI,OAAO;YACpB,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC;YACxD,CAAC,CAAC,IAAI,CAAA;QAEV,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS,IAAI,OAAO;gBAC1B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aAC1C,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI;aACZ,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAED,OAAO;QACL,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;QAChC,UAAU,EAAE,EAAE;KACf,CAAA;AACH,CAAC"}
+{"version":3,"file":"Byline.js","sourceRoot":"","sources":["../../src/model/Byline.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sHAA6F;AAG7F,MAAa,MAAM;IACjB,MAAM,CAAC,eAAe,CAAC,GAAW;QAChC,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACjC,CAAC;IAED,YACU,MAAc,EACd,MAAe,EACf,OAAkB,EAClB,cAA6B;;QAH7B,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAS;QACf,YAAO,GAAP,OAAO,CAAW;QAClB,mBAAc,GAAd,cAAc,CAAe;IACpC,CAAC;IAEJ,KAAK,CAAC,eAAe;QACnB,yCAAyC;QACzC,MAAM,gBAAgB,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE5D,MAAM,WAAW,GAAG,uBAAA,IAAI,oDAAmB,MAAvB,IAAI,EACtB,gBAAgB,EAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CACzE,CAAA;QAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1B,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,CAAU,CAAA;QACtE,CAAC,CAAC,CACH,CAAA;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAiC,EAAE;YACvE,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACtC,MAAM,IAAI,GAAqB;gBAC7B,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI;aACZ,CAAA;YAED,OAAO,MAAM;gBACX,CAAC,CAAC;oBACE,IAAI,EAAE,QAAQ;oBACd,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE;oBACjB,QAAQ,EAAE,CAAC,IAAI,CAAC;iBACjB;gBACH,CAAC,CAAC,IAAI,CAAA;QACV,CAAC,CAAC,CAAA;QAEF,OAAO,IAAA,oCAA0B,EAC/B;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ;SACY,EACtB,IAAI,CAAC,cAAc,CACpB,CAAA;IACH,CAAC;CAQF;AA1DD,wBA0DC;kGANoB,MAAc,EAAE,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAElC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC"}

package/lib/model/Byline.test.js

@@ -5,92 +5,145 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Byline_1 = require("./Byline");
 const dummyContext_1 = __importDefault(require("../fixtures/dummyContext"));
+const Concept_1 = require("./Concept");
 const vanity = true;
 describe('byline transformation', () => {
     test('adds a link around a single known author', async () => {
         const bylineText = 'Chris Giles in London';
-        const authorUrlMapping = new Map([
-            [
-                'Chris Giles',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-42b3fb15ad28',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                apiUrl: 'https://api.ft.com/people/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                prefLabel: 'Chris Giles',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('adds links around multiple known authors', async () => {
         const bylineText = 'Chris Giles and Martin Wolf in London';
-        const authorUrlMapping = new Map([
-            [
-                'Chris Giles',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-42b3fb15ad28',
-            ],
-            [
-                'Martin Wolf',
-                'https://www.ft.com/stream/uuid/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                apiUrl: 'https://api.ft.com/people/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                prefLabel: 'Chris Giles',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
+                apiUrl: 'https://api.ft.com/people/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
+                prefLabel: 'Martin Wolf',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('ignores unknown authors in byline text', async () => {
         const bylineText = 'Chris Giles and Nick Ramsbottom in London';
-        const authorUrlMapping = new Map([
-            [
-                'Chris Giles',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-42b3fb15ad28',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                apiUrl: 'https://api.ft.com/people/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+                prefLabel: 'Chris Giles',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('ignores extra authors in annotations array', async () => {
         const bylineText = 'Martin Wolf in London';
-        const authorUrlMapping = new Map([
-            [
-                'Chris Giles',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-42b3fb15ad28',
-            ],
-            [
-                'Martin Wolf',
-                'https://www.ft.com/stream/uuid/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
+                apiUrl: 'https://api.ft.com/people/7c1e1e72-57ae-4461-862a-f8d24dd42e22',
+                prefLabel: 'Martin Wolf',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('handles bylines without any matching authors', async () => {
         const bylineText = 'Chris Giles and Nick Ramsbottom in London';
-        const authorUrlMapping = new Map([]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('converts straight apostrophes in byline', async () => {
         const bylineText = "Sarah O'Connor in Bali";
-        const authorUrlMapping = new Map([
-            [
-                'Sarah O’Connor',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
+                apiUrl: 'https://api.ft.com/people/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
+                prefLabel: 'Sarah O’Connor',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
     test('leaves curly apostrophes in byline', async () => {
         const bylineText = 'Sarah O’Connor in Bali';
-        const authorUrlMapping = new Map([
-            [
-                'Sarah O’Connor',
-                'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
-            ],
-        ]);
-        const byline = new Byline_1.Byline(bylineText, vanity, authorUrlMapping, dummyContext_1.default);
+        const authors = [
+            new Concept_1.Concept({
+                id: 'https://api.ft.com/things/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
+                apiUrl: 'https://api.ft.com/people/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
+                prefLabel: 'Sarah O’Connor',
+                directType: 'http://www.ft.com/ontology/person/Person',
+                predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+                types: [
+                    'http://www.ft.com/ontology/core/Thing',
+                    'http://www.ft.com/ontology/concept/Concept',
+                    'http://www.ft.com/ontology/person/Person',
+                ],
+            }, dummyContext_1.default),
+        ];
+        const byline = new Byline_1.Byline(bylineText, vanity, authors);
         const result = await byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });

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

@@ -1 +1 @@
-{"version":3,"file":"Byline.test.js","sourceRoot":"","sources":["../../src/model/Byline.test.ts"],"names":[],"mappings":";;;;;AAAA,qCAAiC;AACjC,4EAA8C;AAC9C,MAAM,MAAM,GAAG,IAAI,CAAA;AAEnB,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uCAAuC,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,UAAU,GAAG,2CAA2C,CAAA;QAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,UAAU,GAAG,2CAA2C,CAAA;QAC9D,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAE7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,UAAU,GAAG,wBAAwB,CAAA;QAC3C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,gBAAgB;gBAChB,qEAAqE;aACtE;SACF,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAE7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,UAAU,GAAG,wBAAwB,CAAA;QAC3C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,gBAAgB;gBAChB,qEAAqE;aACtE;SACF,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,sBAAO,CAAC,CAAA;QACxE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAA;QAE7C,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Byline.test.js","sourceRoot":"","sources":["../../src/model/Byline.test.ts"],"names":[],"mappings":"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"}

package/lib/model/CapiResponse.d.ts

@@ -1,11 +1,11 @@
-import type { ImageSet, ContentTypeSchemas, ClipSet } from '../types/internal-content';
+import type { ImageSet, ContentTypeSchemas, ClipSet } from './schemas/capi/internal-content';
 import type { QueryContext } from '..';
 import { CAPIImage } from './Image';
 import { Concept } from './Concept';
 import { Person } from './Person';
 import { AccessLevel, ContentType, PackageDesign, CanBeSyndicated } from '../resolvers/scalars';
 import { LiteralUnionScalarValues } from '../resolvers/literal-union';
-import { ContentPackageContainsArgs, ContentUrlArgs, Media, TableOfContents } from '../generated';
+import { ContentAnnotationsArgs, ContentPackageContainsArgs, ContentUrlArgs, Media, TableOfContents } from '../generated';
 import { RichText } from './RichText';
 type Design = {
     theme: LiteralUnionScalarValues<typeof PackageDesign>;
@@ -27,14 +27,10 @@ export declare class CapiResponse {
         description: string;
     } | null | undefined;
     byline({ vanity }: Partial<ContentUrlArgs>): Promise<{
-        tree: {
-            type: string;
-            children: (import("../resolvers/content-tree/Workarounds").AuthorLink | import("@financial-times/content-tree").ContentTree.Text)[];
-        };
-        references: never[];
-    }> | null;
-    rawByline(): string | null;
-    annotations(): Concept[];
+        tree: import("@financial-times/content-tree").ContentTree.Parent;
+        references: import("../resolvers/content-tree/references").ReferenceWithCAPIData[];
+    } | null>;
+    annotations({ byPredicate }?: ContentAnnotationsArgs): Concept[];
     types(): string[];
     url({ relative, vanity }: Partial<ContentUrlArgs>): Promise<string>;
     absoluteUrl(vanity?: boolean | null): Promise<string>;
@@ -80,12 +76,13 @@ export declare class CapiResponse {
         textShadow?: boolean | undefined;
         layoutWidth?: string | undefined;
     } | null | undefined;
-    authors(): Person[] | null;
+    authors(): Promise<Person[]>;
+    primaryAuthor(): Promise<Person | null>;
     accessLevel(): LiteralUnionScalarValues<typeof AccessLevel>;
     editorialDesk(): string | null;
     canBeSyndicated(): LiteralUnionScalarValues<typeof CanBeSyndicated>;
     instantAlertConcept(): Concept | null;
-    originatingParty(): string | null;
+    originatingParty(): "Reuters" | "FT";
     summary(): {
         bodyXML: string;
     } | null | undefined;
@@ -95,7 +92,8 @@ export declare class CapiResponse {
     publishedDate(): string;
     publishedTimestamp(): number;
     firstPublishedDate(): string;
-    publishReference(): string;
+    modifiedTimestamp(): number;
+    publishReference(): string | null;
     alternativeTitle(): {
         promotionalTitle: string;
     } | null;
@@ -106,7 +104,7 @@ export declare class CapiResponse {
     containedIn(): Promise<CapiResponse | null>;
     metaLink(): Promise<Concept | CapiResponse | null>;
     metaAltLink(): Promise<Concept | null>;
-    metaPrefixText(): Promise<string>;
+    metaPrefixText(): Promise<string | null>;
     teaser(): CapiResponse;
     isEditorsChoice(): boolean;
     isExclusive(): boolean;
@@ -118,14 +116,12 @@ export declare class CapiResponse {
     mainImage(): CAPIImage | null;
     teaserImage(): CAPIImage | null;
     rawCapiData(): ContentTypeSchemas;
-    getAuthorUrlMapping(): Map<string, string>;
     getBrandConcept(): Concept | undefined;
     getGenreConcept(): Concept | undefined;
     getPodcastBrandConcept(): Concept | undefined;
     getPackageBrandConcept(): Concept | undefined;
     getDisplayConcept(): Concept | undefined;
     getPodcastDisplayConcept(): Concept | undefined;
-    getAuthors(): Concept[];
     isColumn(): boolean;
     isOpinion(): boolean;
     isAlphaville(): boolean;

package/lib/model/CapiResponse.js

@@ -7,7 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _CapiResponse_instances, _CapiResponse_rawAnnotations, _CapiResponse_teaserMetadata, _CapiResponse_createCAPIImage, _CapiResponse_createStreamLink;
+var _CapiResponse_instances, _CapiResponse_rawAnnotations, _CapiResponse_teaserMetadata, _CapiResponse_createCAPIImage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CapiResponse = void 0;
 const n_concept_ids_1 = __importDefault(require("@financial-times/n-concept-ids"));
@@ -17,7 +17,6 @@ const errors_1 = require("@dotcom-reliability-kit/errors");
 const lodash_sortby_1 = __importDefault(require("lodash.sortby"));
 const Image_1 = require("./Image");
 const Concept_1 = require("./Concept");
-const Person_1 = require("./Person");
 const isError_1 = __importDefault(require("../helpers/isError"));
 const metadata_1 = require("../helpers/metadata");
 const capi_1 = require("./schemas/capi");
@@ -116,21 +115,18 @@ class CapiResponse {
             return this.capiData.leadFlourish;
         return null;
     }
-    byline({ vanity }) {
-        const bylineText = this.rawByline();
-        if (!bylineText)
+    async byline({ vanity }) {
+        if (!this.capiData.byline)
             return null;
-        const authorUrlMapping = this.getAuthorUrlMapping();
-        return new Byline_1.Byline(bylineText, Boolean(vanity), authorUrlMapping, this.context).buildBylineTree();
+        const byline = new Byline_1.Byline(this.capiData.byline, Boolean(vanity), this.annotations({ byPredicate: Concept_1.predicates.hasAuthor }), this);
+        return byline.buildBylineTree();
     }
-    rawByline() {
-        if ('byline' in this.capiData && this.capiData.byline) {
-            return this.capiData.byline;
+    annotations({ byPredicate } = {}) {
+        const concepts = (0, lodash_sortby_1.default)(__classPrivateFieldGet(this, _CapiResponse_instances, "m", _CapiResponse_rawAnnotations).call(this), ['predicate', 'id']).map((concept) => new Concept_1.Concept(concept, this.context));
+        if (byPredicate) {
+            return concepts.filter((concept) => concept.predicate() === byPredicate);
         }
-        return null;
-    }
-    annotations() {
-        return (0, lodash_sortby_1.default)(__classPrivateFieldGet(this, _CapiResponse_instances, "m", _CapiResponse_rawAnnotations).call(this), ['predicate', 'id']).map((concept) => new Concept_1.Concept(concept, this.context));
+        return concepts;
     }
     types() {
         return this.capiData.types;
@@ -171,11 +167,18 @@ class CapiResponse {
             return this.capiData.topper;
         return null;
     }
-    authors() {
-        const authors = this.getAuthors();
-        return authors.length === 0
-            ? null
-            : authors.map((author) => new Person_1.Person(author, this, this.context));
+    async authors() {
+        const authors = this.annotations({ byPredicate: Concept_1.predicates.hasAuthor });
+        return Promise.all(authors.map((author) => this.context.dataSources.capi.getPerson(author.uuid())));
+    }
+    async primaryAuthor() {
+        const primaryAuthor = this.annotations({
+            byPredicate: Concept_1.predicates.hasAuthor,
+        })[0];
+        if (primaryAuthor) {
+            return this.context.dataSources.capi.getPerson(primaryAuthor.uuid());
+        }
+        return null;
     }
     accessLevel() {
         return this.capiData.accessLevel ?? 'subscribed';
@@ -187,11 +190,10 @@ class CapiResponse {
         return this.capiData.canBeSyndicated;
     }
     instantAlertConcept() {
-        const authors = this.getAuthors();
-        const authorConcept = authors.length === 1 ? authors[0] : null;
+        const authors = this.annotations({ byPredicate: Concept_1.predicates.hasAuthor });
         const displayConcept = this.getDisplayConcept();
-        if ((this.isOpinion() || this.isAlphaville()) && authorConcept) {
-            return authorConcept;
+        if ((this.isColumn() || this.isAlphaville()) && authors[0]) {
+            return authors[0];
         }
         else if (displayConcept?.isOrganisation()) {
             return displayConcept;
@@ -233,16 +235,25 @@ class CapiResponse {
         return null;
     }
     publishedDate() {
+        // WARNING:20240815:RB: "publishedDate" is only updated for editorial
+        // publishes where they explictly check a box to update it. If you need
+        // all editorial changes you may be after "lastModified" instead.
         return this.capiData.publishedDate;
     }
     publishedTimestamp() {
+        // WARNING:20240815:RB: "publishedTimestamp" is only updated for editorial
+        // publishes where they explictly check a box to update it. If you need
+        // all editorial changes you may be after "modifiedTimestamp" instead.
         return new Date(this.capiData.publishedDate).getTime();
     }
     firstPublishedDate() {
         return this.capiData.firstPublishedDate || this.capiData.publishedDate;
     }
+    modifiedTimestamp() {
+        return new Date(this.capiData.lastModified).getTime();
+    }
     publishReference() {
-        return this.capiData.publishReference;
+        return this.capiData.publishReference ?? null;
     }
     alternativeTitle() {
         return this.capiData.alternativeTitles ?? null;
@@ -310,7 +321,7 @@ class CapiResponse {
     }
     async metaPrefixText() {
         const meta = await __classPrivateFieldGet(this, _CapiResponse_instances, "m", _CapiResponse_teaserMetadata).call(this);
-        return meta.prefixText;
+        return meta.prefixText ?? null;
     }
     teaser() {
         const clone = (0, clone_deep_1.default)(this.capiData);
@@ -356,16 +367,6 @@ class CapiResponse {
     rawCapiData() {
         return (0, clone_deep_1.default)(this.capiData);
     }
-    getAuthorUrlMapping() {
-        const authorAnnotations = this.getAuthors();
-        return authorAnnotations.reduce((mapping, author) => {
-            if (author.prefLabel()) {
-                const nameWithCurlyApostrophes = author.prefLabel().replace("'", '’');
-                mapping.set(nameWithCurlyApostrophes, __classPrivateFieldGet(this, _CapiResponse_instances, "m", _CapiResponse_createStreamLink).call(this, author.uuid()));
-            }
-            return mapping;
-        }, new Map());
-    }
     getBrandConcept() {
         return this.annotations().find((annotation) => annotation.isBrand());
     }
@@ -384,11 +385,9 @@ class CapiResponse {
     getPodcastDisplayConcept() {
         return this.annotations().find((annotation) => annotation.isPodcastDisplayConcept());
     }
-    getAuthors() {
-        return this.annotations().filter((annotation) => annotation.isAuthor());
-    }
     isColumn() {
-        return this.isOpinion() && this.getAuthors().length === 1;
+        return (this.isOpinion() &&
+            this.annotations({ byPredicate: Concept_1.predicates.hasAuthor }).length === 1);
     }
     isOpinion() {
         // CI-2038 HACK to identify live blog opinion posts by the "Comment:" prefix in the title
@@ -541,7 +540,5 @@ _CapiResponse_instances = new WeakSet(), _CapiResponse_rawAnnotations = function
         return new Image_1.CAPIImage(image.members[0], this.context);
     }
     return null;
-}, _CapiResponse_createStreamLink = function _CapiResponse_createStreamLink(streamUuid) {
-    return `https://www.ft.com/stream/${streamUuid}`;
 };
 //# sourceMappingURL=CapiResponse.js.map