@financial-times/cp-content-pipeline-schema 0.7.27 → 0.7.29

package/lib/model/CapiResponse.test.js

@@ -6,23 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const CapiResponse_1 = require("./CapiResponse");
 const capiObject_1 = require("../fixtures/capiObject");
 const clone_deep_1 = __importDefault(require("clone-deep"));
-const now = Date.now();
-const context = {
-    dataSources: {
-        capi: {
-            getContent: (id) => Promise.resolve(new CapiResponse_1.CapiResponse((0, clone_deep_1.default)({
-                ...capiObject_1.baseCapiObject,
-                id,
-                publishedDate: new Date(now + parseInt(id.slice(-1), 10)).toISOString(),
-            }), {})),
-        },
-    },
-};
+const dummyContext_1 = __importDefault(require("../fixtures/dummyContext"));
 describe('CAPI response', () => {
     describe('Content ID', () => {
         test('returns the UUID', () => {
             const article = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
-            const capiResponse = new CapiResponse_1.CapiResponse(article, context);
+            const capiResponse = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
             expect(capiResponse.id()).toEqual('3071cae8-a27c-4ab4-a0d4-7bb00df1d477');
         });
     });
@@ -39,7 +28,7 @@ describe('CAPI response', () => {
                     prefLabel: straighQuoteAuthorName,
                 },
             ];
-            const capiResponse = new CapiResponse_1.CapiResponse(article, context);
+            const capiResponse = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
             expect(capiResponse.getAuthorUrlMapping().get(curlyQuoteAuthorName)).toBeDefined();
             expect(capiResponse.getAuthorUrlMapping().get(straighQuoteAuthorName)).toBeUndefined();
         });
@@ -48,7 +37,7 @@ describe('CAPI response', () => {
         test(`uses first entry in types if there's no type`, () => {
             const article = (0, clone_deep_1.default)(capiObject_1.baseCapiObject);
             delete article.type;
-            const capiResponseArticle = new CapiResponse_1.CapiResponse(article, context);
+            const capiResponseArticle = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
             expect(capiResponseArticle.type()).toEqual('Article');
         });
         test('converts valid content types to their name', async () => {
@@ -57,8 +46,8 @@ describe('CAPI response', () => {
                 ...capiObject_1.baseCapiObject,
                 type: 'http://www.ft.com/ontology/content/LiveBlogPackage',
             });
-            const capiResponseArticle = new CapiResponse_1.CapiResponse(article, context);
-            const capiResponseLiveBlogPackage = new CapiResponse_1.CapiResponse(liveBlogPackage, context);
+            const capiResponseArticle = new CapiResponse_1.CapiResponse(article, dummyContext_1.default);
+            const capiResponseLiveBlogPackage = new CapiResponse_1.CapiResponse(liveBlogPackage, dummyContext_1.default);
             expect(capiResponseArticle.type()).toEqual('Article');
             expect(capiResponseLiveBlogPackage.type()).toEqual('LiveBlogPackage');
         });
@@ -67,7 +56,7 @@ describe('CAPI response', () => {
                 ...capiObject_1.baseCapiObject,
                 type: 'http://www.ft.com/ontology/content/Unknown',
             });
-            const capiResponse = new CapiResponse_1.CapiResponse(unknown, context);
+            const capiResponse = new CapiResponse_1.CapiResponse(unknown, dummyContext_1.default);
             expect(() => capiResponse.type()).toThrowError('Content type is invalid: http://www.ft.com/ontology/content/Unknown');
         });
     });
@@ -91,7 +80,7 @@ describe('CAPI response', () => {
                     },
                 ],
             });
