@financial-times/cp-content-pipeline-schema 0.7.8 → 0.7.10

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.7.10](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.9...cp-content-pipeline-schema-v0.7.10) (2023-05-18)
+
+
+### Bug Fixes
+
+* handle spuriously-nested layout slots ([95f6dcd](https://github.com/Financial-Times/cp-content-pipeline/commit/95f6dcd069c7fa2037057755d2e971b15d2443a3))
+* return all children, don't filter, when predicate doesn't match ([78060c8](https://github.com/Financial-Times/cp-content-pipeline/commit/78060c8d723a1fbb6eb8a0f4d535a06684b98640))
+
+## [0.7.9](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.8...cp-content-pipeline-schema-v0.7.9) (2023-05-04)
+
+
+### Features
+
+* specific error codes for each datasource endpoint ([47a844f](https://github.com/Financial-Times/cp-content-pipeline/commit/47a844f79fe39f29a85aee987ddafd49715d71cb))
+
+
+### Bug Fixes
+
+* only return image format verbatim if it's a known format ([e58b110](https://github.com/Financial-Times/cp-content-pipeline/commit/e58b110f3dc11e8be5b3fc6b0cd73f89f883e7df))
+* return a fallback image type for unknown formats ([68de175](https://github.com/Financial-Times/cp-content-pipeline/commit/68de1752e0610730228593c6910ff7cbbf70e510))
+* use UpstreamServiceError not HttpError for base datasource response errors ([41bf0f7](https://github.com/Financial-Times/cp-content-pipeline/commit/41bf0f7d39592f68c18b2263fbb0401279fa6d64))
+
 ## [0.7.8](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.7...cp-content-pipeline-schema-v0.7.8) (2023-05-02)
 
 

package/lib/content-tree/bodyXMLToTree.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="cheerio" />
 import type { ContentTree } from '@financial-times/content-tree';
-declare type ContentTreeTransform = ($el: cheerio.Cheerio) => ContentTree.Node;
+import { AnyNode } from './Workarounds';
+import { QueryContext } from '..';
+declare type ContentTreeTransform = ($el: cheerio.Cheerio, traverse: () => AnyNode[], context?: QueryContext) => AnyNode;
 export declare type TagMappings = Record<string, ContentTreeTransform>;
-export default function bodyXMLToTree(xml: string, tagMappings: TagMappings): ContentTree.Body;
+export default function bodyXMLToTree(xml: string, tagMappings: TagMappings, context?: QueryContext): ContentTree.Body;
 export {};

package/lib/content-tree/bodyXMLToTree.js

@@ -17,17 +17,12 @@ function isNode(node) {
   Function that converts an XML string to a Body node from
   the Content Tree spec - https://github.com/Financial-Times/content-tree#Body
 */
-function bodyXMLToTree(xml, tagMappings) {
+function bodyXMLToTree(xml, tagMappings, context) {
     const $ = cheerio_1.default.load(xml);
-    const bodyEl = $('body')[0];
-    if (!isTagElement(bodyEl)) {
-        throw new Error('Body is invalid');
-    }
-    const flattenAndTraverseChildren = (element) => element.children.map(traverse).flat().filter(isNode);
+    const flattenAndTraverseChildren = (children) => children.flatMap(traverse);
     function traverse(element) {
-        let contentTreeNode;
         if (element.type === 'text' && element.data) {
-            contentTreeNode = {
+            return {
                 type: 'text',
                 value: element.data,
             };
@@ -36,25 +31,20 @@ function bodyXMLToTree(xml, tagMappings) {
             const matchedSelector = Object.keys(tagMappings).find((selector) => element.name === selector || $(element).is(selector));
             if (matchedSelector) {
                 const contentTreeTransform = tagMappings[matchedSelector];
-                contentTreeNode = contentTreeTransform($(element));
-            }
-            if (element.children.length) {
-                if (contentTreeNode && isParent(contentTreeNode)) {
-                    contentTreeNode.children = flattenAndTraverseChildren(element);
-                }
-                else if (!contentTreeNode) {
-                    return flattenAndTraverseChildren(element);
-                }
+                return contentTreeTransform($(element), () => flattenAndTraverseChildren(element.children), context);
             }
+            return flattenAndTraverseChildren(element.children);
         }
-        return contentTreeNode;
+        return [];
+    }
+    const body = traverse($('body')[0]);
+    if (Array.isArray(body) || !isNode(body)) {
+        throw new Error(`Unexpected mapping result for body node, received ${JSON.stringify(body)}`);
+    }
+    if (body.type !== 'body') {
+        throw new Error(`Expected root node to be a body, but got ${body.type}`);
     }
-    const children = flattenAndTraverseChildren(bodyEl);
-    return {
-        type: 'body',
-        version: 1,
-        children,
-    };
+    return body;
 }
 exports.default = bodyXMLToTree;
 //# sourceMappingURL=bodyXMLToTree.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../src/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAI7B,SAAS,YAAY,CAAC,EAAmB;IACvC,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAA;AAC1B,CAAC;AAED,SAAS,QAAQ,CAAC,IAAsB;IACtC,OAAO,UAAU,IAAI,IAAI,CAAA;AAC3B,CAAC;AAED,SAAS,MAAM,CAAC,IAAkC;IAChD,OAAO,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAA;AACxC,CAAC;AAMD;;;EAGE;AACF,SAAwB,aAAa,CACnC,GAAW,EACX,WAAwB;IAExB,MAAM,CAAC,GAAG,iBAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;KACnC;IAED,MAAM,0BAA0B,GAAG,CACjC,OAA2B,EACP,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAE7E,SAAS,QAAQ,CAAC,OAAwB;QACxC,IAAI,eAAe,CAAA;QAEnB,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE;YAC3C,eAAe,GAAG;gBAChB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,OAAO,CAAC,IAAI;aACpB,CAAA;SACF;aAAM,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE;YAChC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CACnE,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,eAAe,GAAG,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;aACnD;YAED,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAC3B,IAAI,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE;oBAChD,eAAe,CAAC,QAAQ,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAA;iBAC/D;qBAAM,IAAI,CAAC,eAAe,EAAE;oBAC3B,OAAO,0BAA0B,CAAC,OAAO,CAAC,CAAA;iBAC3C;aACF;SACF;QAED,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,MAAM,QAAQ,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAA;IAEnD,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;QACV,QAAQ;KACT,CAAA;AACH,CAAC;AArDD,gCAqDC"}
+{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../src/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAM7B,SAAS,YAAY,CAAC,EAAmB;IACvC,OAAO,EAAE,CAAC,IAAI,KAAK,KAAK,CAAA;AAC1B,CAAC;AAED,SAAS,QAAQ,CAAC,IAAsB;IACtC,OAAO,UAAU,IAAI,IAAI,CAAA;AAC3B,CAAC;AAED,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,iBAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,0BAA0B,GAAG,CAAC,QAA2B,EAAa,EAAE,CAC5E,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5B,SAAS,QAAQ,CAAC,OAAwB;QACxC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE;YAC3C,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,OAAO,CAAC,IAAI;aACpB,CAAA;SACF;aAAM,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE;YAChC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CACnE,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,OAAO,oBAAoB,CACzB,CAAC,CAAC,OAAO,CAAC,EACV,GAAG,EAAE,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC,EAClD,OAAO,CACR,CAAA;aACF;YAED,OAAO,0BAA0B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;SACpD;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"}

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

@@ -1,78 +1,337 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('@dotcom-reliability-kit/log-error', () => ({
+    logRecoverableError: jest.fn(),
+}));
 const bodyXMLToTree_js_1 = __importDefault(require("./bodyXMLToTree.js"));
 const tagMappings_js_1 = __importDefault(require("./tagMappings.js"));
+const logError = __importStar(require("@dotcom-reliability-kit/log-error"));
+const logRecoverableErrorMock = logError.logRecoverableError;
 describe('bodyXMLToTree', () => {
     it('converts XML to tree', () => {
         const xml = `<body><p>Hello world</p></body>`;
-        const expectedTree = {
-            type: 'body',
-            version: 1,
-            children: [
-                {
-                    type: 'paragraph',
-                    children: [{ type: 'text', value: 'Hello world' }],
-                },
+        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+      Object {
+        "children": Array [
+          Object {
+            "children": Array [
+              Object {
+                "type": "text",
+                "value": "Hello world",
+              },
             ],
-        };
-        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toEqual(expectedTree);
+            "type": "paragraph",
+          },
+        ],
+        "type": "body",
+        "version": 1,
+      }
+    `);
     });
     it('supports nested selectors', () => {
-        const xml = `<body><img src="regular-image"/><div class="n-content-layout"><img src="layout-image" /></div></body>`;
+        const xml = `<body><img src="regular-image"/><div class="n-content-layout"><div class="n-content-layout__slot"><img src="layout-image" /></div></div></body>`;
         const tags = {
-            'body > img': ($el) => ({ type: 'regular-image' }),
-            '.n-content-layout': ($el) => ({ type: 'layout', children: [] }),
-            '.n-content-layout > img': ($el) => ({ type: 'layout-image' }),
+            body: ($el, traverse) => ({
+                type: 'body',
+                children: traverse(),
+                version: 1,
+            }),
+            'body > img': () => ({ type: 'image-set', id: 'id' }),
+            '.n-content-layout': ($el, traverse) => ({
+                type: 'layout',
+                children: traverse().filter((node) => node.type === 'layout-slot'),
+                layoutName: 'auto',
+                layoutWidth: 'layoutWidth',
+            }),
+            '.n-content-layout__slot': ($el, traverse) => ({
+                type: 'layout-slot',
+                children: traverse().filter((node) => node.type === 'layout-image'),
+            }),
+            '.n-content-layout img': () => ({
+                type: 'layout-image',
+                id: 'id',
+                alt: 'alt',
+                caption: 'caption',
+                credit: 'credit',
+            }),
         };
-        const expectedTree = {
-            type: 'body',
-            version: 1,
-            children: [
-                {
-                    type: 'regular-image',
-                },
-                {
-                    type: 'layout',
-                    children: [{ type: 'layout-image' }],
-                },
+        expect((0, bodyXMLToTree_js_1.default)(xml, tags)).toMatchInlineSnapshot(`
+      Object {
+        "children": Array [
+          Object {
+            "id": "id",
+            "type": "image-set",
+          },
+          Object {
+            "children": Array [
+              Object {
+                "children": Array [
+                  Object {
+                    "alt": "alt",
+                    "caption": "caption",
+                    "credit": "credit",
+                    "id": "id",
+                    "type": "layout-image",
+                  },
+                ],
+                "type": "layout-slot",
+              },
             ],
-        };
-        expect((0, bodyXMLToTree_js_1.default)(xml, tags)).toEqual(expectedTree);
+            "layoutName": "auto",
+            "layoutWidth": "layoutWidth",
+            "type": "layout",
+          },
+        ],
+        "type": "body",
+        "version": 1,
+      }
+    `);
     });
     it('includes known children of unknown tags', () => {
         const xml = `<body><p>P1</p><unknown><p>P2</p></unknown></body>`;
-        const expectedTree = {
-            type: 'body',
-            version: 1,
-            children: [
-                {
-                    type: 'paragraph',
-                    children: [{ type: 'text', value: 'P1' }],
-                },
-                {
-                    type: 'paragraph',
-                    children: [{ type: 'text', value: 'P2' }],
-                },
+        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+      Object {
+        "children": Array [
+          Object {
+            "children": Array [
+              Object {
+                "type": "text",
+                "value": "P1",
+              },
             ],
-        };
-        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toEqual(expectedTree);
+            "type": "paragraph",
+          },
+          Object {
+            "children": Array [
+              Object {
+                "type": "text",
+                "value": "P2",
+              },
+            ],
+            "type": "paragraph",
+          },
+        ],
+        "type": "body",
+        "version": 1,
+      }
+    `);
     });
     it("maps tags that aren't expected to have any children (e.g. tweet reference)", () => {
         const xml = '<body><a data-asset-type="tweet" data-embedded="true" href="https://twitter.com/EllliotttB/status/1610358432577748992?s=20&amp;t=pcwJG65_c10H3snOQWzI4w">https://twitter.com/EllliotttB/status/1610358432577748992?s=20&amp;t=pcwJG65_c10H3snOQWzI4w</a></body>';
-        const expectedTree = {
-            type: 'body',
-            version: 1,
-            children: [
-                {
-                    type: 'tweet',
-                    id: 'https://twitter.com/EllliotttB/status/1610358432577748992?s=20&t=pcwJG65_c10H3snOQWzI4w',
-                },
+        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+      Object {
+        "children": Array [
+          Object {
+            "id": "https://twitter.com/EllliotttB/status/1610358432577748992?s=20&t=pcwJG65_c10H3snOQWzI4w",
+            "type": "tweet",
+          },
+        ],
+        "type": "body",
+        "version": 1,
+      }
+    `);
+    });
+    it('collapses nested .n-content-layout__slots', () => {
+        const xml = '<body><div class="n-content-layout"><div class="n-content-layout__slot"><h4></h4><div class="n-content-layout__slot"><p>text</p></div></div></div></body>';
+        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+      Object {
+        "children": Array [
+          Object {
+            "children": Array [
+              Object {
+                "children": Array [
+                  Object {
+                    "children": Array [],
+                    "level": "label",
+                    "type": "heading",
+                  },
+                  Object {
+                    "children": Array [
+                      Object {
+                        "type": "text",
+                        "value": "text",
+                      },
+                    ],
+                    "type": "paragraph",
+                  },
+                ],
+                "type": "layout-slot",
+              },
             ],
-        };
-        expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toEqual(expectedTree);
+            "layoutName": "auto",
+            "layoutWidth": "full-width",
+            "type": "layout",
+          },
+        ],
+        "type": "body",
+        "version": 1,
+      }
+    `);
+    });
+    describe('layout children handling', () => {
+        beforeEach(() => {
+            jest.resetAllMocks();
+        });
+        it('should handle slots', () => {
+            const xml = '<body><div class="n-content-layout"><div class="n-content-layout__slot"></div><div class="n-content-layout__slot"></div></body>';
+            expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+        Object {
+          "children": Array [
+            Object {
+              "children": Array [
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+              ],
+              "layoutName": "auto",
+              "layoutWidth": "full-width",
+              "type": "layout",
+            },
+          ],
+          "type": "body",
+          "version": 1,
+        }
+      `);
+            expect(logRecoverableErrorMock).not.toBeCalled();
+        });
+        it('should handle heading and slots', () => {
+            const xml = '<body><div class="n-content-layout"><h3></h3><div class="n-content-layout__slot"></div><div class="n-content-layout__slot"></div></body>';
+            expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+        Object {
+          "children": Array [
+            Object {
+              "children": Array [
+                Object {
+                  "children": Array [],
+                  "level": "subheading",
+                  "type": "heading",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+              ],
+              "layoutName": "auto",
+              "layoutWidth": "full-width",
+              "type": "layout",
+            },
+          ],
+          "type": "body",
+          "version": 1,
+        }
+      `);
+            expect(logRecoverableErrorMock).not.toBeCalled();
+        });
+        it('should log an error on unexpected child after heading', () => {
+            const xml = '<body><div class="n-content-layout"><h3></h3><div class="n-content-layout__slot"></div><p></p></body>';
+            expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+        Object {
+          "children": Array [
+            Object {
+              "children": Array [
+                Object {
+                  "children": Array [],
+                  "level": "subheading",
+                  "type": "heading",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "paragraph",
+                },
+              ],
+              "layoutName": "auto",
+              "layoutWidth": "full-width",
+              "type": "layout",
+            },
+          ],
+          "type": "body",
+          "version": 1,
+        }
+      `);
+            expect(logRecoverableErrorMock).toBeCalled();
+            expect(logRecoverableErrorMock.mock.lastCall).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "error": [OperationalError: Unexpected children types for layout],
+            "logger": undefined,
+          },
+        ]
+      `);
+        });
+        it('should log an error on unexpected child after slots', () => {
+            const xml = '<body><div class="n-content-layout"><div class="n-content-layout__slot"></div><p></p></body>';
+            expect((0, bodyXMLToTree_js_1.default)(xml, tagMappings_js_1.default)).toMatchInlineSnapshot(`
+        Object {
+          "children": Array [
+            Object {
+              "children": Array [
+                Object {
+                  "children": Array [],
+                  "type": "layout-slot",
+                },
+                Object {
+                  "children": Array [],
+                  "type": "paragraph",
+                },
+              ],
+              "layoutName": "auto",
+              "layoutWidth": "full-width",
+              "type": "layout",
+            },
+          ],
+          "type": "body",
+          "version": 1,
+        }
+      `);
+            expect(logRecoverableErrorMock).toBeCalled();
+            expect(logRecoverableErrorMock.mock.lastCall).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "error": [OperationalError: Unexpected children types for layout],
+            "logger": undefined,
+          },
+        ]
+      `);
+        });
     });
 });
 //# sourceMappingURL=bodyXMLToTree.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bodyXMLToTree.test.js","sourceRoot":"","sources":["../../src/content-tree/bodyXMLToTree.test.ts"],"names":[],"mappings":";;;;;AACA,0EAA+D;AAC/D,sEAAmC;AACnC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,GAAG,GAAG,iCAAiC,CAAA;QAC7C,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;iBACnD;aACF;SACF,CAAA;QACD,MAAM,CAAC,IAAA,0BAAa,EAAC,GAAG,EAAE,wBAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,GAAG,GAAG,uGAAuG,CAAA;QAEnH,MAAM,IAAI,GAAgB;YACxB,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;YAClD,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAChE,yBAAyB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;SAC/D,CAAA;QACD,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,eAAe;iBACtB;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;iBACrC;aACF;SACF,CAAA;QACD,MAAM,CAAC,IAAA,0BAAa,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,GAAG,GAAG,oDAAoD,CAAA;QAEhE,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC1C;gBACD;oBACE,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC1C;aACF;SACF,CAAA;QACD,MAAM,CAAC,IAAA,0BAAa,EAAC,GAAG,EAAE,wBAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,MAAM,GAAG,GACP,iQAAiQ,CAAA;QAEnQ,MAAM,YAAY,GAAG;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,yFAAyF;iBAC9F;aACF;SACF,CAAA;QACD,MAAM,CAAC,IAAA,0BAAa,EAAC,GAAG,EAAE,wBAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bodyXMLToTree.test.js","sourceRoot":"","sources":["../../src/content-tree/bodyXMLToTree.test.ts"],"names":[],"mappings":"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"}

package/lib/content-tree/references/Video.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLReference } from './index.js';
+declare const VideoReference: GraphQLReference;
+export default VideoReference;

package/lib/content-tree/references/Video.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const graphql_tag_1 = require("graphql-tag");
+const metadata_js_1 = require("../../helpers/metadata.js");
+const Reference_js_1 = require("./Reference.js");
+class VideoResolver {
+    constructor() {
+        // This will override the original id from the parent that is a URL.
+        this.id = (parent) => {
+            return (0, metadata_js_1.uuidFromUrl)(parent.reference.id);
+        };
+        this.title = async (parent, _args, context) => {
+            const capiResponse = await context.dataSources.capi.getContent((0, metadata_js_1.uuidFromUrl)(parent.reference.id));
+            return capiResponse.title();
+        };
+    }
+}
+const VideoReference = {
+    typeDef: (0, graphql_tag_1.gql) `
+    type Video implements Reference {
+      ${Reference_js_1.ReferenceFields}
+      id: String!
+      title: String!
+    }
+  `,
+    resolve: new VideoResolver(),
+};
+exports.default = VideoReference;
+//# sourceMappingURL=Video.js.map

package/lib/content-tree/references/Video.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../../src/content-tree/references/Video.ts"],"names":[],"mappings":";;AACA,6CAAiC;AACjC,2DAAuD;AAEvD,iDAAgD;AAKhD,MAAM,aAAa;IAAnB;QACE,oEAAoE;QACpE,OAAE,GAAG,CAAC,MAAoC,EAAE,EAAE;YAC5C,OAAO,IAAA,yBAAW,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACzC,CAAC,CAAA;QAED,UAAK,GAAG,KAAK,EACX,MAAoC,EACpC,KAAc,EACd,OAAqB,EACrB,EAAE;YACF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAC5D,IAAA,yBAAW,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CACjC,CAAA;YACD,OAAO,YAAY,CAAC,KAAK,EAAE,CAAA;QAC7B,CAAC,CAAA;IACH,CAAC;CAAA;AAED,MAAM,cAAc,GAAqB;IACvC,OAAO,EAAE,IAAA,iBAAG,EAAA;;QAEN,8BAAe;;;;GAIpB;IACD,OAAO,EAAE,IAAI,aAAa,EAAE;CAC7B,CAAA;AAED,kBAAe,cAAc,CAAA"}

package/lib/content-tree/references/index.d.ts

@@ -13,6 +13,7 @@ export declare const graphQlReferences: {
     Reference: GraphQLReference;
     Tweet: GraphQLReference;
     ImageSet: GraphQLReference;
+    Video: GraphQLReference;
     Flourish: GraphQLReference;
     Recommended: GraphQLReference;
     LayoutImage: GraphQLReference;

package/lib/content-tree/references/index.js

@@ -7,6 +7,7 @@ exports.resolvers = exports.typeDef = exports.graphQlReferences = void 0;
 const Reference_js_1 = __importDefault(require("./Reference.js"));
 const Tweet_js_1 = __importDefault(require("./Tweet.js"));
 const ImageSet_js_1 = __importDefault(require("./ImageSet.js"));
+const Video_js_1 = __importDefault(require("./Video.js"));
 const Flourish_js_1 = __importDefault(require("./Flourish.js"));
 const Recommended_js_1 = __importDefault(require("./Recommended.js"));
 const LayoutImage_js_1 = __importDefault(require("./LayoutImage.js"));
@@ -15,6 +16,7 @@ exports.graphQlReferences = {
     Reference: Reference_js_1.default,
     Tweet: Tweet_js_1.default,
     ImageSet: ImageSet_js_1.default,
+    Video: Video_js_1.default,
     Flourish: Flourish_js_1.default,
     Recommended: Recommended_js_1.default,
     LayoutImage: LayoutImage_js_1.default,

package/lib/content-tree/references/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/content-tree/references/index.ts"],"names":[],"mappings":";;;;;;AAKA,kEAAsC;AAEtC,0DAA8B;AAC9B,gEAAoC;AACpC,gEAAoC;AACpC,sEAA0C;AAC1C,sEAA0C;AAC1C,gEAAoC;AAYvB,QAAA,iBAAiB,GAAG;IAC/B,SAAS,EAAT,sBAAS;IACT,KAAK,EAAL,kBAAK;IACL,QAAQ,EAAR,qBAAQ;IACR,QAAQ,EAAR,qBAAQ;IACR,WAAW,EAAX,wBAAW;IACX,WAAW,EAAX,wBAAW;IACX,QAAQ,EAAR,qBAAQ;IACR,SAAS,EAAE,qBAAQ;CACpB,CAAA;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAAA;AAE1D,qEAAqE;AACxD,QAAA,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAC7C,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CACzC,CAAA;AAEY,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CACzC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CACtC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACxC,CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/content-tree/references/index.ts"],"names":[],"mappings":";;;;;;AAKA,kEAAsC;AAEtC,0DAA8B;AAC9B,gEAAoC;AACpC,0DAA8B;AAC9B,gEAAoC;AACpC,sEAA0C;AAC1C,sEAA0C;AAC1C,gEAAoC;AAYvB,QAAA,iBAAiB,GAAG;IAC/B,SAAS,EAAT,sBAAS;IACT,KAAK,EAAL,kBAAK;IACL,QAAQ,EAAR,qBAAQ;IACR,KAAK,EAAL,kBAAK;IACL,QAAQ,EAAR,qBAAQ;IACR,WAAW,EAAX,wBAAW;IACX,WAAW,EAAX,wBAAW;IACX,QAAQ,EAAR,qBAAQ;IACR,SAAS,EAAE,qBAAQ;CACpB,CAAA;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAAA;AAE1D,qEAAqE;AACxD,QAAA,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAC7C,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CACzC,CAAA;AAEY,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CACzC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CACtC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACxC,CACF,CAAA"}