@financial-times/cp-content-pipeline-schema 2.13.0 → 2.13.1

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

@@ -1,4 +1,5 @@
-import { ContentTree } from '@financial-times/content-tree'
+import { ContentTree as ContentTreeNamespace } from '@financial-times/content-tree'
+import ContentTree = ContentTreeNamespace.transit
 import type { TagMappings } from './bodyXMLToTree'
 import {
   AnyNode,
@@ -15,6 +16,7 @@ import {
   childrenOfTypes,
   findChildOftype,
   phrasingTypes,
+  bodyBlockTypes,
 } from './nodePredicates'
 
 import * as scrollytelling from '@financial-times/n-scrollytelling-image/server'
@@ -104,7 +106,11 @@ const liveBlogPostTagMappings: TagMappings = {
 }
 
 const commonTagMappings: TagMappings = {
-  body: ($el, traverse) => ({ type: 'body', version: 1, children: traverse() }),
+  body: ($el, traverse) => ({
+    type: 'body',
+    version: 1,
+    children: childrenOfTypes(bodyBlockTypes, traverse(), 'body'),
+  }),
   'a:not([data-asset-type])': ($el, traverse, context) => ({
     type: 'link',
     url: $el.attr('href') || '',
@@ -125,7 +131,12 @@ const commonTagMappings: TagMappings = {
   }),
   blockquote: ($el, traverse, context) => ({
     type: 'blockquote',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'blockquote', context),
+    children: childrenOfTypes(
+      [...phrasingTypes, 'paragraph'],
+      traverse(),
+      'blockquote',
+      context
+    ),
   }),
   // strip any (redundant) line breaks in between two paragraphs
   'p + br': ($el) => ($el.next()[0]?.tagName === 'p' ? [] : { type: 'break' }),
@@ -152,7 +163,12 @@ const commonTagMappings: TagMappings = {
   }),
   li: ($el, traverse, context) => ({
     type: 'list-item',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'list-item', context),
+    children: childrenOfTypes(
+      [...phrasingTypes, 'paragraph'],
+      traverse(),
+      'list-item',
+      context
+    ),
   }),
   'a[data-asset-type="tweet"]': ($el) => ({
     type: 'tweet',
@@ -164,9 +180,11 @@ const commonTagMappings: TagMappings = {
     level: 'label',
     children: everyChildIsType('text', traverse(), 'heading', context),
   }),
-  'pull-quote': ($el, traverse, context) => {
+  'pull-quote': ($el, traverse) => {
     const children = traverse()
-    const image = findChildOftype('image-set', children, 'pullquote', context)
+    const image = children.find(
+      (child): child is ContentTree.ImageSet => child.type === 'image-set'
+    )
 
     return {
       type: 'pullquote',
@@ -422,7 +440,7 @@ const commonTagMappings: TagMappings = {
       layoutWidth: isValidLayoutWidth(layoutWidth) ? layoutWidth : 'auto',
       collapseAfterHowManyRows: $el.attr('data-table-collapse-rownum')
         ? parseInt($el.attr('data-table-collapse-rownum') || '0')
-        : null,
+        : undefined,
       responsiveStyle,
       children: tableChildren,
       columnSettings: $el

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

@@ -1,7 +1,7 @@
 import { ContentTree } from '@financial-times/content-tree'
 import { CapiResponse } from '../../model/CapiResponse'
 import { ReferenceWithCAPIData, mapNodeToReference } from './references'
-import { AnyNode } from './Workarounds'
+import { AnyNode, Body } from './Workarounds'
 
 function isParent(node: ContentTree.Node): node is ContentTree.Parent {
   return 'children' in node
@@ -12,10 +12,10 @@ const isValidReferenceType = (
 ): type is keyof typeof mapNodeToReference => type in mapNodeToReference
 
 export default function updateTreeWithReferenceIds(
-  tree: ContentTree.Body,
+  tree: Body,
   contentApiData?: CapiResponse
 ): {
-  tree: ContentTree.Body
+  tree: Body
   references: ReferenceWithCAPIData[]
 } {
   const references: ReferenceWithCAPIData[] = []