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

package/lib/model/schemas/capi/custom-code-component.d.ts

@@ -1621,18 +1621,18 @@ export declare const customCodeComponentSchema: import("zod").ZodObject<import("
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;

package/lib/model/schemas/capi/index.d.ts

@@ -1503,18 +1503,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage" | "leadImages" | "alternativeImages" | "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -3585,18 +3585,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage" | "leadImages" | "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -5631,18 +5631,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "dataSource" | "mainImage">>, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -5665,7 +5665,7 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }[] | undefined;
     webUrl?: string | undefined;
     canonicalWebUrl?: string | undefined;
@@ -5761,7 +5761,7 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }[] | undefined;
     webUrl?: string | undefined;
     canonicalWebUrl?: string | undefined;
@@ -7339,18 +7339,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage">>, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -9157,18 +9157,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -10961,18 +10961,18 @@ export declare const schemas: (contentType: LiteralUnionScalarValues<typeof Cont
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage" | "leadImages" | "leadFlourish">>, "strip", import("zod").ZodTypeAny, {
     id: string;

package/lib/model/schemas/capi/live-blog-package.d.ts

@@ -1501,18 +1501,18 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<import("zod"
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage" | "leadImages" | "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;

package/lib/model/schemas/capi/placeholder.d.ts

@@ -1501,18 +1501,18 @@ export declare const placeholderSchema: import("zod").ZodObject<import("zod").ob
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage" | "leadImages" | "alternativeImages" | "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;

package/lib/model/schemas/capi/video.d.ts

@@ -1501,18 +1501,18 @@ export declare const videoSchema: import("zod").ZodObject<import("zod").objectUt
     dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
         binaryUrl: import("zod").ZodString;
         duration: import("zod").ZodNumber;
-        filesize: import("zod").ZodNumber;
+        filesize: import("zod").ZodOptional<import("zod").ZodNumber>;
         mediaType: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }, {
         binaryUrl: string;
         duration: number;
         mediaType: string;
-        filesize: number;
+        filesize?: number | undefined;
     }>, "many">>;
 }, "mainImage">>, "strip", import("zod").ZodTypeAny, {
     id: string;

package/lib/resolvers/content-tree/references/Flourish.d.ts

@@ -1,23 +1,13 @@
+import { FlourishSource as FlourishSourceModel } from '../../../model/FlourishSource';
 export declare const Flourish: {
-    fallbackImage(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Flourish>, _args: {}, context: import("../../..").QueryContext): Promise<{
-        url?: undefined;
-        type?: undefined;
-        format?: undefined;
-        sourceSet?: undefined;
-        width?: undefined;
-        height?: undefined;
-    } | {
-        url: string;
-        type: string;
-        format: "standard";
-        sourceSet: never[];
-        width: number;
-        height: number;
-    }>;
+    fallbackImage(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Flourish>, _args: {}, context: import("../../..").QueryContext): Promise<FlourishSourceModel | null>;
     type(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Flourish>): "flourish";
 };
-export declare const FlourishFallback: {
-    height(parent: import("../../../generated").FlourishFallback): Promise<number | null>;
-    width(parent: import("../../../generated").FlourishFallback): Promise<number | null>;
-    url(parent: import("../../../generated").FlourishFallback): Promise<string | null>;
+export declare const FlourishSource: {
+    id: (parent: FlourishSourceModel) => string;
+    url: (parent: FlourishSourceModel) => string;
+    type: (parent: FlourishSourceModel) => string;
+    width: (parent: FlourishSourceModel) => number;
+    height: (parent: FlourishSourceModel) => number;
+    format: (parent: FlourishSourceModel) => "standard";
 };

package/lib/resolvers/content-tree/references/Flourish.js

@@ -1,51 +1,29 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlourishFallback = exports.Flourish = void 0;
-const imageService_1 = __importDefault(require("../../../helpers/imageService"));
+exports.FlourishSource = exports.Flourish = void 0;
 const FlourishSource_1 = require("../../../model/FlourishSource");
 exports.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_1.FlourishSource(flourishData, context);
-        const width = await flourishSource.width();
-        const height = await flourishSource.height();
-        const imageServiceWrappedUrl = (0, imageService_1.default)({
-            url: flourishSource.flourishUrl(),
-            systemCode: context.systemCode ?? 'cp-content-pipeline',
-            width,
-        });
-        return {
-            url: imageServiceWrappedUrl,
-            type: flourishSource.type(),
-            format: flourishSource.format(),
-            sourceSet: [],
-            width,
-            height,
-        };
+        return FlourishSource_1.FlourishSource.createWithMetadata(flourishData, context);
     },
     type(parent) {
         return parent.reference.type;
     },
 };