-            const capiResponse = new CapiResponse_1.CapiResponse(liveBlogPackage, context);
+            const capiResponse = new CapiResponse_1.CapiResponse(liveBlogPackage, dummyContext_1.default);
             const liveBlogPosts = await capiResponse.liveBlogPosts();
             expect(liveBlogPosts[0].id()).toEqual('00000000-0000-0000-0000-000000000002');
             expect(liveBlogPosts[1].id()).toEqual('00000000-0000-0000-0000-000000000001');

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;AAEvD,4DAAkC;AAIlC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AAEtB,MAAM,OAAO,GAAG;IACd,WAAW,EAAE;QACX,IAAI,EAAE;YACJ,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CACzB,OAAO,CAAC,OAAO,CACb,IAAI,2BAAY,CACd,IAAA,oBAAS,EAAC;gBACR,GAAG,2BAAc;gBACjB,EAAE;gBACF,aAAa,EAAE,IAAI,IAAI,CACrB,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACjC,CAAC,WAAW,EAAE;aAChB,CAAC,EACF,EAA6B,CAC9B,CACF;SACJ;KACF;CACyB,CAAA;AAE5B,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,OAAO,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,OAAO,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,OAAO,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,OAAO,CAAC,CAAA;YAC9D,MAAM,2BAA2B,GAAG,IAAI,2BAAY,CAClD,eAAe,EACf,OAAO,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,OAAO,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,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,OAAO,CAAC,CAAA;YAC/D,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAA;YACxD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,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":";;;;;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,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,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,sCAAsC,CACvC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CACnC,sCAAsC,CACvC,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/model/schemas/capi/content-package.d.ts

@@ -76,13 +76,13 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         enabled: boolean;
     }>;
     bodyXML: import("zod").ZodString;
-    summary: import("zod").ZodObject<{
+    summary: import("zod").ZodOptional<import("zod").ZodObject<{
         bodyXML: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         bodyXML: string;
     }, {
         bodyXML: string;
-    }>;
+    }>>;
     alternativeTitles: import("zod").ZodOptional<import("zod").ZodObject<{
         promotionalTitle: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
@@ -552,9 +552,6 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         enabled: boolean;
     };
     bodyXML: string;
-    summary: {
-        bodyXML: string;
-    };
     contains: {
         id: string;
         apiUrl: string;
@@ -570,6 +567,9 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
     } | undefined;
+    summary?: {
+        bodyXML: string;
+    } | undefined;
     alternativeTitles?: {
         promotionalTitle: string;
     } | undefined;
@@ -696,9 +696,6 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         enabled: boolean;
     };
     bodyXML: string;
-    summary: {
-        bodyXML: string;
-    };
     contains: {
         id: string;
         apiUrl: string;
@@ -714,6 +711,9 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
     } | undefined;
+    summary?: {
+        bodyXML: string;
+    } | undefined;
     alternativeTitles?: {
         promotionalTitle: string;
     } | undefined;

package/lib/model/schemas/capi/content-package.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contentPackageSchema = void 0;
 const base_schema_1 = require("./base-schema");
