@financial-times/cp-content-pipeline-schema 2.2.2 → 2.3.0

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

@@ -19,7 +19,6 @@ import {
 
 import * as scrollytelling from '@financial-times/n-scrollytelling-image/server'
 import { LiteralToPrimitiveDeep } from 'type-fest'
-import { CapiResponse } from '../../model/CapiResponse'
 
 const tableResponsiveStyleMap: Record<string, Table['responsiveStyle']> = {
   stacked: 'flat',
@@ -82,10 +81,10 @@ const validScrollytellingOption = <
     : false
 }
 
-const articleTagMappings = (capiData?: CapiResponse): TagMappings => ({
+const articleTagMappings = (topperHasImage: boolean): TagMappings => ({
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]:first-child':
     ($el) => ({
-      type: capiData?.topperHasImage() ? 'image-set' : 'main-image',
+      type: topperHasImage ? 'image-set' : 'main-image',
       id: $el.attr('url') || '',
     }),
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]:not(:first-child),:not(body) > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]':
@@ -104,60 +103,55 @@ const liveBlogPostTagMappings: TagMappings = {
 
 const commonTagMappings: TagMappings = {
   body: ($el, traverse) => ({ type: 'body', version: 1, children: traverse() }),
-  'a:not([data-asset-type])': ($el, traverse, context) => ({
+  'a:not([data-asset-type])': ($el, traverse) => ({
     type: 'link',
     url: $el.attr('href') || '',
     title: '',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'link', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'link'),
   }),
-  strong: ($el, traverse, context) => ({
+  strong: ($el, traverse) => ({
     type: 'strong',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'strong', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'strong'),
   }),
-  em: ($el, traverse, context) => ({
+  em: ($el, traverse) => ({
     type: 'emphasis',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'emphasis', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'emphasis'),
   }),
-  blockquote: ($el, traverse, context) => ({
+  blockquote: ($el, traverse) => ({
     type: 'blockquote',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'blockquote', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'blockquote'),
   }),
   // strip any (redundant) line breaks in between two paragraphs
   'p + br': ($el) => ($el.next()[0]?.tagName === 'p' ? [] : { type: 'break' }),
   br: () => ({ type: 'break' }),
   hr: () => ({ type: 'thematic-break' }),
-  s: ($el, traverse, context) => ({
+  s: ($el, traverse) => ({
     type: 'strikethrough',
-    children: childrenOfTypes(
-      phrasingTypes,
-      traverse(),
-      'strikethrough',
-      context
-    ),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'strikethrough'),
   }),
-  ul: ($el, traverse, context) => ({
+  ul: ($el, traverse) => ({
     type: 'list',
-    children: everyChildIsType('list-item', traverse(), 'list', context),
+    children: everyChildIsType('list-item', traverse(), 'list'),
     ordered: false,
   }),
-  ol: ($el, traverse, context) => ({
+  ol: ($el, traverse) => ({
     type: 'list',
-    children: everyChildIsType('list-item', traverse(), 'list', context),
+    children: everyChildIsType('list-item', traverse(), 'list'),
     ordered: true,
   }),
-  li: ($el, traverse, context) => ({
+  li: ($el, traverse) => ({
     type: 'list-item',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'list-item', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'list-item'),
   }),
   'a[data-asset-type="tweet"]': ($el) => ({
     type: 'tweet',
     id: $el.attr('href') || '',
   }),
 
-  'h4,h5,h6': ($el, traverse, context) => ({
+  'h4,h5,h6': ($el, traverse) => ({
     type: 'heading',
     level: 'label',
-    children: everyChildIsType('text', traverse(), 'heading', context),
+    children: everyChildIsType('text', traverse(), 'heading'),
   }),
   'pull-quote': ($el) => ({
     type: 'pullquote',
@@ -236,7 +230,7 @@ const commonTagMappings: TagMappings = {
       description: $description.text(),
     }
   },
-  '.n-content-layout': ($el, traverse, context) => {
+  '.n-content-layout': ($el, traverse) => {
     //TODO: this is a bit gross??
     const isValidWidth = (
       str: string
@@ -260,16 +254,14 @@ const commonTagMappings: TagMappings = {
           ...everyChildIsType<ContentTree.LayoutSlot>(
             'layout-slot',
             otherChildren,
-            'layout',
-            context
+            'layout'
           ),
         ]
       } else {
         return everyChildIsType<ContentTree.LayoutSlot>(
           'layout-slot',
           children,
-          'layout',
-          context
+          'layout'
         )
       }
     }
@@ -281,7 +273,7 @@ const commonTagMappings: TagMappings = {
       children: getChildren(traverse()),
     }
   },
-  '.n-content-layout__slot': ($el, traverse, context) => ({
+  '.n-content-layout__slot': ($el, traverse) => ({
     type: 'layout-slot',
     children: childrenOfTypes(
       ['heading', 'paragraph', 'layout-image'],
@@ -291,8 +283,7 @@ const commonTagMappings: TagMappings = {
         .flatMap((node) =>
           node.type === 'layout-slot' ? node.children : [node]
         ),
-      'layout-slot',
-      context
+      'layout-slot'
     ),
   }),
   '.n-content-layout img': ($el) => ({
@@ -303,7 +294,7 @@ const commonTagMappings: TagMappings = {
     credit: $el.attr('data-copyright') || '',
   }),
 
-  table: ($el, traverse, context): Table | ContentTree.Layout => {
+  table: ($el, traverse): Table | ContentTree.Layout => {
     const layoutSmallscreen = $el.attr('data-table-layout-smallscreen')
     const responsiveStyle: Table['responsiveStyle'] =
       layoutSmallscreen && layoutSmallscreen in tableResponsiveStyleMap
@@ -318,14 +309,12 @@ const commonTagMappings: TagMappings = {
     const caption = findChildOftype<TableCaption>(
       'table-caption',
       children,
-      'table',
-      context
+      'table'
     )
     const footer = findChildOftype<TableFooter>(
       'table-footer',
       children,
-      'table',
-      context
+      'table'
     )
 
     // HACK:KB:20230523 transform single-cell tables into infoboxes, for legacy articles
@@ -339,8 +328,7 @@ const commonTagMappings: TagMappings = {
         children: childrenOfTypes(
           ['paragraph', 'heading'],
           bodies[0].children[0].children[0].children,
-          'layout-slot',
-          context
+          'layout-slot'
         ),
       }
 
@@ -349,12 +337,7 @@ const commonTagMappings: TagMappings = {
             {
               type: 'heading',
               level: 'subheading',
-              children: everyChildIsType(
-                'text',
-                caption.children,
-                'heading',
-                context
-              ),
+              children: everyChildIsType('text', caption.children, 'heading'),
             },
             slot,
           ]
@@ -434,44 +417,34 @@ const commonTagMappings: TagMappings = {
   // HACK needs to come before tr. TODO sort by selector specificity
   'tfoot > tr': ($el, traverse) => traverse(),
   // HACK needs to come before td. TODO sort by selector specificity
-  'tfoot > tr > td': ($el, traverse, context) => ({
+  'tfoot > tr > td': ($el, traverse) => ({
     type: 'table-footer',
-    children: childrenOfTypes(
-      phrasingTypes,
-      traverse(),
-      'table-footer',
-      context
-    ),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'table-footer'),
   }),
-  tr: ($el, traverse, context) => ({
+  tr: ($el, traverse) => ({
     type: 'table-row',
-    children: everyChildIsType('table-cell', traverse(), 'table-row', context),
+    children: everyChildIsType('table-cell', traverse(), 'table-row'),
   }),
-  td: ($el, traverse, context) => ({
+  td: ($el, traverse) => ({
     type: 'table-cell',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'table-cell', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'table-cell'),
   }),
-  th: ($el, traverse, context) => ({
+  th: ($el, traverse) => ({
     type: 'table-cell',
     heading: true,
-    children: childrenOfTypes(phrasingTypes, traverse(), 'table-cell', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'table-cell'),
   }),
-  thead: ($el, traverse, context) => ({
+  thead: ($el, traverse) => ({
     type: 'table-body',
-    children: everyChildIsType('table-row', traverse(), 'table-body', context),
+    children: everyChildIsType('table-row', traverse(), 'table-body'),
   }),
-  tbody: ($el, traverse, context) => ({
+  tbody: ($el, traverse) => ({
     type: 'table-body',
-    children: everyChildIsType('table-row', traverse(), 'table-body', context),
+    children: everyChildIsType('table-row', traverse(), 'table-body'),
   }),
-  caption: ($el, traverse, context) => ({
+  caption: ($el, traverse) => ({
     type: 'table-caption',
-    children: childrenOfTypes(
-      phrasingTypes,
-      traverse(),
-      'table-caption',
-      context
-    ),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'table-caption'),
   }),
 
   // HACK needs to come after LayoutImage. TODO sort by selector specificity
@@ -495,15 +468,14 @@ const commonTagMappings: TagMappings = {
     format: 'standard',
   }),
 
-  'scrollable-block': ($el, traverse, context) => {
+  'scrollable-block': ($el, traverse) => {
     return {
       type: 'scrolly-block',
       theme: $el.attr('theme') === '2' ? 'serif' : 'sans',
       children: everyChildIsType(
         'scrolly-section',
         traverse(),
-        'scrolly-block',
-        context
+        'scrolly-block'
       ),
     }
   },
@@ -514,7 +486,7 @@ const commonTagMappings: TagMappings = {
       id: $el.attr('url') ?? '',
     }),
 
-  'scrollable-section': ($el, traverse, context) => {
+  'scrollable-section': ($el, traverse) => {
     const [firstChild, ...restChildren] = traverse()
 
     const display = $el.attr('theme-display')
@@ -538,33 +510,29 @@ const commonTagMappings: TagMappings = {
         ...everyChildIsType<ContentTree.ScrollyImage>(
           'scrolly-image',
           [firstChild],
-          'scrolly-section',
-          context
+          'scrolly-section'
         ),
         ...everyChildIsType<ContentTree.ScrollyCopy>(
           'scrolly-copy',
           restChildren,
-          'scrolly-section',
-          context
+          'scrolly-section'
         ),
       ] as [ContentTree.ScrollyImage, ...ContentTree.ScrollyCopy[]],
     }
   },
 
-  'scrollable-text': ($el, traverse, context) => ({
+  'scrollable-text': ($el, traverse) => ({
     type: 'scrolly-copy',
     children: childrenOfTypes(
       ['scrolly-heading', 'paragraph'],
       traverse(),
-      'scrolly-copy',
-      context
+      'scrolly-copy'
     ),
   }),
 
   'scrollable-text > p, scrollable-text > h1, scrollable-text > h2': (
     $el,
-    traverse,
-    context
+    traverse
   ) => {
     const textStyle = $el.attr('theme-style')
 
@@ -572,41 +540,31 @@ const commonTagMappings: TagMappings = {
       return {
         type: 'scrolly-heading',
         level: scrollytellingOptionsToContentTree.textStyle[textStyle],
-        children: everyChildIsType(
-          'text',
-          traverse(),
-          'scrolly-heading',
-          context
-        ),
+        children: everyChildIsType('text', traverse(), 'scrolly-heading'),
       }
     }
 
     return {
       type: 'paragraph',
-      children: childrenOfTypes(
-        phrasingTypes,
-        traverse(),
-        'paragraph',
-        context
-      ),
+      children: childrenOfTypes(phrasingTypes, traverse(), 'paragraph'),
     }
   },
 
   // HACK:KB:20230703 needs to come after `scrollable-text > X`. todo sort by specificity
-  p: ($el, traverse, context) => ({
+  p: ($el, traverse) => ({
     type: 'paragraph',
-    children: childrenOfTypes(phrasingTypes, traverse(), 'paragraph', context),
+    children: childrenOfTypes(phrasingTypes, traverse(), 'paragraph'),
   }),
 
-  h1: ($el, traverse, context) => ({
+  h1: ($el, traverse) => ({
     type: 'heading',
     level: 'chapter',
-    children: everyChildIsType('text', traverse(), 'heading', context),
+    children: everyChildIsType('text', traverse(), 'heading'),
   }),
-  'h2,h3': ($el, traverse, context) => ({
+  'h2,h3': ($el, traverse) => ({
     type: 'heading',
     level: 'subheading',
-    children: everyChildIsType('text', traverse(), 'heading', context),
+    children: everyChildIsType('text', traverse(), 'heading'),
   }),
   'ft-content[type="http://www.ft.com/ontology/content/ClipSet"]': ($el) => ({
     type: 'clip-set',