-exports.FlourishFallback = {
-    async height(parent) {
-        return parent.height ?? null;
-    },
-    async width(parent) {
-        return parent.width ?? null;
-    },
-    async url(parent) {
-        return parent.url ?? null;
-    },
+exports.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(),
 };
 //# sourceMappingURL=Flourish.js.map

package/lib/resolvers/content-tree/references/Flourish.js.map

@@ -1 +1 @@
-{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;;;;AAAA,iFAA2D;AAK3D,kEAA8D;AAEjD,QAAA,QAAQ,GAAG;IACtB,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACxC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,EAAE,CAAA;QACX,CAAC;QACD,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;YACvB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,YAAY;YACnC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW;SAC1C,CAAA;QACD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,CAAA;QAC1C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,CAAA;QAE5C,MAAM,sBAAsB,GAAG,IAAA,sBAAe,EAAC;YAC7C,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE;YACjC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,qBAAqB;YACvD,KAAK;SACN,CAAC,CAAA;QAEF,OAAO;YACL,GAAG,EAAE,sBAAsB;YAC3B,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE;YAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE;YAC/B,SAAS,EAAE,EAAE;YACb,KAAK;YACL,MAAM;SACP,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;CAC0B,CAAA;AAEhB,QAAA,gBAAgB,GAAG;IAC9B,KAAK,CAAC,MAAM,CAAC,MAAM;QACjB,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,CAAA;IAC9B,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,MAAM;QAChB,OAAO,MAAM,CAAC,KAAK,IAAI,IAAI,CAAA;IAC7B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,MAAM;QACd,OAAO,MAAM,CAAC,GAAG,IAAI,IAAI,CAAA;IAC3B,CAAC;CACkC,CAAA"}
+{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;AAIA,kEAAqF;AAExE,QAAA,QAAQ,GAAG;IACtB,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACxC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;YACvB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,YAAY;YACnC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW;SAC1C,CAAA;QAED,OAAO,+BAAmB,CAAC,kBAAkB,CAC3C,YAAY,EACZ,OAAO,CACR,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;CAC0B,CAAA;AAEhB,QAAA,cAAc,GAAG;IAC5B,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;IAC3B,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;IACrC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;IAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;IACjC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;IACnC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;CACF,CAAA"}

package/lib/resolvers/content-tree/references/Flourish.test.js

@@ -30,7 +30,7 @@ describe('Flourish Model', () => {
                 // Regex checks for flourish url whilst leaving spaces for arguments
                 // https://public.flourish.studio/{type}/{id}/thumbnail
                 const flourishImageUrlRegex = new RegExp(/https:\/\/public.flourish.studio\/.*\/.*\/thumbnail/);
-                expect(decodeURIComponent(fallbackResponse.url)).toMatch(flourishImageUrlRegex);
+                expect(decodeURIComponent(fallbackResponse?.url())).toMatch(flourishImageUrlRegex);
             });
             it('The Flourish id is included in the flourish image url', async () => {
                 const reference = {
@@ -43,7 +43,7 @@ describe('Flourish Model', () => {
                 };
                 const fallbackResponse = await Flourish_1.Flourish.fallbackImage({ reference }, {}, context);
                 const flourishImageUrlRegex = new RegExp(/https:\/\/public.flourish.studio\/.*\/example-id/);
-                expect(decodeURIComponent(fallbackResponse.url)).toMatch(flourishImageUrlRegex);
+                expect(decodeURIComponent(fallbackResponse?.url())).toMatch(flourishImageUrlRegex);
             });
             it('The Flourish graphic type is included in the flourish image url', async () => {
                 const reference = {
@@ -56,7 +56,7 @@ describe('Flourish Model', () => {
                 };
                 const fallbackResponse = await Flourish_1.Flourish.fallbackImage({ reference }, {}, context);
                 const flourishImageUrl = 'https://public.flourish.studio/example-type';
-                expect(fallbackResponse.url).toContain(encodeURIComponent(flourishImageUrl));
+                expect(fallbackResponse?.url() ?? '').toContain(encodeURIComponent(flourishImageUrl));
             });
         });
     });

package/lib/resolvers/content-tree/references/Flourish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Flourish.test.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.test.ts"],"names":[],"mappings":";;AAAA,2CAAoC;AAEpC,yCAAqC;AAIrC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,MAAM,2BAA2B,GAAG,cAAI,CAAC,EAAE,EAAE,CAAA;IAC7C,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,gBAAgB;QAC5B,WAAW,EAAE;YACX,OAAO,EAAE;gBACP,gBAAgB,EAAE,2BAA2B;aAC9C;SACF;KACyB,CAAA;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,cAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;YACnB,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,oEAAoE;gBACpE,uDAAuD;gBACvD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,qDAAqD,CACtD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,GAAa,CAAC,CAAC,CAAC,OAAO,CAChE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;gBACrE,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,kDAAkD,CACnD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,GAAa,CAAC,CAAC,CAAC,OAAO,CAChE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;gBAC/E,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,gBAAgB,GAAG,6CAA6C,CAAA;gBAEtE,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,SAAS,CACpC,kBAAkB,CAAC,gBAAgB,CAAC,CACrC,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Flourish.test.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.test.ts"],"names":[],"mappings":";;AAAA,2CAAoC;AAEpC,yCAAqC;AAIrC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,MAAM,2BAA2B,GAAG,cAAI,CAAC,EAAE,EAAE,CAAA;IAC7C,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,gBAAgB;QAC5B,WAAW,EAAE;YACX,OAAO,EAAE;gBACP,gBAAgB,EAAE,2BAA2B;aAC9C;SACF;KACyB,CAAA;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,cAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;YACnB,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBAED,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,oEAAoE;gBACpE,uDAAuD;gBACvD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,qDAAqD,CACtD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,GAAG,EAAY,CAAC,CAAC,CAAC,OAAO,CACnE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;gBACrE,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,kDAAkD,CACnD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,GAAG,EAAY,CAAC,CAAC,CAAC,OAAO,CACnE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;gBAC/E,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,gBAAgB,GAAG,6CAA6C,CAAA;gBAEtE,MAAM,CAAC,gBAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,SAAS,CAC7C,kBAAkB,CAAC,gBAAgB,CAAC,CACrC,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

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

@@ -1,6 +1,6 @@
 import type { ContentTree } from '@financial-times/content-tree';
 import type { CapiResponse } from '../../../model/CapiResponse';
-import { FlourishResolvers, ImageSetResolvers, ClipSetResolvers, CustomCodeComponentResolvers, LayoutImageResolvers, RawImageResolvers, RecommendedResolvers, ReferenceResolvers, ScrollyImageResolvers, TweetResolvers, VideoReferenceResolvers, CaptionResolvers, AccessibilityResolvers, FlourishFallbackResolvers, AuthorReferenceResolvers } from '../../../generated';
+import { FlourishResolvers, ImageSetResolvers, ClipSetResolvers, CustomCodeComponentResolvers, LayoutImageResolvers, RawImageResolvers, RecommendedResolvers, ReferenceResolvers, ScrollyImageResolvers, TweetResolvers, VideoReferenceResolvers, CaptionResolvers, AccessibilityResolvers, AuthorReferenceResolvers, FlourishSourceResolvers } from '../../../generated';
 export type ReferenceWithCAPIData<ReferenceType = ContentTree.Node> = {
     reference: ReferenceType;
     contentApiData?: CapiResponse;
@@ -13,6 +13,7 @@ export declare const resolvers: {
     CustomCodeComponent: CustomCodeComponentResolvers;
     VideoReference: VideoReferenceResolvers;
     Flourish: FlourishResolvers;
+    FlourishSource: FlourishSourceResolvers;
     Recommended: RecommendedResolvers;
     LayoutImage: LayoutImageResolvers;
     RawImage: RawImageResolvers;
@@ -20,7 +21,6 @@ export declare const resolvers: {
     MainImage: ImageSetResolvers;
     Caption: CaptionResolvers;
     Accessibility: AccessibilityResolvers;
-    FlourishFallback: FlourishFallbackResolvers;
     AuthorReference: AuthorReferenceResolvers;
 };
 export declare const mapNodeToReference: {

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

@@ -21,6 +21,7 @@ exports.resolvers = {
     CustomCodeComponent: CustomCodeComponent_1.CustomCodeComponent,
     VideoReference: Video_1.Video,
     Flourish: Flourish_1.Flourish,
+    FlourishSource: Flourish_1.FlourishSource,
     Recommended: Recommended_1.Recommended,
     LayoutImage: LayoutImage_1.LayoutImage,
     RawImage: RawImage_1.RawImage,
@@ -28,7 +29,6 @@ exports.resolvers = {
     MainImage: ImageSet_1.ImageSet,
     Caption: ClipSet_1.Caption,
     Accessibility: ClipSet_1.Accessibility,
-    FlourishFallback: Flourish_1.FlourishFallback,
     AuthorReference: Author_1.Author,
 };
 exports.mapNodeToReference = {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/index.ts"],"names":[],"mappings":";;;AAGA,2CAAuC;AAEvC,mCAA+B;AAC/B,yCAAqC;AACrC,uCAA2D;AAC3D,+DAA2D;AAC3D,mCAA+B;AAC/B,yCAAuD;AACvD,+CAA2C;AAC3C,+CAA2C;AAC3C,yCAAqC;AACrC,iDAA6C;AAmB7C,qCAAiC;AAOpB,QAAA,SAAS,GAiBlB;IACF,SAAS,EAAT,qBAAS;IACT,KAAK,EAAL,aAAK;IACL,QAAQ,EAAR,mBAAQ;IACR,OAAO,EAAP,iBAAO;IACP,mBAAmB,EAAnB,yCAAmB;IACnB,cAAc,EAAE,aAAK;IACrB,QAAQ,EAAR,mBAAQ;IACR,WAAW,EAAX,yBAAW;IACX,WAAW,EAAX,yBAAW;IACX,QAAQ,EAAR,mBAAQ;IACR,YAAY,EAAZ,2BAAY;IACZ,SAAS,EAAE,mBAAQ;IACnB,OAAO,EAAP,iBAAO;IACP,aAAa,EAAb,uBAAa;IACb,gBAAgB,EAAhB,2BAAgB;IAChB,eAAe,EAAE,eAAM;CACxB,CAAA;AAEY,QAAA,kBAAkB,GAAG;IAChC,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE,SAAS;IACf,uBAAuB,EAAE,qBAAqB;IAC9C,KAAK,EAAE,gBAAgB;IACvB,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,aAAa;IAC7B,eAAe,EAAE,cAAc;IAC/B,WAAW,EAAE,UAAU;IACvB,YAAY,EAAE,WAAW;IACzB,gBAAgB,EAAE,UAAU;IAC5B,MAAM,EAAE,iBAAiB;CACkD,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/index.ts"],"names":[],"mappings":";;;AAGA,2CAAuC;AAEvC,mCAA+B;AAC/B,yCAAqC;AACrC,uCAA2D;AAC3D,+DAA2D;AAC3D,mCAA+B;AAC/B,yCAAqD;AACrD,+CAA2C;AAC3C,+CAA2C;AAC3C,yCAAqC;AACrC,iDAA6C;AAmB7C,qCAAiC;AAOpB,QAAA,SAAS,GAiBlB;IACF,SAAS,EAAT,qBAAS;IACT,KAAK,EAAL,aAAK;IACL,QAAQ,EAAR,mBAAQ;IACR,OAAO,EAAP,iBAAO;IACP,mBAAmB,EAAnB,yCAAmB;IACnB,cAAc,EAAE,aAAK;IACrB,QAAQ,EAAR,mBAAQ;IACR,cAAc,EAAd,yBAAc;IACd,WAAW,EAAX,yBAAW;IACX,WAAW,EAAX,yBAAW;IACX,QAAQ,EAAR,mBAAQ;IACR,YAAY,EAAZ,2BAAY;IACZ,SAAS,EAAE,mBAAQ;IACnB,OAAO,EAAP,iBAAO;IACP,aAAa,EAAb,uBAAa;IACb,eAAe,EAAE,eAAM;CACxB,CAAA;AAEY,QAAA,kBAAkB,GAAG;IAChC,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE,SAAS;IACf,uBAAuB,EAAE,qBAAqB;IAC9C,KAAK,EAAE,gBAAgB;IACvB,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,aAAa;IAC7B,eAAe,EAAE,cAAc;IAC/B,WAAW,EAAE,UAAU;IACvB,YAAY,EAAE,WAAW;IACzB,gBAAgB,EAAE,UAAU;IAC5B,MAAM,EAAE,iBAAiB;CACkD,CAAA"}

package/lib/resolvers/index.d.ts

@@ -14,7 +14,7 @@ declare const resolvers: {
         type: (flourish: import("../model/LeadFlourish").LeadFlourish) => string;
         id: (flourish: import("../model/LeadFlourish").LeadFlourish) => string | null;
         description: (flourish: import("../model/LeadFlourish").LeadFlourish) => string;
-        fallbackImage: (flourish: import("../model/LeadFlourish").LeadFlourish) => Promise<import("../model/FlourishSource").FlourishSource>;
+        fallbackImage: (flourish: import("../model/LeadFlourish").LeadFlourish) => Promise<import("../model/FlourishSource").FlourishSource | null>;
     };
     FlourishSource: {
         id: (parent: import("../model/FlourishSource").FlourishSource) => string;
@@ -290,7 +290,6 @@ declare const resolvers: {
     MainImage: import("../generated").ImageSetResolvers;
     Caption: import("../generated").CaptionResolvers;
     Accessibility: import("../generated").AccessibilityResolvers;
-    FlourishFallback: import("../generated").FlourishFallbackResolvers;
     AuthorReference: import("../generated").AuthorReferenceResolvers;
     Picture: {
         __resolveType: import("../generated").TypeResolveFn<"PictureFullBleed" | "PictureInline" | "PictureStandard", import("../model/Picture").Picture, import("..").QueryContext>;

package/lib/resolvers/leadFlourish.d.ts

@@ -3,7 +3,7 @@ declare const resolvers: {
         type: (flourish: import("../model/LeadFlourish").LeadFlourish) => string;
         id: (flourish: import("../model/LeadFlourish").LeadFlourish) => string | null;
         description: (flourish: import("../model/LeadFlourish").LeadFlourish) => string;
-        fallbackImage: (flourish: import("../model/LeadFlourish").LeadFlourish) => Promise<import("../model/FlourishSource").FlourishSource>;
+        fallbackImage: (flourish: import("../model/LeadFlourish").LeadFlourish) => Promise<import("../model/FlourishSource").FlourishSource | null>;
     };
     FlourishSource: {
         id: (parent: import("../model/FlourishSource").FlourishSource) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/generated/index.ts

@@ -694,20 +694,11 @@ export type Design = {
 
 export type Flourish = Reference & {
   /** The fallback image to be used if the flourish graphics cannot be loaded. */
-  readonly fallbackImage?: Maybe<FlourishFallback>;
+  readonly fallbackImage?: Maybe<FlourishSource>;
   /** The type of the reference, eg. 'flourish'. */
   readonly type: Scalars['String']['output'];
 };
 
-export type FlourishFallback = {
-  /** The height in pixels of the fallback image. */
-  readonly height?: Maybe<Scalars['Int']['output']>;
-  /** The url of the fallback image. */
-  readonly url?: Maybe<Scalars['String']['output']>;
-  /** The width in pixels of the fallback image. */
-  readonly width?: Maybe<Scalars['Int']['output']>;
-};
-
 export type FlourishSource = {
   /** The format of the source, eg. 'standard'. */
   readonly format: Scalars['ImageFormat']['output'];
@@ -1075,7 +1066,7 @@ export type LayoutImage = Reference & {
 export type LeadFlourish = {
   /** The description of the Flourish chart. */
   readonly description?: Maybe<Scalars['String']['output']>;
-  readonly fallbackImage: FlourishSource;
+  readonly fallbackImage?: Maybe<FlourishSource>;
   /** The id of the Flourish chart. */
   readonly id?: Maybe<Scalars['String']['output']>;
   /** The type of the chart, eg. 'visualisation'. */
@@ -2026,7 +2017,6 @@ export type ResolversTypes = ResolversObject<{
   Design: ResolverTypeWrapper<Design>;
   Float: ResolverTypeWrapper<Scalars['Float']['output']>;
   Flourish: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.Flourish>>;
-  FlourishFallback: ResolverTypeWrapper<FlourishFallback>;
   FlourishSource: ResolverTypeWrapper<FlourishSourceModel>;
   FollowButtonVariant: ResolverTypeWrapper<Scalars['FollowButtonVariant']['output']>;
   FullBleedTopper: ResolverTypeWrapper<TopperModel>;
@@ -2128,7 +2118,6 @@ export type ResolversParentTypes = ResolversObject<{
   Design: Design;
   Float: Scalars['Float']['output'];
   Flourish: ReferenceWithCAPIData<ContentTree.Flourish>;
-  FlourishFallback: FlourishFallback;
   FlourishSource: FlourishSourceModel;
   FollowButtonVariant: Scalars['FollowButtonVariant']['output'];
   FullBleedTopper: TopperModel;
@@ -2543,18 +2532,11 @@ export type DesignResolvers<ContextType = QueryContext, ParentType extends Resol
 }>;
 
 export type FlourishResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['Flourish'] = ResolversParentTypes['Flourish']> = ResolversObject<{
-  fallbackImage: Resolver<Maybe<ResolversTypes['FlourishFallback']>, ParentType, ContextType>;
+  fallbackImage: Resolver<Maybe<ResolversTypes['FlourishSource']>, ParentType, ContextType>;
   type: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
-export type FlourishFallbackResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['FlourishFallback'] = ResolversParentTypes['FlourishFallback']> = ResolversObject<{
-  height: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
-  url: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  width: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-}>;
-
 export type FlourishSourceResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['FlourishSource'] = ResolversParentTypes['FlourishSource']> = ResolversObject<{
   format: Resolver<ResolversTypes['ImageFormat'], ParentType, ContextType>;
   height: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
@@ -2769,7 +2751,7 @@ export type LayoutImageResolvers<ContextType = QueryContext, ParentType extends
 
 export type LeadFlourishResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['LeadFlourish'] = ResolversParentTypes['LeadFlourish']> = ResolversObject<{
   description: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  fallbackImage: Resolver<ResolversTypes['FlourishSource'], ParentType, ContextType>;
+  fallbackImage: Resolver<Maybe<ResolversTypes['FlourishSource']>, ParentType, ContextType>;
   id: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   type: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -3259,7 +3241,6 @@ export type Resolvers<ContextType = QueryContext> = ResolversObject<{
   DeepPortraitTopper: DeepPortraitTopperResolvers<ContextType>;
   Design: DesignResolvers<ContextType>;
   Flourish: FlourishResolvers<ContextType>;
-  FlourishFallback: FlourishFallbackResolvers<ContextType>;
   FlourishSource: FlourishSourceResolvers<ContextType>;
   FollowButtonVariant: GraphQLScalarType;
   FullBleedTopper: FullBleedTopperResolvers<ContextType>;

package/src/model/FlourishSource.test.ts

@@ -45,7 +45,7 @@ describe('FlourishSource', () => {
 
   it('should return the correct flourishUrl', () => {
     expect(flourishSource.flourishUrl()).toBe(
-      'https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=5717196'
+      'https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=952866'
     )
   })
 
@@ -70,9 +70,9 @@ describe('FlourishSource', () => {
     expect(decodeURIComponent(url)).toMatch(flourishImageUrlRegex)
   })
 
-  it('should bust the cache of the fallback image every five minutes', async () => {
-    const oldCacheBuster = '5717196'
-    const newCacheBuster = '5717197'
+  it('should bust the cache of the fallback image every thirty minutes', async () => {
+    const oldCacheBuster = '952866'
+    const newCacheBuster = '952867'
 
     expect(flourishSource.flourishUrl()).toBe(
       `https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=${oldCacheBuster}`
@@ -85,7 +85,7 @@ describe('FlourishSource', () => {
     )
 
     newFlourishSource = new FlourishSource(mockFlourishData, context)
-    jest.spyOn(Date, 'now').mockImplementation(() => 1715159100000) // 8 May 2024 09:05:00
+    jest.spyOn(Date, 'now').mockImplementation(() => 1715160840000) // 8 May 2024 09:34:00
     expect(newFlourishSource.flourishUrl()).toBe(
       `https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=${newCacheBuster}`
     )