@financial-times/cp-content-pipeline-schema 2.6.1 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.7.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.6.2...cp-content-pipeline-schema-v2.7.0) (2024-04-26)
+
+
+### Features
+
+* further reading in live blogs - productionisation ([e5ecfe1](https://github.com/Financial-Times/cp-content-pipeline/commit/e5ecfe1ff81389d660d8ed9caa4623f5e4122d03))
+
+## [2.6.2](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.6.1...cp-content-pipeline-schema-v2.6.2) (2024-04-24)
+
+
+### Bug Fixes
+
+* consolidate bodyXMLToTree errors ([64f082d](https://github.com/Financial-Times/cp-content-pipeline/commit/64f082d6031f589268c98f923aab43044424f97b))
+
 ## [2.6.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.6.0...cp-content-pipeline-schema-v2.6.1) (2024-04-23)
 
 

package/lib/generated/index.d.ts

@@ -1257,6 +1257,8 @@ export type RawImage = Reference & {
     readonly type: Scalars['String']['output'];
 };
 export type Recommended = Reference & {
+    /** Indicates if its inside a live blog */
+    readonly isInLiveBlog?: Maybe<Scalars['Boolean']['output']>;
     /** Recommended references contain teaser thumbnails of related articles. */
     readonly teaser?: Maybe<Teaser>;
     /** The type of the reference, eg. 'recommended'. */
@@ -2341,6 +2343,7 @@ export type RawImageResolvers<ContextType = QueryContext, ParentType extends Res
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export type RecommendedResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Recommended'] = ResolversParentTypes['Recommended']> = ResolversObject<{
+    isInLiveBlog: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
     teaser: Resolver<Maybe<ResolversTypes['Teaser']>, ParentType, ContextType>;
     type: Resolver<ResolversTypes['String'], ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;

package/lib/index.d.ts

@@ -1,9 +1,15 @@
 import { initDataSources, DataSources } from './datasources';
 import type { KeyValueCache } from '@apollo/utils.keyvaluecache';
 import type { Logger } from '@dotcom-reliability-kit/logger';
+import { AnyNode } from './resolvers/content-tree/Workarounds';
 interface Metrics {
     count(metric: string | string[], count?: number): void;
 }
+export type BodyXMLToTreeError = {
+    message: string;
+    expected: AnyNode['type'] | readonly AnyNode['type'][];
+    actual: AnyNode['type'] | AnyNode['type'][];
+};
 export interface QueryContext {
     redisAdapter: KeyValueCache;
     metrics: Metrics;
@@ -16,6 +22,9 @@ export interface QueryContext {
         api: string;
         schema: string;
     };
+    aggregatedErrors?: {
+        bodyXMLToTree: BodyXMLToTreeError[];
+    };
     addSurrogateKeys(keys: string[]): void;
 }
 export declare const articleDocumentQuery: string;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4D;AAuCnD,gGAvCA,6BAAe,OAuCA;AApCxB,8CAAoD;AACpD,4EAAsE;AACtE,2CAA4B;AAC5B,2BAAiC;AAqBpB,QAAA,oBAAoB,GAAG,IAAA,iBAAY,EAC9C,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAC7C,OAAO,CACR,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,qBAAc,EACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,EAChD;IACE,OAAO,EAAE,CAAC,IAAI,uCAAiB,EAAE,CAAC;CACnC,CACF,CAAA;AAGD,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,mHAAA,OAAO,OAAW;AAC3B,yCAA0C;AAAjC,+FAAA,OAAO,OAAA;AAEhB,+FAA8E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4D;AA+CnD,gGA/CA,6BAAe,OA+CA;AA5CxB,8CAAoD;AACpD,4EAAsE;AACtE,2CAA4B;AAC5B,2BAAiC;AA6BpB,QAAA,oBAAoB,GAAG,IAAA,iBAAY,EAC9C,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAC7C,OAAO,CACR,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,qBAAc,EACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,EAChD;IACE,OAAO,EAAE,CAAC,IAAI,uCAAiB,EAAE,CAAC;CACnC,CACF,CAAA;AAGD,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,mHAAA,OAAO,OAAW;AAC3B,yCAA0C;AAAjC,+FAAA,OAAO,OAAA;AAEhB,+FAA8E"}

package/lib/resolvers/content-tree/Workarounds.d.ts

@@ -95,4 +95,7 @@ export interface TableCell extends ContentTree.Parent {
     heading?: boolean;
     children: ContentTree.Phrasing[];
 }
-export type AnyNode = ContentTree.Root | ContentTree.Body | ContentTree.Text | ContentTree.Break | ContentTree.ThematicBreak | ContentTree.Paragraph | ContentTree.Heading | ContentTree.Strong | ContentTree.Emphasis | ContentTree.Strikethrough | ContentTree.Link | ContentTree.List | ContentTree.ListItem | ContentTree.Blockquote | ContentTree.Pullquote | ContentTree.ImageSet | ClipSet | OldClip | ContentTree.Recommended | ContentTree.Tweet | ContentTree.Flourish | ContentTree.BigNumber | ContentTree.ScrollyBlock | ContentTree.ScrollySection | ContentTree.ScrollyCopy | ContentTree.ScrollyHeading | ContentTree.ScrollyImage | ContentTree.Layout | ContentTree.LayoutSlot | ContentTree.LayoutImage | Table | TableCaption | TableFooter | TableBody | TableRow | TableCell | Video | YoutubeVideo | MainImage | MainImageRaw | RawImage | AuthorLink | Cite;
+export interface Recommended extends ContentTree.Recommended {
+    isInLiveBlog?: boolean;
+}
+export type AnyNode = ContentTree.Root | ContentTree.Body | ContentTree.Text | ContentTree.Break | ContentTree.ThematicBreak | ContentTree.Paragraph | ContentTree.Heading | ContentTree.Strong | ContentTree.Emphasis | ContentTree.Strikethrough | ContentTree.Link | ContentTree.List | ContentTree.ListItem | ContentTree.Blockquote | ContentTree.Pullquote | ContentTree.ImageSet | ClipSet | OldClip | Recommended | ContentTree.Tweet | ContentTree.Flourish | ContentTree.BigNumber | ContentTree.ScrollyBlock | ContentTree.ScrollySection | ContentTree.ScrollyCopy | ContentTree.ScrollyHeading | ContentTree.ScrollyImage | ContentTree.Layout | ContentTree.LayoutSlot | ContentTree.LayoutImage | Table | TableCaption | TableFooter | TableBody | TableRow | TableCell | Video | YoutubeVideo | MainImage | MainImageRaw | RawImage | AuthorLink | Cite;

package/lib/resolvers/content-tree/bodyXMLToTree.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cheerio = __importStar(require("cheerio"));
 const domhandler_1 = require("domhandler");
+const errors_1 = require("@dotcom-reliability-kit/errors");
 function isNode(node) {
     return Boolean(node && 'type' in node);
 }
@@ -53,6 +54,7 @@ function bodyXMLToTree(xml, tagMappings, context) {
         return [];
     }
     const body = traverse($('body')[0]);
+    logErrors(context);
     if (Array.isArray(body) || !isNode(body)) {
         throw new Error(`Unexpected mapping result for body node, received ${JSON.stringify(body)}`);
     }
@@ -62,4 +64,17 @@ function bodyXMLToTree(xml, tagMappings, context) {
     return body;
 }
 exports.default = bodyXMLToTree;
+function logErrors(context) {
+    if (!context?.aggregatedErrors?.bodyXMLToTree.length)
+        return;
+    context.logger.error({
+        event: 'RECOVERABLE_ERROR',
+        message: 'Unexpected structure in bodyXMLToTree',
+        error: new errors_1.OperationalError({
+            code: 'AGGREGATED_BODY_XML_UNEXPECTED_STRUCTURE',
+            errors: context.aggregatedErrors?.bodyXMLToTree,
+        }),
+    });
+    context.aggregatedErrors.bodyXMLToTree = [];
+}
 //# sourceMappingURL=bodyXMLToTree.js.map

package/lib/resolvers/content-tree/bodyXMLToTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAKlC,2CAA0C;AAE1C,SAAS,MAAM,CAAC,IAAkC;IAChD,OAAO,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAA;AACxC,CAAC;AAUD;;;EAGE;AACF,SAAwB,aAAa,CACnC,GAAW,EACX,WAAwB,EACxB,OAAsB;IAEtB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,0BAA0B,GAAG,CAAC,QAAwB,EAAa,EAAE,CACzE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5B,SAAS,QAAQ,CAAC,IAAkB;QAClC,IAAI,IAAA,mBAAM,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI,CAAC,IAAI;aACjB,CAAA;SACF;aAAM,IAAI,IAAA,kBAAK,EAAC,IAAI,CAAC,EAAE;YACtB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC7D,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,OAAO,oBAAoB,CACzB,CAAC,CAAC,IAAI,CAAC,EACP,GAAG,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC/C,OAAO,CACR,CAAA;aACF;YAED,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACjD;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,qDAAqD,IAAI,CAAC,SAAS,CACjE,IAAI,CACL,EAAE,CACJ,CAAA;KACF;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;KACzE;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAnDD,gCAmDC"}
+{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAKlC,2CAA0C;AAC1C,2DAAiE;AAEjE,SAAS,MAAM,CAAC,IAAkC;IAChD,OAAO,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAA;AACxC,CAAC;AAUD;;;EAGE;AACF,SAAwB,aAAa,CACnC,GAAW,EACX,WAAwB,EACxB,OAAsB;IAEtB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,0BAA0B,GAAG,CAAC,QAAwB,EAAa,EAAE,CACzE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5B,SAAS,QAAQ,CAAC,IAAkB;QAClC,IAAI,IAAA,mBAAM,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI,CAAC,IAAI;aACjB,CAAA;SACF;aAAM,IAAI,IAAA,kBAAK,EAAC,IAAI,CAAC,EAAE;YACtB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC7D,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,OAAO,oBAAoB,CACzB,CAAC,CAAC,IAAI,CAAC,EACP,GAAG,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC/C,OAAO,CACR,CAAA;aACF;YAED,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACjD;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEnC,SAAS,CAAC,OAAO,CAAC,CAAA;IAElB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,qDAAqD,IAAI,CAAC,SAAS,CACjE,IAAI,CACL,EAAE,CACJ,CAAA;KACF;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;KACzE;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AArDD,gCAqDC;AAED,SAAS,SAAS,CAAC,OAAsB;IACvC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,aAAa,CAAC,MAAM;QAAE,OAAM;IAE5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnB,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,uCAAuC;QAChD,KAAK,EAAE,IAAI,yBAAgB,CAAC;YAC1B,IAAI,EAAE,0CAA0C;YAChD,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,aAAa;SAChD,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,CAAC,gBAAgB,CAAC,aAAa,GAAG,EAAE,CAAA;AAC7C,CAAC"}

package/lib/resolvers/content-tree/bodyXMLToTree.test.js

@@ -6,11 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const bodyXMLToTree_1 = __importDefault(require("./bodyXMLToTree"));
 const tagMappings_1 = __importDefault(require("./tagMappings"));
 const logger_1 = require("@dotcom-reliability-kit/logger");
+const errors_1 = require("@dotcom-reliability-kit/errors");
 const mockLogger = new logger_1.Logger();
 const mockLogError = jest.spyOn(mockLogger, 'error');
 const mockContext = {
     logger: mockLogger,
 };
+expect.addSnapshotSerializer({
+    test(value) {
+        return value instanceof errors_1.OperationalError;
+    },
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    print(value, serialize) {
+        return value.data.errors
+            .map((error) => serialize(error))
+            .join(', ');
+    },
+});
 describe('bodyXMLToTree', () => {
     it('converts XML to tree', () => {
         const xml = `<body><p>Hello world</p></body>`;
@@ -269,8 +281,16 @@ describe('bodyXMLToTree', () => {
             expect(mockLogError.mock.lastCall).toMatchInlineSnapshot(`
         Array [
           Object {
-            "error": [OperationalError: Unexpected children types for layout],
+            "error": Object {
+              "actual": Array [
+                "layout-slot",
+                "paragraph",
+              ],
+              "expected": "layout-slot",
+              "message": "Unexpected children types for layout",
+            },
             "event": "RECOVERABLE_ERROR",
+            "message": "Unexpected structure in bodyXMLToTree",
           },
         ]
       `);
@@ -304,8 +324,16 @@ describe('bodyXMLToTree', () => {
             expect(mockLogError.mock.lastCall).toMatchInlineSnapshot(`
         Array [
           Object {
-            "error": [OperationalError: Unexpected children types for layout],
+            "error": Object {
+              "actual": Array [
+                "layout-slot",
+                "paragraph",
+              ],
+              "expected": "layout-slot",
+              "message": "Unexpected children types for layout",
+            },
             "event": "RECOVERABLE_ERROR",
+            "message": "Unexpected structure in bodyXMLToTree",
           },
         ]
       `);

package/lib/resolvers/content-tree/bodyXMLToTree.test.js.map

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

package/lib/resolvers/content-tree/nodePredicates.d.ts

@@ -7,5 +7,5 @@ type NodeOfType<Type extends AnyNode['type']> = Extract<AnyNode, {
 export declare const phrasingTypes: readonly ["text", "break", "strong", "emphasis", "strikethrough", "link"];
 export declare const findChildOftype: <NodeType extends AnyNode>(type: NodeType["type"], nodes: AnyNode[], parentType: AnyNode['type'], context?: QueryContext) => NodeType | undefined;
 export declare const everyChildIsType: <NodeType extends AnyNode>(type: NodeType["type"], nodes: AnyNode[], parentType: AnyNode['type'], context?: QueryContext) => NodeType[];
-export declare const childrenOfTypes: <Types extends readonly ("layout" | "clip" | "text" | "author-link" | "cite" | "raw-image" | "main-image" | "main-image-raw" | "video" | "youtube-video" | "clip-set" | "table-caption" | "table-body" | "table-footer" | "table" | "break" | "strong" | "emphasis" | "strikethrough" | "link" | "table-row" | "table-cell" | "pullquote" | "image-set" | "root" | "body" | "thematic-break" | "paragraph" | "heading" | "list" | "list-item" | "blockquote" | "recommended" | "tweet" | "flourish" | "big-number" | "scrolly-block" | "scrolly-section" | "scrolly-copy" | "scrolly-heading" | "scrolly-image" | "layout-slot" | "layout-image")[]>(types: Types, nodes: AnyNode[], parentType: AnyNode['type'], context?: QueryContext) => NodeOfType<ValuesOfTuple<Types>>[];
+export declare const childrenOfTypes: <Types extends readonly ("layout" | "clip" | "text" | "author-link" | "cite" | "raw-image" | "main-image" | "main-image-raw" | "video" | "youtube-video" | "clip-set" | "table-caption" | "table-body" | "table-footer" | "table" | "break" | "strong" | "emphasis" | "strikethrough" | "link" | "table-row" | "table-cell" | "pullquote" | "image-set" | "recommended" | "root" | "body" | "thematic-break" | "paragraph" | "heading" | "list" | "list-item" | "blockquote" | "tweet" | "flourish" | "big-number" | "scrolly-block" | "scrolly-section" | "scrolly-copy" | "scrolly-heading" | "scrolly-image" | "layout-slot" | "layout-image")[]>(types: Types, nodes: AnyNode[], parentType: AnyNode['type'], context?: QueryContext) => NodeOfType<ValuesOfTuple<Types>>[];
 export {};

package/lib/resolvers/content-tree/nodePredicates.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.childrenOfTypes = exports.everyChildIsType = exports.findChildOftype = exports.phrasingTypes = void 0;
-const errors_1 = require("@dotcom-reliability-kit/errors");
 exports.phrasingTypes = [
     'text',
     'break',
@@ -14,15 +13,11 @@ const findChildOftype = (type, nodes, parentType, context) => {
     const predicate = (node) => node.type === type;
     const child = nodes.find(predicate);
     if (!child) {
-        context?.logger.error({
-            event: 'RECOVERABLE_ERROR',
-            error: new errors_1.OperationalError({
-                code: 'BODY_XML_UNEXPECTED_STRUCTURE',
-                message: `Didn't find expected child type in ${parentType}`,
-                expected: type,
-                actual: nodes.map((node) => node.type),
-            }),
-        });
+        recordError({
+            message: `Didn't find expected child type in ${parentType}`,
+            expected: type,
+            actual: nodes.map((node) => node.type),
+        }, context);
     }
     return child;
 };
@@ -31,15 +26,11 @@ const everyChildIsType = (type, nodes, parentType, context) => {
     const predicate = (node) => node.type === type;
     const allChildrenAreType = nodes.every(predicate);
     if (!allChildrenAreType) {
-        context?.logger.error({
-            event: 'RECOVERABLE_ERROR',
-            error: new errors_1.OperationalError({
-                code: 'BODY_XML_UNEXPECTED_STRUCTURE',
-                message: `Unexpected children types for ${parentType}`,
-                expected: type,
-                actual: nodes.map((node) => node.type),
-            }),
-        });
+        recordError({
+            message: `Unexpected children types for ${parentType}`,
+            expected: type,
+            actual: nodes.map((node) => node.type),
+        }, context);
     }
     return nodes;
 };
@@ -48,17 +39,19 @@ const childrenOfTypes = (types, nodes, parentType, context) => {
     const predicate = (node) => types.includes(node.type);
     const allChildrenAreType = nodes.every(predicate);
     if (!allChildrenAreType) {
-        context?.logger.error({
-            event: 'RECOVERABLE_ERROR',
-            error: new errors_1.OperationalError({
-                code: 'BODY_XML_UNEXPECTED_STRUCTURE',
-                message: `Unexpected ordered children types for ${parentType}`,
-                expected: types,
-                actual: nodes.map((node) => node.type),
-            }),
-        });
+        recordError({
+            message: `Unexpected ordered children types for ${parentType}`,
+            expected: types,
+            actual: nodes.map((node) => node.type),
+        }, context);
     }
     return nodes;
 };
 exports.childrenOfTypes = childrenOfTypes;
+const recordError = (error, context) => {
+    if (!context)
+        return;
+    context.aggregatedErrors ??= { bodyXMLToTree: [] };
+    context.aggregatedErrors.bodyXMLToTree.push(error);
+};
 //# sourceMappingURL=nodePredicates.js.map

package/lib/resolvers/content-tree/nodePredicates.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodePredicates.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/nodePredicates.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AAQpD,QAAA,aAAa,GAAG;IAC3B,MAAM;IACN,OAAO;IACP,QAAQ;IACR,UAAU;IACV,eAAe;IACf,MAAM;CACE,CAAA;AAEH,MAAM,eAAe,GAAG,CAC7B,IAAsB,EACtB,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACA,EAAE;IACxB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAA;IACzE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAEnC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;YACpB,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;gBAC1B,IAAI,EAAE,+BAA+B;gBACrC,OAAO,EAAE,sCAAsC,UAAU,EAAE;gBAC3D,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aACvC,CAAC;SACH,CAAC,CAAA;KACH;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAtBY,QAAA,eAAe,mBAsB3B;AAEM,MAAM,gBAAgB,GAAG,CAC9B,IAAsB,EACtB,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACV,EAAE;IACd,MAAM,SAAS,GAAG,CAAC,IAAa,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAA;IACzE,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEjD,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;YACpB,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;gBAC1B,IAAI,EAAE,+BAA+B;gBACrC,OAAO,EAAE,iCAAiC,UAAU,EAAE;gBACtD,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aACvC,CAAC;SACH,CAAC,CAAA;KACH;IAED,OAAO,KAAmB,CAAA;AAC5B,CAAC,CAAA;AAtBY,QAAA,gBAAgB,oBAsB5B;AAEM,MAAM,eAAe,GAAG,CAC7B,KAAY,EACZ,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACc,EAAE;IACtC,MAAM,SAAS,GAAG,CAAC,IAAa,EAA4C,EAAE,CAC5E,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEjD,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;YACpB,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;gBAC1B,IAAI,EAAE,+BAA+B;gBACrC,OAAO,EAAE,yCAAyC,UAAU,EAAE;gBAC9D,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aACvC,CAAC;SACH,CAAC,CAAA;KACH;IAED,OAAO,KAA2C,CAAA;AACpD,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B"}
+{"version":3,"file":"nodePredicates.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/nodePredicates.ts"],"names":[],"mappings":";;;AAOa,QAAA,aAAa,GAAG;IAC3B,MAAM;IACN,OAAO;IACP,QAAQ;IACR,UAAU;IACV,eAAe;IACf,MAAM;CACE,CAAA;AAEH,MAAM,eAAe,GAAG,CAC7B,IAAsB,EACtB,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACA,EAAE;IACxB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAA;IACzE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAEnC,IAAI,CAAC,KAAK,EAAE;QACV,WAAW,CACT;YACE,OAAO,EAAE,sCAAsC,UAAU,EAAE;YAC3D,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACvC,EACD,OAAO,CACR,CAAA;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AArBY,QAAA,eAAe,mBAqB3B;AAEM,MAAM,gBAAgB,GAAG,CAC9B,IAAsB,EACtB,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACV,EAAE;IACd,MAAM,SAAS,GAAG,CAAC,IAAa,EAAoB,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAA;IACzE,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEjD,IAAI,CAAC,kBAAkB,EAAE;QACvB,WAAW,CACT;YACE,OAAO,EAAE,iCAAiC,UAAU,EAAE;YACtD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACvC,EACD,OAAO,CACR,CAAA;KACF;IAED,OAAO,KAAmB,CAAA;AAC5B,CAAC,CAAA;AArBY,QAAA,gBAAgB,oBAqB5B;AAEM,MAAM,eAAe,GAAG,CAC7B,KAAY,EACZ,KAAgB,EAChB,UAA2B,EAC3B,OAAsB,EACc,EAAE;IACtC,MAAM,SAAS,GAAG,CAAC,IAAa,EAA4C,EAAE,CAC5E,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAEjD,IAAI,CAAC,kBAAkB,EAAE;QACvB,WAAW,CACT;YACE,OAAO,EAAE,yCAAyC,UAAU,EAAE;YAC9D,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACvC,EACD,OAAO,CACR,CAAA;KACF;IACD,OAAO,KAA2C,CAAA;AACpD,CAAC,CAAA;AArBY,QAAA,eAAe,mBAqB3B;AAED,MAAM,WAAW,GAAG,CAAC,KAAyB,EAAE,OAAsB,EAAE,EAAE;IACxE,IAAI,CAAC,OAAO;QAAE,OAAM;IAEpB,OAAO,CAAC,gBAAgB,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAA;IAElD,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AACpD,CAAC,CAAA"}

package/lib/resolvers/content-tree/references/Recommended.d.ts

@@ -1,4 +1,5 @@
 export declare const Recommended: {
     teaser(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Recommended>, _args: {}, context: import("../../..").QueryContext): Promise<import("../../../model/CapiResponse").CapiResponse | null>;
     type(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Recommended>): "recommended";
+    isInLiveBlog(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Recommended>): boolean;
 };

package/lib/resolvers/content-tree/references/Recommended.js

@@ -29,5 +29,10 @@ exports.Recommended = {
     type(parent) {
         return parent.reference.type;
     },
+    isInLiveBlog(parent) {
+        return Boolean(parent?.contentApiData
+            ?.types()
+            ?.includes('http://www.ft.com/ontology/content/LiveBlogPost'));
+    },
 };
 //# sourceMappingURL=Recommended.js.map

package/lib/resolvers/content-tree/references/Recommended.js.map

@@ -1 +1 @@
-{"version":3,"file":"Recommended.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Recommended.ts"],"names":[],"mappings":";;;AAAA,wDAAuD;AAEvD,2DAAiE;AAEpD,QAAA,WAAW,GAAG;IACzB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACjC,IAAI;YACF,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CACrD,IAAA,sBAAW,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CACjC,CAAA;YAED,IAAI,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE;gBACxC,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;aACtE;YACD,OAAO,OAAO,CAAA;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,EAAE;gBAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,IAAI,EAAE,0BAA0B;wBAChC,OAAO,EAAE,gDAAgD,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE;wBAC9E,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;aACH;YAED,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;CAC6B,CAAA"}
+{"version":3,"file":"Recommended.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Recommended.ts"],"names":[],"mappings":";;;AAAA,wDAAuD;AAEvD,2DAAiE;AAEpD,QAAA,WAAW,GAAG;IACzB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACjC,IAAI;YACF,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CACrD,IAAA,sBAAW,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CACjC,CAAA;YAED,IAAI,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE;gBACxC,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;aACtE;YACD,OAAO,OAAO,CAAA;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,EAAE;gBAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,IAAI,EAAE,0BAA0B;wBAChC,OAAO,EAAE,gDAAgD,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE;wBAC9E,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;aACH;YAED,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;IAED,YAAY,CAAC,MAAM;QACjB,OAAO,OAAO,CACZ,MAAM,EAAE,cAAc;YACpB,EAAE,KAAK,EAAE;YACT,EAAE,QAAQ,CAAC,iDAAiD,CAAC,CAChE,CAAA;IACH,CAAC;CAC6B,CAAA"}

package/package.json

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

package/queries/article.graphql

@@ -363,6 +363,7 @@ fragment LayoutImage on LayoutImage {
 }
 
 fragment Recommended on Recommended {
+  isInLiveBlog
   teaser {
     ...Teaser
   }

package/src/generated/index.ts

@@ -1307,6 +1307,8 @@ export type RawImage = Reference & {
 };
 
 export type Recommended = Reference & {
+  /** Indicates if its inside a live blog */
+  readonly isInLiveBlog?: Maybe<Scalars['Boolean']['output']>;
   /** Recommended references contain teaser thumbnails of related articles. */
   readonly teaser?: Maybe<Teaser>;
   /** The type of the reference, eg. 'recommended'. */
@@ -2510,6 +2512,7 @@ export type RawImageResolvers<ContextType = QueryContext, ParentType extends Res
 }>;
 
 export type RecommendedResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Recommended'] = ResolversParentTypes['Recommended']> = ResolversObject<{
+  isInLiveBlog: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   teaser: Resolver<Maybe<ResolversTypes['Teaser']>, ParentType, ContextType>;
   type: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;

package/src/index.ts

@@ -5,11 +5,18 @@ import { loadSchemaSync } from '@graphql-tools/load'
 import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'
 import * as path from 'path'
 import { readFileSync } from 'fs'
+import { AnyNode } from './resolvers/content-tree/Workarounds'
 
 interface Metrics {
   count(metric: string | string[], count?: number): void
 }
 
+export type BodyXMLToTreeError = {
+  message: string
+  expected: AnyNode['type'] | readonly AnyNode['type'][]
+  actual: AnyNode['type'] | AnyNode['type'][]
+}
+
 export interface QueryContext {
   redisAdapter: KeyValueCache
   metrics: Metrics
@@ -22,6 +29,7 @@ export interface QueryContext {
     api: string
     schema: string
   }
+  aggregatedErrors?: { bodyXMLToTree: BodyXMLToTreeError[] }
   addSurrogateKeys(keys: string[]): void
 }
 

package/src/resolvers/content-tree/Workarounds.ts

@@ -156,6 +156,10 @@ export interface TableCell extends ContentTree.Parent {
   children: ContentTree.Phrasing[]
 }
 
+export interface Recommended extends ContentTree.Recommended {
+  isInLiveBlog?: boolean
+}
+
 export type AnyNode =
   | ContentTree.Root
   | ContentTree.Body
@@ -175,7 +179,7 @@ export type AnyNode =
   | ContentTree.ImageSet
   | ClipSet
   | OldClip
-  | ContentTree.Recommended
+  | Recommended
   | ContentTree.Tweet
   | ContentTree.Flourish
   | ContentTree.BigNumber

package/src/resolvers/content-tree/bodyXMLToTree.test.ts

@@ -2,7 +2,8 @@ import { ContentTree } from '@financial-times/content-tree'
 import bodyXMLToTree, { TagMappings } from './bodyXMLToTree'
 import tags from './tagMappings'
 import { Logger } from '@dotcom-reliability-kit/logger'
-import { QueryContext } from '../..'
+import { QueryContext, BodyXMLToTreeError } from '../..'
+import { OperationalError } from '@dotcom-reliability-kit/errors'
 
 const mockLogger = new Logger()
 const mockLogError = jest.spyOn(mockLogger, 'error')
@@ -11,6 +12,18 @@ const mockContext = {
   logger: mockLogger,
 } as QueryContext
 
+expect.addSnapshotSerializer({
+  test(value: unknown) {
+    return value instanceof OperationalError
+  },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  print(value: any, serialize) {
+    return value.data.errors
+      .map((error: BodyXMLToTreeError) => serialize(error))
+      .join(', ')
+  },
+})
+
 describe('bodyXMLToTree', () => {
   it('converts XML to tree', () => {
     const xml = `<body><p>Hello world</p></body>`
@@ -294,8 +307,16 @@ describe('bodyXMLToTree', () => {
       expect(mockLogError.mock.lastCall).toMatchInlineSnapshot(`
         Array [
           Object {
-            "error": [OperationalError: Unexpected children types for layout],
+            "error": Object {
+              "actual": Array [
+                "layout-slot",
+                "paragraph",
+              ],
+              "expected": "layout-slot",
+              "message": "Unexpected children types for layout",
+            },
             "event": "RECOVERABLE_ERROR",
+            "message": "Unexpected structure in bodyXMLToTree",
           },
         ]
       `)
@@ -332,8 +353,16 @@ describe('bodyXMLToTree', () => {
       expect(mockLogError.mock.lastCall).toMatchInlineSnapshot(`
         Array [
           Object {
-            "error": [OperationalError: Unexpected children types for layout],
+            "error": Object {
+              "actual": Array [
+                "layout-slot",
+                "paragraph",
+              ],
+              "expected": "layout-slot",
+              "message": "Unexpected children types for layout",
+            },
             "event": "RECOVERABLE_ERROR",
+            "message": "Unexpected structure in bodyXMLToTree",
           },
         ]
       `)

package/src/resolvers/content-tree/bodyXMLToTree.ts

@@ -4,6 +4,7 @@ import type { ContentTree } from '@financial-times/content-tree'
 import { AnyNode } from './Workarounds'
 import { QueryContext } from '../..'
 import { isTag, isText } from 'domhandler'
+import { OperationalError } from '@dotcom-reliability-kit/errors'
 
 function isNode(node: ContentTree.Node | undefined): node is ContentTree.Node {
   return Boolean(node && 'type' in node)
@@ -59,6 +60,8 @@ export default function bodyXMLToTree(
 
   const body = traverse($('body')[0])
 
+  logErrors(context)
+
   if (Array.isArray(body) || !isNode(body)) {
     throw new Error(
       `Unexpected mapping result for body node, received ${JSON.stringify(
@@ -73,3 +76,18 @@ export default function bodyXMLToTree(
 
   return body
 }
+
+function logErrors(context?: QueryContext) {
+  if (!context?.aggregatedErrors?.bodyXMLToTree.length) return
+
+  context.logger.error({
+    event: 'RECOVERABLE_ERROR',
+    message: 'Unexpected structure in bodyXMLToTree',
+    error: new OperationalError({
+      code: 'AGGREGATED_BODY_XML_UNEXPECTED_STRUCTURE',
+      errors: context.aggregatedErrors?.bodyXMLToTree,
+    }),
+  })
+
+  context.aggregatedErrors.bodyXMLToTree = []
+}

package/src/resolvers/content-tree/nodePredicates.ts

@@ -1,6 +1,5 @@
-import { OperationalError } from '@dotcom-reliability-kit/errors'
 import { AnyNode } from './Workarounds'
-import { QueryContext } from '../..'
+import { QueryContext, BodyXMLToTreeError } from '../..'
 
 type ValuesOfTuple<Tuple extends readonly string[]> = Tuple[number]
 
@@ -25,15 +24,14 @@ export const findChildOftype = <NodeType extends AnyNode>(
   const child = nodes.find(predicate)
 
   if (!child) {
-    context?.logger.error({
-      event: 'RECOVERABLE_ERROR',
-      error: new OperationalError({
-        code: 'BODY_XML_UNEXPECTED_STRUCTURE',
+    recordError(
+      {
         message: `Didn't find expected child type in ${parentType}`,
         expected: type,
         actual: nodes.map((node) => node.type),
-      }),
-    })
+      },
+      context
+    )
   }
 
   return child
@@ -49,15 +47,14 @@ export const everyChildIsType = <NodeType extends AnyNode>(
   const allChildrenAreType = nodes.every(predicate)
 
   if (!allChildrenAreType) {
-    context?.logger.error({
-      event: 'RECOVERABLE_ERROR',
-      error: new OperationalError({
-        code: 'BODY_XML_UNEXPECTED_STRUCTURE',
+    recordError(
+      {
         message: `Unexpected children types for ${parentType}`,
         expected: type,
         actual: nodes.map((node) => node.type),
-      }),
-    })
+      },
+      context
+    )
   }
 
   return nodes as NodeType[]
@@ -74,16 +71,22 @@ export const childrenOfTypes = <Types extends readonly AnyNode['type'][]>(
   const allChildrenAreType = nodes.every(predicate)
 
   if (!allChildrenAreType) {
-    context?.logger.error({
-      event: 'RECOVERABLE_ERROR',
-      error: new OperationalError({
-        code: 'BODY_XML_UNEXPECTED_STRUCTURE',
+    recordError(
+      {
         message: `Unexpected ordered children types for ${parentType}`,
         expected: types,
         actual: nodes.map((node) => node.type),
-      }),
-    })
+      },
+      context
+    )
   }
-
   return nodes as NodeOfType<ValuesOfTuple<Types>>[]
 }
+
+const recordError = (error: BodyXMLToTreeError, context?: QueryContext) => {
+  if (!context) return
+
+  context.aggregatedErrors ??= { bodyXMLToTree: [] }
+
+  context.aggregatedErrors.bodyXMLToTree.push(error)
+}

package/src/resolvers/content-tree/references/Recommended.ts

@@ -32,4 +32,12 @@ export const Recommended = {
   type(parent) {
     return parent.reference.type
   },
+
+  isInLiveBlog(parent) {
+    return Boolean(
+      parent?.contentApiData
+        ?.types()
+        ?.includes('http://www.ft.com/ontology/content/LiveBlogPost')
+    )
+  },
 } satisfies RecommendedResolvers