@financial-times/cp-content-pipeline-schema 2.9.1 → 2.9.2

package/src/model/CapiResponse.ts

@@ -141,7 +141,7 @@ function getContentType(
   const TYPE_REGEX = /https?:\/\/www.ft.com\/ontology\/content\//
   const useType =
     'type' in content && content.type ? content.type : content.types[0]
-  const type = useType.replace(TYPE_REGEX, '')
+  const type = useType?.replace(TYPE_REGEX, '')
 
   if (validate && !validLiteralUnionValue(type, ContentType.values)) {
     throw new Error('Content type is invalid: ' + useType)
@@ -535,7 +535,10 @@ export class CapiResponse {
   #createCAPIImage(image: MainImage | undefined) {
     if (image?.type === 'http://www.ft.com/ontology/content/Image') {
       return new CAPIImage(image, this.context)
-    } else if (image?.type === 'http://www.ft.com/ontology/content/ImageSet') {
+    } else if (
+      image?.type === 'http://www.ft.com/ontology/content/ImageSet' &&
+      image.members[0]
+    ) {
       return new CAPIImage(image.members[0], this.context)
     }
 
@@ -753,7 +756,7 @@ export class CapiResponse {
       )
 
       if (pinnedPostIndex !== -1) {
-        return liveBlogPosts.splice(pinnedPostIndex, 1)[0]
+        return liveBlogPosts.splice(pinnedPostIndex, 1)[0] ?? null
       }
     }
     return null

package/src/model/Clip.ts

@@ -79,7 +79,7 @@ export class Clip implements ClipVideo {
       'full-grid': 1200,
     }
 
-    const url = this.clip.poster?.members[0].binaryUrl
+    const url = this.clip.poster?.members[0]?.binaryUrl
     return url
       ? imageServiceUrl({
           url,

package/src/model/Image.test.ts

@@ -68,10 +68,10 @@ describe('Image', () => {
 
       it('includes sourceSet for all the possible resolutions we can display the image at, given the requested width and the original source width', () => {
         expect(sourceSet.length).toEqual(5)
-        expect(sourceSet[0].dpr).toEqual(1)
-        expect(sourceSet[0].url).toMatch(/dpr=1/)
-        expect(sourceSet[4].dpr).toEqual(5)
-        expect(sourceSet[4].url).toMatch(/dpr=5/)
+        expect(sourceSet[0]?.dpr).toEqual(1)
+        expect(sourceSet[0]?.url).toMatch(/dpr=1/)
+        expect(sourceSet[4]?.dpr).toEqual(5)
+        expect(sourceSet[4]?.url).toMatch(/dpr=5/)
       })
     })
 
@@ -109,7 +109,7 @@ describe('Image', () => {
         const model = new CAPIImage(mockImage, context)
         const sourceSet = await model.sourceSet({ width: MAX_IMAGE_WIDTH })
         expect(sourceSet.length).toEqual(1)
-        expect(sourceSet[0].width).toEqual(MAX_IMAGE_WIDTH)
+        expect(sourceSet[0]?.width).toEqual(MAX_IMAGE_WIDTH)
       })
     })
 
@@ -119,8 +119,8 @@ describe('Image', () => {
         const model = new CAPIImage(mockImage, context)
         const sourceSet = await model.sourceSet({ width: 1000, maxDpr: 2 })
         expect(sourceSet.length).toEqual(2)
-        expect(sourceSet[0].dpr).toEqual(1)
-        expect(sourceSet[1].dpr).toEqual(2)
+        expect(sourceSet[0]?.dpr).toEqual(1)
+        expect(sourceSet[1]?.dpr).toEqual(2)
       })
     })
 
@@ -150,13 +150,13 @@ describe('Image', () => {
       })
       it('passes the requested width to the image service', async () => {
         expect(sourceSet.length).toEqual(1)
-        expect(sourceSet[0].width).toEqual(3000)
-        expect(sourceSet[0].url).toMatch(/width=3000/)
+        expect(sourceSet[0]?.width).toEqual(3000)
+        expect(sourceSet[0]?.url).toMatch(/width=3000/)
       })
       it('falls back to a single DPR source', async () => {
         expect(sourceSet.length).toEqual(1)
-        expect(sourceSet[0].dpr).toEqual(1)
-        expect(sourceSet[0].url).toMatch(/dpr=1/)
+        expect(sourceSet[0]?.dpr).toEqual(1)
+        expect(sourceSet[0]?.url).toMatch(/dpr=1/)
       })
     })
   })

package/src/model/RichText.test.ts

