@financial-times/cp-content-pipeline-schema 3.5.0 → 3.5.2

package/src/resolvers/content-tree/references/Flourish.test.ts

@@ -30,6 +30,7 @@ describe('Flourish Model', () => {
           timestamp: '2022-01-06T14:41:01.102Z',
           description: 'Example description',
         }
+
         const fallbackResponse = await Flourish.fallbackImage(
           { reference },
           {},
@@ -42,7 +43,7 @@ describe('Flourish Model', () => {
           /https:\/\/public.flourish.studio\/.*\/.*\/thumbnail/
         )
 
-        expect(decodeURIComponent(fallbackResponse.url as string)).toMatch(
+        expect(decodeURIComponent(fallbackResponse?.url() as string)).toMatch(
           flourishImageUrlRegex
         )
       })
@@ -66,7 +67,7 @@ describe('Flourish Model', () => {
           /https:\/\/public.flourish.studio\/.*\/example-id/
         )
 
-        expect(decodeURIComponent(fallbackResponse.url as string)).toMatch(
+        expect(decodeURIComponent(fallbackResponse?.url() as string)).toMatch(
           flourishImageUrlRegex
         )
       })
@@ -88,7 +89,7 @@ describe('Flourish Model', () => {
 
         const flourishImageUrl = 'https://public.flourish.studio/example-type'
 
-        expect(fallbackResponse.url).toContain(
+        expect(fallbackResponse?.url() ?? '').toContain(
           encodeURIComponent(flourishImageUrl)
         )
       })

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

@@ -1,38 +1,25 @@
-import imageServiceUrl from '../../../helpers/imageService'
 import {
-  FlourishFallbackResolvers,
   FlourishResolvers,
+  FlourishSourceResolvers,
 } from '../../../generated'
-import { FlourishSource } from '../../../model/FlourishSource'
+import { FlourishSource as FlourishSourceModel } from '../../../model/FlourishSource'
 
 export const Flourish = {
   async fallbackImage(parent, _args, context) {
     if (!parent.reference) {
-      return {}
+      return null
     }
+
     const flourishData = {
       id: parent.reference.id,
       type: parent.reference.flourishType,
       description: parent.reference.description,
     }
-    const flourishSource = new FlourishSource(flourishData, context)
-    const width = await flourishSource.width()
-    const height = await flourishSource.height()
-
-    const imageServiceWrappedUrl = imageServiceUrl({
-      url: flourishSource.flourishUrl(),
-      systemCode: context.systemCode ?? 'cp-content-pipeline',
-      width,
-    })
 
-    return {
-      url: imageServiceWrappedUrl,
-      type: flourishSource.type(),
-      format: flourishSource.format(),
-      sourceSet: [],
-      width,
-      height,
-    }
+    return FlourishSourceModel.createWithMetadata(
+      flourishData,
+      context
+    )
   },
 
   type(parent) {
@@ -40,14 +27,11 @@ export const Flourish = {
   },
 } satisfies FlourishResolvers
 
-export const FlourishFallback = {
-  async height(parent) {
-    return parent.height ?? null
-  },
-  async width(parent) {
-    return parent.width ?? null
-  },
-  async url(parent) {
-    return parent.url ?? null
-  },
-} satisfies FlourishFallbackResolvers
+export const FlourishSource = {
+  id: (parent) => parent.id(),
+  url: (parent) => parent.flourishUrl(),
+  type: (parent) => parent.type(),
+  width: (parent) => parent.width(),
+  height: (parent) => parent.height(),
+  format: (parent) => parent.format(),
+} satisfies FlourishSourceResolvers

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

@@ -8,7 +8,7 @@ import { ImageSet } from './ImageSet'
 import { ClipSet, Accessibility, Caption } from './ClipSet'
 import { CustomCodeComponent } from './CustomCodeComponent'
 import { Video } from './Video'
-import { Flourish, FlourishFallback } from './Flourish'
+import { Flourish, FlourishSource } from './Flourish'
 import { Recommended } from './Recommended'
 import { LayoutImage } from './LayoutImage'
 import { RawImage } from './RawImage'
@@ -27,8 +27,8 @@ import {
   VideoReferenceResolvers,
   CaptionResolvers,
   AccessibilityResolvers,
-  FlourishFallbackResolvers,
   AuthorReferenceResolvers,
+  FlourishSourceResolvers,
 } from '../../../generated'
 import { AnyNode } from '../Workarounds'
 import { Author } from './Author'
@@ -46,6 +46,7 @@ export const resolvers: {
   CustomCodeComponent: CustomCodeComponentResolvers
   VideoReference: VideoReferenceResolvers
   Flourish: FlourishResolvers
+  FlourishSource: FlourishSourceResolvers
   Recommended: RecommendedResolvers
   LayoutImage: LayoutImageResolvers
   RawImage: RawImageResolvers
@@ -53,7 +54,6 @@ export const resolvers: {
   MainImage: ImageSetResolvers
   Caption: CaptionResolvers
   Accessibility: AccessibilityResolvers
-  FlourishFallback: FlourishFallbackResolvers
   AuthorReference: AuthorReferenceResolvers
 } = {
   Reference,
@@ -63,6 +63,7 @@ export const resolvers: {
   CustomCodeComponent,
   VideoReference: Video,
   Flourish,
+  FlourishSource,
   Recommended,
   LayoutImage,
   RawImage,
@@ -70,7 +71,6 @@ export const resolvers: {
   MainImage: ImageSet,
   Caption,
   Accessibility,
-  FlourishFallback,
   AuthorReference: Author,
 }