-const contentPackageContentSchema = base_schema_1.baseContentSchema.pick({
+const contentPackageContentSchema = base_schema_1.baseContentSchema
+    .pick({
     title: true,
     summary: true,
     alternativeTitles: true,
@@ -10,7 +11,12 @@ const contentPackageContentSchema = base_schema_1.baseContentSchema.pick({
     tableOfContents: true,
     design: true,
     bodyXML: true,
-});
+})
+    .merge(base_schema_1.baseContentSchema
+    .pick({
+    summary: true,
+})
+    .partial());
 const contentPackageMetadataSchema = base_schema_1.baseMetadataSchema.pick({
     id: true,
     annotations: true,

package/lib/model/schemas/capi/content-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-package.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/content-package.ts"],"names":[],"mappings":";;;AAAA,+CAIsB;AAEtB,MAAM,2BAA2B,GAAG,+BAAiB,CAAC,IAAI,CAAC;IACzD,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,IAAI;IACvB,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;CACd,CAAC,CAAA;AAEF,MAAM,4BAA4B,GAAG,gCAAkB,CAAC,IAAI,CAAC;IAC3D,EAAE,EAAE,IAAI;IACR,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;CACf,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,6BAAe,CAAC,IAAI,CAAC;IACrD,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;CACjB,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,2BAA2B;KAC5D,KAAK,CAAC,4BAA4B,CAAC;KACnC,KAAK,CAAC,yBAAyB,CAAC,CAAA"}
+{"version":3,"file":"content-package.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/content-package.ts"],"names":[],"mappings":";;;AAAA,+CAIsB;AAEtB,MAAM,2BAA2B,GAAG,+BAAiB;KAClD,IAAI,CAAC;IACJ,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,IAAI;IACvB,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,KAAK,CACJ,+BAAiB;KACd,IAAI,CAAC;IACJ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,OAAO,EAAE,CACb,CAAA;AAEH,MAAM,4BAA4B,GAAG,gCAAkB,CAAC,IAAI,CAAC;IAC3D,EAAE,EAAE,IAAI;IACR,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;CACf,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,6BAAe,CAAC,IAAI,CAAC;IACrD,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;CACjB,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,2BAA2B;KAC5D,KAAK,CAAC,4BAA4B,CAAC;KACnC,KAAK,CAAC,yBAAyB,CAAC,CAAA"}

package/lib/resolvers/concept.js

@@ -4,6 +4,7 @@ const resolvers = {
     Concept: {
         apiUrl: (parent) => parent.apiUrl(),
         directType: (parent) => parent.directType(),
+        isPackageBrand: (parent) => parent.isPackageBrand(),
         id: (parent) => parent.uuid(),
         predicate: (parent) => parent.predicate(),
         prefLabel: (parent) => parent.prefLabel(),

package/lib/resolvers/concept.js.map

@@ -1 +1 @@
-{"version":3,"file":"concept.js","sourceRoot":"","sources":["../../src/resolvers/concept.ts"],"names":[],"mappings":";;AAKA,MAAM,SAAS,GAAkC;IAC/C,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QAC3C,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QACjC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;KAC9C;CACF,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"concept.js","sourceRoot":"","sources":["../../src/resolvers/concept.ts"],"names":[],"mappings":";;AAEA,MAAM,SAAS,GAAkC;IAC/C,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QACnC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QACnD,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QACjC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;KAC9C;CACF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/resolvers/content.d.ts

@@ -4,14 +4,14 @@ declare const resolvers: {
     Content: {
         __resolveType: (parent: import("../model/CapiResponse").CapiResponse) => "Article" | "Video" | "Audio" | "LiveBlogPackage" | "LiveBlogPost" | "ContentPackage";
         body(parent: import("../model/CapiResponse").CapiResponse): RichText;
-        topper: (parent: import("../model/CapiResponse").CapiResponse, args: {}, context: import("..").QueryContext) => Topper;
-        byline(parent: import("../model/CapiResponse").CapiResponse): {
+        topper: (parent: import("../model/CapiResponse").CapiResponse, _: {}, context: import("..").QueryContext) => Topper;
+        byline(parent: import("../model/CapiResponse").CapiResponse, args: Partial<import("../generated").ContentBylineArgs>, context: import("..").QueryContext): Promise<{
             tree: {
                 type: string;
                 children: (import("./content-tree/Workarounds").AuthorLink | import("@financial-times/content-tree").ContentTree.Text)[];
             };
             references: never[];
-        } | null;
+        }> | null;
         url: (parent: import("../model/CapiResponse").CapiResponse, args: Partial<import("../generated").ContentUrlArgs>) => Promise<string>;
         type: (parent: import("../model/CapiResponse").CapiResponse) => "Article" | "Video" | "Audio" | "LiveBlogPackage" | "LiveBlogPost" | "ContentPackage" | "Content" | "MediaResource";
         mainImage: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Image").CAPIImage | null;
@@ -32,7 +32,7 @@ declare const resolvers: {
         };
     };
     Article: {
-        containedIn: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/CapiResponse").CapiResponse> | null;
+        containedIn: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/CapiResponse").CapiResponse | null>;
     };
     LiveBlogPackage: {
         liveBlogPosts: (parent: import("../model/CapiResponse").CapiResponse) => Promise<[] | import("../model/CapiResponse").CapiResponse[]>;

package/lib/resolvers/content.js

@@ -18,13 +18,14 @@ const resolvers = {
         body(parent) {
             return new RichText_1.RichText('bodyXML', parent.bodyXML(), parent);
         },
-        topper: (parent, args, context) => new Topper_1.Topper(parent, context),
-        byline(parent) {
+        topper: (parent, _, context) => new Topper_1.Topper(parent, context),
+        byline(parent, args, context) {
+            const vanity = Boolean(args.vanity);
             const bylineText = parent.byline();
             if (!bylineText)
                 return null;
             const authorUrlMapping = parent.getAuthorUrlMapping();
-            return new Byline_1.Byline(bylineText, authorUrlMapping).buildBylineTree();
+            return new Byline_1.Byline(bylineText, vanity, authorUrlMapping, context).buildBylineTree();
         },
         url: (parent, args) => args.relative
             ? parent.relativeUrl(args?.vanity)

package/lib/resolvers/content.js.map

@@ -1 +1 @@
-{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/resolvers/content.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"content.js","sourceRoot":"","sources":["../../src/resolvers/content.ts"],"names":[],"mappings":";;AAAA,4CAAwC;AACxC,4CAAwC;AAQxC,gDAA4C;AAE5C,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE;QACP,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE;YACxB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;YAC1B,IAAI,IAAI,KAAK,SAAS,EAAE;gBACtB,OAAO,SAAS,CAAA;aACjB;YAED,IAAI,IAAI,KAAK,eAAe,EAAE;gBAC5B,OAAO,OAAO,CAAA;aACf;YAED,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,CAAC,MAAM;YACT,OAAO,IAAI,mBAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;QAC1D,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,eAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAC3D,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAA;YAElC,IAAI,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAA;YAC5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAA;YAErD,OAAO,IAAI,eAAM,CACf,UAAU,EACV,MAAM,EACN,gBAAgB,EAChB,OAAO,CACR,CAAC,eAAe,EAAE,CAAA;QACrB,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CACpB,IAAI,CAAC,QAAQ;YACX,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;YAClC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;QAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACzC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC/C,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,EAAE;QACzD,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QACjD,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QAC7C,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QAC7C,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;QACrD,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;QACrD,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;KACpC;IAED,OAAO,EAAE;QACP,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;KAC9C;IAED,eAAe,EAAE;QACf,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QACjD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;KACxC;IAED,cAAc,EAAE;QACd,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;KACxC;IAED,KAAK,EAAE;QACL,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE;QAChB,uDAAuD;QACvD,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,KAAK,YAAY,CAAC;YACrE,IAAI;KACP;CAOF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/lib/resolvers/index.d.ts

@@ -41,10 +41,10 @@ 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) => import("../model/Concept").Concept | null;
-        metaAltLink: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Concept").Concept | null;
-        metaPrefixText: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
-        metaSuffixText: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
+        metaLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | null>;
+        metaAltLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | null>;
+        metaPrefixText: (parent: import("../model/CapiResponse").CapiResponse) => Promise<string | null>;
+        metaSuffixText: (parent: import("../model/CapiResponse").CapiResponse) => Promise<string | null>;
         image: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Image").CAPIImage | null;
         indicators(parent: import("../model/CapiResponse").CapiResponse): {
             accessLevel: "premium" | "subscribed" | "registered" | "free";
@@ -108,14 +108,14 @@ declare const resolvers: {
     Content: {
         __resolveType: (parent: import("../model/CapiResponse").CapiResponse) => "Article" | "Video" | "Audio" | "LiveBlogPackage" | "LiveBlogPost" | "ContentPackage";
         body(parent: import("../model/CapiResponse").CapiResponse): import("../model/RichText").RichText;
-        topper: (parent: import("../model/CapiResponse").CapiResponse, args: {}, context: import("..").QueryContext) => import("../model/Topper").Topper;
-        byline(parent: import("../model/CapiResponse").CapiResponse): {
+        topper: (parent: import("../model/CapiResponse").CapiResponse, _: {}, context: import("..").QueryContext) => import("../model/Topper").Topper;
+        byline(parent: import("../model/CapiResponse").CapiResponse, args: Partial<import("../generated").ContentBylineArgs>, context: import("..").QueryContext): Promise<{
             tree: {
                 type: string;
                 children: (import("./content-tree/Workarounds").AuthorLink | import("@financial-times/content-tree").ContentTree.Text)[];
             };
             references: never[];
-        } | null;
+        }> | null;
         url: (parent: import("../model/CapiResponse").CapiResponse, args: Partial<import("../generated").ContentUrlArgs>) => Promise<string>;
         type: (parent: import("../model/CapiResponse").CapiResponse) => "Article" | "Video" | "Audio" | "LiveBlogPackage" | "LiveBlogPost" | "ContentPackage" | "Content" | "MediaResource";
         mainImage: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Image").CAPIImage | null;
@@ -136,7 +136,7 @@ declare const resolvers: {
         };
     };
     Article: {
-        containedIn: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/CapiResponse").CapiResponse> | null;
+        containedIn: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/CapiResponse").CapiResponse | null>;
     };
     LiveBlogPackage: {
         liveBlogPosts: (parent: import("../model/CapiResponse").CapiResponse) => Promise<[] | import("../model/CapiResponse").CapiResponse[]>;

package/lib/resolvers/teaser.d.ts

@@ -2,10 +2,10 @@ 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) => import("../model/Concept").Concept | null;
-        metaAltLink: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Concept").Concept | null;
-        metaPrefixText: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
-        metaSuffixText: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
+        metaLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | null>;
+        metaAltLink: (parent: import("../model/CapiResponse").CapiResponse) => Promise<import("../model/Concept").Concept | null>;
+        metaPrefixText: (parent: import("../model/CapiResponse").CapiResponse) => Promise<string | null>;
+        metaSuffixText: (parent: import("../model/CapiResponse").CapiResponse) => Promise<string | null>;
         image: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Image").CAPIImage | null;
         indicators(parent: import("../model/CapiResponse").CapiResponse): {
             accessLevel: "premium" | "subscribed" | "registered" | "free";

package/package.json

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

package/src/fixtures/dummyContext.ts

@@ -0,0 +1,28 @@
+import { CapiResponse } from '../model/CapiResponse'
+import { baseCapiObject } from './capiObject'
+import cloneDeep from 'clone-deep'
+import { QueryContext } from '..'
+const now = Date.now()
+
+export default {
+  dataSources: {
+    vanityUrls: {
+      get: (url: string) => Promise.resolve(url),
+    },
+    capi: {
+      getContent: (id: string) =>
+        Promise.resolve(
+          new CapiResponse(
+            cloneDeep({
+              ...baseCapiObject,
+              id,
+              publishedDate: new Date(
+                now + parseInt(id.slice(-1), 10)
+              ).toISOString(),
+            }),
+            {} as unknown as QueryContext
+          )
+        ),
+    },
+  },
+} as unknown as QueryContext

package/src/generated/index.ts

@@ -70,6 +70,11 @@ export type Article = Content & {
 };
 
 
+export type ArticleBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type ArticleUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -100,6 +105,11 @@ export type Audio = Content & {
 };
 
 
+export type AudioBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type AudioUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -130,13 +140,14 @@ export type BrandedTopper = Topper & TopperWithBrand & TopperWithTheme & {
 };
 
 export type Concept = {
-  readonly apiUrl: Scalars['String']['output'];
+  readonly apiUrl?: Maybe<Scalars['String']['output']>;
   readonly directType?: Maybe<Scalars['String']['output']>;
   readonly id: Scalars['ID']['output'];
-  readonly predicate: Scalars['String']['output'];
+  readonly isPackageBrand?: Maybe<Scalars['Boolean']['output']>;
+  readonly predicate?: Maybe<Scalars['String']['output']>;
   readonly prefLabel: Scalars['String']['output'];
   readonly type?: Maybe<Scalars['String']['output']>;
-  readonly types: ReadonlyArray<Scalars['String']['output']>;
+  readonly types?: Maybe<ReadonlyArray<Scalars['String']['output']>>;
   readonly url: Scalars['String']['output'];
 };
 
@@ -170,6 +181,11 @@ export type Content = {
 };
 
 
+export type ContentBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type ContentUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -201,6 +217,11 @@ export type ContentPackage = Content & {
 };
 
 
+export type ContentPackageBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type ContentPackageUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -512,6 +533,11 @@ export type LiveBlogPackage = Content & {
 };
 
 
+export type LiveBlogPackageBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type LiveBlogPackageUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -541,6 +567,11 @@ export type LiveBlogPost = Content & {
 };
 
 
+export type LiveBlogPostBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type LiveBlogPostUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -808,6 +839,11 @@ export type Video = Content & {
 };
 
 
+export type VideoBylineArgs = {
+  vanity?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
+
 export type VideoUrlArgs = {
   relative?: InputMaybe<Scalars['Boolean']['input']>;
   vanity?: InputMaybe<Scalars['Boolean']['input']>;
@@ -1077,7 +1113,7 @@ export type ArticleResolvers<ContextType = QueryContext, ParentType extends Reso
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<ArticleBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   containedIn?: Resolver<Maybe<ResolversTypes['Content']>, ParentType, ContextType>;
@@ -1102,7 +1138,7 @@ export type AudioResolvers<ContextType = QueryContext, ParentType extends Resolv
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<AudioBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;
@@ -1151,13 +1187,14 @@ export interface CanBeSyndicatedScalarConfig extends GraphQLScalarTypeConfig<Res
 }
 
 export type ConceptResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Concept'] = ResolversParentTypes['Concept']> = ResolversObject<{
-  apiUrl?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  apiUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   directType?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  predicate?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  isPackageBrand?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  predicate?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   prefLabel?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   type?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  types?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>;
+  types?: Resolver<Maybe<ReadonlyArray<ResolversTypes['String']>>, ParentType, ContextType>;
   url?: Resolver<ResolversTypes['String'], ParentType, ContextType, Partial<ConceptUrlArgs>>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
@@ -1170,7 +1207,7 @@ export type ContentResolvers<ContextType = QueryContext, ParentType extends Reso
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<ContentBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;
@@ -1193,7 +1230,7 @@ export type ContentPackageResolvers<ContextType = QueryContext, ParentType exten
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<ContentPackageBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   contains?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Teaser']>>>, ParentType, ContextType>;
@@ -1479,7 +1516,7 @@ export type LiveBlogPackageResolvers<ContextType = QueryContext, ParentType exte
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<LiveBlogPackageBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;
@@ -1505,7 +1542,7 @@ export type LiveBlogPostResolvers<ContextType = QueryContext, ParentType extends
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<LiveBlogPostBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;
@@ -1765,7 +1802,7 @@ export type VideoResolvers<ContextType = QueryContext, ParentType extends Resolv
   annotations?: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Concept']>>>, ParentType, ContextType>;
   body?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   bodyXML?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType>;
+  byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<VideoBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;

package/src/model/Byline.test.ts

@@ -1,4 +1,6 @@
 import { Byline } from './Byline'
+import context from '../fixtures/dummyContext'
+const vanity = true
 
 describe('byline transformation', () => {
   test('adds a link around a single known author', async () => {
@@ -10,8 +12,8 @@ describe('byline transformation', () => {
       ],
     ])
 
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
     expect(result).toMatchSnapshot()
   })
 
@@ -28,8 +30,8 @@ describe('byline transformation', () => {
       ],
     ])
 
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
     expect(result).toMatchSnapshot()
   })
 
@@ -42,8 +44,8 @@ describe('byline transformation', () => {
       ],
     ])
 
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
     expect(result).toMatchSnapshot()
   })
 
@@ -60,8 +62,8 @@ describe('byline transformation', () => {
       ],
     ])
 
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
     expect(result).toMatchSnapshot()
   })
 
@@ -69,8 +71,8 @@ describe('byline transformation', () => {
     const bylineText = 'Chris Giles and Nick Ramsbottom in London'
     const authorUrlMapping: Map<string, string> = new Map([])
 
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
 
     expect(result).toMatchSnapshot()
   })
@@ -83,8 +85,8 @@ describe('byline transformation', () => {
         'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
       ],
     ])
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
 
     expect(result).toMatchSnapshot()
   })
@@ -97,8 +99,8 @@ describe('byline transformation', () => {
         'https://www.ft.com/stream/uuid/1d556016-ad16-4fe7-8724-eeeeeeeeeeee',
       ],
     ])
-    const byline = new Byline(bylineText, authorUrlMapping)
-    const result = byline.buildBylineTree()
+    const byline = new Byline(bylineText, vanity, authorUrlMapping, context)
+    const result = await byline.buildBylineTree()
 
     expect(result).toMatchSnapshot()
   })