@@ -59,8 +59,8 @@ describe('RichText resolver', () => {
       const model = new RichText('bodyXML', bodyXML)
       const result = await model.structured()
 
-      expect(result.references[0].reference.type).toEqual('main-image')
-      expect(result.references[1].reference.type).toEqual('image-set')
+      expect(result.references[0]?.reference.type).toEqual('main-image')
+      expect(result.references[1]?.reference.type).toEqual('image-set')
     })
 
     it('should not match the first imageset inside other components', async () => {
@@ -76,8 +76,8 @@ describe('RichText resolver', () => {
       const model = new RichText('bodyXML', bodyXML)
       const result = await model.structured()
 
-      expect(result.references[0].reference.type).toEqual('main-image')
-      expect(result.references[1].reference.type).toEqual('image-set')
+      expect(result.references[0]?.reference.type).toEqual('main-image')
+      expect(result.references[1]?.reference.type).toEqual('image-set')
     })
   })
 })

package/src/model/Topper.ts

@@ -275,7 +275,7 @@ export class Topper {
     const isOpinionOrColumn =
       this.type() === 'OpinionTopper' || this.capiResponse.isColumn()
 
-    return isOpinionOrColumn && authors.length ? authors[0] : null
+    return isOpinionOrColumn && authors[0] ? authors[0] : null
   }
 
   brandConcept() {
@@ -319,7 +319,7 @@ export class Topper {
     if (this.capiResponse.isOpinion()) {
       const authors = this.capiResponse.authors()
 
-      if (authors && authors.length >= 1) {
+      if (authors && authors[0]) {
         return authors[0].headshot(args)
       }
     }

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

@@ -45,11 +45,13 @@ export default function bodyXMLToTree(
 
       if (matchedSelector) {
         const contentTreeTransform = tagMappings[matchedSelector]
-        return contentTreeTransform(
-          $(node),
-          () => flattenAndTraverseChildren(node.children),
-          context
-        )
+        if (contentTreeTransform) {
+          return contentTreeTransform(
+            $(node),
+            () => flattenAndTraverseChildren(node.children),
+            context
+          )
+        }
       }
 
       return flattenAndTraverseChildren(node.children)
@@ -58,7 +60,12 @@ export default function bodyXMLToTree(
     return []
   }
 
-  const body = traverse($('body')[0])
+  const cheerioBody = $('body')
+  if (!cheerioBody[0]) {
+    throw new Error('No body tag found in bodyXML')
+  }
+
+  const body = traverse(cheerioBody[0])
 
   logErrors(context)
 

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

@@ -40,7 +40,7 @@ describe('tagMappings test', () => {
     const selector =
       'ft-content[type="http://www.ft.com/ontology/content/clip"]'
     const $el = load(bodyXML)(selector)
-    const mapping = tagMappings[selector]($el, () => [])
+    const mapping = tagMappings[selector]!($el, () => [])
 
     expectNodeType<OldClip>(mapping, 'clip')
     expect(mapping.url).toBe(

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

@@ -265,7 +265,7 @@ const commonTagMappings: TagMappings = {
     ): ContentTree.Layout['children'] => {
       const [firstChild, ...otherChildren] = children
 
-      if (firstChild.type === 'heading') {
+      if (firstChild && firstChild.type === 'heading') {
         return [
           firstChild,
           ...everyChildIsType<ContentTree.LayoutSlot>(
@@ -317,9 +317,9 @@ const commonTagMappings: TagMappings = {
   table: ($el, traverse, context): Table | ContentTree.Layout => {
     const layoutSmallscreen = $el.attr('data-table-layout-smallscreen')
     const responsiveStyle: Table['responsiveStyle'] =
-      layoutSmallscreen && layoutSmallscreen in tableResponsiveStyleMap
+      (layoutSmallscreen
         ? tableResponsiveStyleMap[layoutSmallscreen]
-        : 'overflow'
+        : undefined) ?? 'overflow'
 
     const children = traverse()
     const bodies = children.filter(
@@ -342,14 +342,14 @@ const commonTagMappings: TagMappings = {
     // HACK:KB:20230523 transform single-cell tables into infoboxes, for legacy articles
     if (
       bodies.length === 1 &&
-      bodies[0].children.length === 1 &&
-      bodies[0].children[0].children.length === 1
+      bodies[0]?.children.length === 1 &&
+      bodies[0]?.children[0]?.children.length === 1
     ) {
       const slot: ContentTree.LayoutSlot = {
         type: 'layout-slot',
         children: childrenOfTypes(
           ['paragraph', 'heading'],
-          bodies[0].children[0].children[0].children,
+          bodies[0]?.children[0]?.children[0]?.children ?? [],
           'layout-slot',
           context
         ),
@@ -548,7 +548,7 @@ const commonTagMappings: TagMappings = {
       children: [
         ...everyChildIsType<ContentTree.ScrollyImage>(
           'scrolly-image',
-          [firstChild],
+          firstChild ? [firstChild] : [],
           'scrolly-section',
           context
         ),