@financial-times/cp-content-pipeline-schema 2.10.0 → 2.10.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.10.2](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.10.1...cp-content-pipeline-schema-v2.10.2) (2024-06-04)
+
+
+### Bug Fixes
+
+* recursively get PrefixingKeyValueCache prefixes ([bd68a64](https://github.com/Financial-Times/cp-content-pipeline/commit/bd68a643357cdfcf7ed79342efcfdab18487e331))
+
+## [2.10.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.10.0...cp-content-pipeline-schema-v2.10.1) (2024-06-03)
+
+
+### Reverts
+
+* don't use package.json exports for schema ([d73f6b2](https://github.com/Financial-Times/cp-content-pipeline/commit/d73f6b2600e3c01b258fccf75923e0c2ef155f5c))
+
 ## [2.10.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.9.2...cp-content-pipeline-schema-v2.10.0) (2024-05-28)
 
 

package/lib/datasources/capi.d.ts

@@ -14,4 +14,5 @@ export declare class CapiDataSource extends InstrumentedRESTDataSource {
     willSendRequest(path: string, request: AugmentedRequest): void;
     getContent(uuid: string, packageContainer?: CapiResponse): Promise<CapiResponse>;
     getPerson(uuid: string): Promise<CapiPerson>;
+    getHTTPCacheKeyForContent(uuid: string): Promise<string>;
 }

package/lib/datasources/capi.js

@@ -4,6 +4,13 @@ exports.CapiDataSource = void 0;
 const CapiResponse_1 = require("../model/CapiResponse");
 const instrumented_1 = require("./instrumented");
 const REQUEST_TIMEOUT = 5000; // 5 seconds
+const isPrefixing = (cache) => 'prefix' in cache;
+function getWrappedCacheKey(cache) {
+    if (isPrefixing(cache)) {
+        return getWrappedCacheKey(cache['wrapped']) + cache['prefix'];
+    }
+    return '';
+}
 class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
@@ -42,6 +49,16 @@ class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
             cacheOptions: { ttl: this.peopleCacheTTL },
         });
     }
+    // replicates the logic implicit in PrefixingKeyValueCache to
+    // construct a cache key for an article used to purge Redis
+    async getHTTPCacheKeyForContent(uuid) {
+        const dummyRequest = {
+            params: new URLSearchParams(),
+            headers: {},
+        };
+        const cacheKey = this.cacheKeyFor(await this.resolveURL(`internalcontent/${uuid}`, dummyRequest));
+        return `${getWrappedCacheKey(this.httpCache['keyValueCache'])}${cacheKey}`;
+    }
 }
 exports.CapiDataSource = CapiDataSource;
 //# sourceMappingURL=capi.js.map

package/lib/datasources/capi.js.map

@@ -1 +1 @@
-{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AACpD,iDAA2D;AAI3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,cAAe,SAAQ,yCAA0B;IAA9D;;QACE,YAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,uBAAuB,CAAA;QACzD,YAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;QACxC,oBAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC7C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACzC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,UAAU;QACnC,mBAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB;YAC3C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACxC,CAAC,CAAC,GAAG,CAAA,CAAC,aAAa;QAErB,sBAAiB,GAAG,QAAQ,CAAA;QAE5B,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IAsChE,CAAC;IAlCU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAAY,EACZ,gBAA+B;QAE/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,EAAE;YACxD,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE;SAC5C,CAAC,CAAA;QACF,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAA;QACxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAErB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;SACzB;QAED,OAAO,2BAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACvE,CAAC;IAED,SAAS,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,EAAE;YAChC,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;SAC3C,CAAC,CAAA;IACJ,CAAC;CACF;AAnDD,wCAmDC"}
+{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"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"}

package/lib/datasources/capi.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/datasources/capi.test.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@dotcom-reliability-kit/logger");
+const capi_1 = require("./capi");
+const CapiResponse_1 = require("../model/CapiResponse");
+const logger = new logger_1.Logger();
+const metrics = { count: jest.fn() };
+describe('CapiDataSource', () => {
+    describe('cache keys', () => {
+        it('should return the same cache key that it actually stored in the cache', async () => {
+            const id = '00000000-0000-0000-0000-000000000000';
+            const cache = {
+                get: jest.fn(),
+                set: jest.fn(),
+                delete: jest.fn(),
+            };
+            const capi = new capi_1.CapiDataSource({
+                cache,
+                context: {
+                    versions: { api: '1.0.0', schema: '1.0.0' },
+                    logger,
+                    metrics,
+                },
+            });
+            jest.spyOn(global, 'fetch').mockResolvedValue(new Response(JSON.stringify({ id }), {
+                headers: new Headers([['content-type', 'application/json']]),
+            }));
+            jest
+                .spyOn(CapiResponse_1.CapiResponse, 'fromJSON')
+                .mockImplementation((content, context) => new CapiResponse_1.CapiResponse(content, context));
+            await capi.getContent(id);
+            expect(cache.set).toBeCalled();
+            await expect(capi.getHTTPCacheKeyForContent(id)).resolves.toBe(cache.set.mock.lastCall?.[0]);
+        });
+    });
+    afterAll(() => {
+        jest.resetAllMocks();
+    });
+});
+//# sourceMappingURL=capi.test.js.map

package/lib/datasources/capi.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"capi.test.js","sourceRoot":"","sources":["../../src/datasources/capi.test.ts"],"names":[],"mappings":";;AAAA,2DAAuD;AACvD,iCAAuC;AAGvC,wDAAoD;AAGpD,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;AAC3B,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAA;AAEpC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,EAAE,GAAG,sCAAsC,CAAA;YACjD,MAAM,KAAK,GAAG;gBACZ,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;gBACd,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;gBACd,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;aACM,CAAA;YACzB,MAAM,IAAI,GAAG,IAAI,qBAAc,CAAC;gBAC9B,KAAK;gBACL,OAAO,EAAE;oBACP,QAAQ,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;oBAC3C,MAAM;oBACN,OAAO;iBACmB;aAC7B,CAAC,CAAA;YAEF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,iBAAiB,CAC3C,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;gBACnC,OAAO,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAC;aAC7D,CAAC,CACH,CAAA;YAED,IAAI;iBACD,KAAK,CAAC,2BAAY,EAAE,UAAU,CAAC;iBAC/B,kBAAkB,CACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CACnB,IAAI,2BAAY,CAAC,OAA6B,EAAE,OAAO,CAAC,CAC3D,CAAA;YAEH,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YAEzB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,CAAA;YAC9B,MAAM,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAC5D,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAC7B,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,GAAG,EAAE;QACZ,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

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

@@ -1,11 +1,50 @@
-export declare const articleSchema: import("zod").ZodObject<{
-    id: import("zod").ZodString;
-    type: import("zod").ZodOptional<import("zod").ZodString>;
-    types: import("zod").ZodArray<import("zod").ZodString, "many">;
-    standfirst: import("zod").ZodOptional<import("zod").ZodString>;
+export declare const articleSchema: import("zod").ZodObject<import("zod").objectUtil.extendShape<import("zod").objectUtil.extendShape<Pick<{
     title: import("zod").ZodString;
-    publishedDate: import("zod").ZodString;
-    annotations: import("zod").ZodArray<import("zod").ZodObject<{
+    standfirst: import("zod").ZodOptional<import("zod").ZodString>;
+    byline: import("zod").ZodOptional<import("zod").ZodString>;
+    bodyXML: import("zod").ZodString;
+    summary: import("zod").ZodObject<{
+        bodyXML: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        bodyXML: string;
+    }, {
+        bodyXML: string;
+    }>;
+    alternativeTitles: import("zod").ZodOptional<import("zod").ZodObject<{
+        promotionalTitle: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        promotionalTitle: string;
+    }, {
+        promotionalTitle: string;
+    }>>;
+    alternativeStandfirsts: import("zod").ZodOptional<import("zod").ZodObject<{
+        promotionalStandfirst: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        promotionalStandfirst?: string | undefined;
+    }, {
+        promotionalStandfirst?: string | undefined;
+    }>>;
+    pinnedPosts: import("zod").ZodArray<import("zod").ZodString, "many">;
+    contains: import("zod").ZodArray<import("zod").ZodObject<{
+        id: import("zod").ZodString;
+        apiUrl: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        id: string;
+        apiUrl: string;
+    }, {
+        id: string;
+        apiUrl: string;
+    }>, "many">;
+    design: import("zod").ZodObject<{
+        theme: import("zod").ZodUnion<[import("zod").ZodLiteral<"special-report">, import("zod").ZodLiteral<"extra">, import("zod").ZodLiteral<"basic">, import("zod").ZodLiteral<"extra-wide">]>;
+    }, "strip", import("zod").ZodTypeAny, {
+        theme: "special-report" | "extra" | "basic" | "extra-wide";
+    }, {
+        theme: "special-report" | "extra" | "basic" | "extra-wide";
+    }>;
+}, "standfirst" | "title" | "byline" | "bodyXML" | "alternativeTitles" | "alternativeStandfirsts">, Pick<{
+    id: import("zod").ZodString;
+    annotations: import("zod").ZodArray<import("zod").ZodObject<import("zod").objectUtil.extendShape<{
         id: import("zod").ZodString;
         apiUrl: import("zod").ZodString;
         directType: import("zod").ZodString;
@@ -13,8 +52,9 @@ export declare const articleSchema: import("zod").ZodObject<{
         type: import("zod").ZodOptional<import("zod").ZodString>;
         types: import("zod").ZodArray<import("zod").ZodString, "many">;
         headshot: import("zod").ZodOptional<import("zod").ZodString>;
+    }, {
         predicate: import("zod").ZodString;
-    }, "strip", import("zod").ZodTypeAny, {
+    }>, "strip", import("zod").ZodTypeAny, {
         id: string;
         apiUrl: string;
         directType: string;
@@ -35,6 +75,8 @@ export declare const articleSchema: import("zod").ZodObject<{
     }>, "many">;
     webUrl: import("zod").ZodOptional<import("zod").ZodString>;
     canonicalWebUrl: import("zod").ZodOptional<import("zod").ZodString>;
+    type: import("zod").ZodOptional<import("zod").ZodString>;
+    types: import("zod").ZodArray<import("zod").ZodString, "many">;
     standout: import("zod").ZodOptional<import("zod").ZodObject<{
         editorsChoice: import("zod").ZodBoolean;
         exclusive: import("zod").ZodBoolean;
@@ -48,7 +90,9 @@ export declare const articleSchema: import("zod").ZodObject<{
         exclusive: boolean;
         scoop: boolean;
     }>>;
+    publishedDate: import("zod").ZodString;
     firstPublishedDate: import("zod").ZodString;
+    realtime: import("zod").ZodBoolean;
     editorialDesk: import("zod").ZodOptional<import("zod").ZodString>;
     accessLevel: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"premium">, import("zod").ZodLiteral<"subscribed">, import("zod").ZodLiteral<"registered">, import("zod").ZodLiteral<"free">]>>;
     canBeSyndicated: import("zod").ZodUnion<[import("zod").ZodLiteral<"yes">, import("zod").ZodLiteral<"no">, import("zod").ZodLiteral<"verify">, import("zod").ZodLiteral<"withContributorPayment">, import("zod").ZodLiteral<"unknown">]>;
@@ -95,22 +139,17 @@ export declare const articleSchema: import("zod").ZodObject<{
         id: string;
         apiUrl: string;
     }>, "many">>;
-    byline: import("zod").ZodOptional<import("zod").ZodString>;
-    bodyXML: import("zod").ZodString;
-    alternativeTitles: import("zod").ZodOptional<import("zod").ZodObject<{
-        promotionalTitle: import("zod").ZodString;
+    tableOfContents: import("zod").ZodOptional<import("zod").ZodObject<{
+        labelType: import("zod").ZodString;
+        sequence: import("zod").ZodString;
     }, "strip", import("zod").ZodTypeAny, {
-        promotionalTitle: string;
+        labelType: string;
+        sequence: string;
     }, {
-        promotionalTitle: string;
-    }>>;
-    alternativeStandfirsts: import("zod").ZodOptional<import("zod").ZodObject<{
-        promotionalStandfirst: import("zod").ZodOptional<import("zod").ZodString>;
-    }, "strip", import("zod").ZodTypeAny, {
-        promotionalStandfirst?: string | undefined;
-    }, {
-        promotionalStandfirst?: string | undefined;
+        labelType: string;
+        sequence: string;
     }>>;
+}, "id" | "type" | "types" | "publishedDate" | "annotations" | "webUrl" | "canonicalWebUrl" | "standout" | "firstPublishedDate" | "editorialDesk" | "accessLevel" | "canBeSyndicated" | "canBeDistributed" | "topper" | "comments" | "containedIn">>, Pick<{
     mainImage: import("zod").ZodOptional<import("zod").ZodDiscriminatedUnion<"type", [import("zod").ZodObject<{
         id: import("zod").ZodString;
         type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/ImageSet">;
@@ -161,8 +200,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth?: string | undefined;
             pixelWidth?: number | undefined;
             pixelHeight?: number | undefined;
-        }>, import("zod").ZodObject<{
+        }>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
             id: import("zod").ZodString;
+            type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Image">;
             format: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"standardInline">, import("zod").ZodLiteral<"mobile">, import("zod").ZodLiteral<"desktop">, import("zod").ZodLiteral<"standard">, import("zod").ZodLiteral<"square">, import("zod").ZodLiteral<"ftEditSquare">, import("zod").ZodLiteral<"wide">, import("zod").ZodLiteral<"portrait">, import("zod").ZodLiteral<"landscape">]>>;
             title: import("zod").ZodOptional<import("zod").ZodString>;
             description: import("zod").ZodOptional<import("zod").ZodString>;
@@ -178,8 +218,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth: import("zod").ZodOptional<import("zod").ZodString>;
             pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
             pixelHeight: import("zod").ZodOptional<import("zod").ZodNumber>;
+        }, {
             type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Graphic">;
-        }, "strip", import("zod").ZodTypeAny, {
+        }>, "strip", import("zod").ZodTypeAny, {
             id: string;
             type: "http://www.ft.com/ontology/content/Graphic";
             binaryUrl: string;
@@ -320,8 +361,9 @@ export declare const articleSchema: import("zod").ZodObject<{
         maxDisplayWidth?: string | undefined;
         pixelWidth?: number | undefined;
         pixelHeight?: number | undefined;
-    }>, import("zod").ZodObject<{
+    }>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
         id: import("zod").ZodString;
+        type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Image">;
         format: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"standardInline">, import("zod").ZodLiteral<"mobile">, import("zod").ZodLiteral<"desktop">, import("zod").ZodLiteral<"standard">, import("zod").ZodLiteral<"square">, import("zod").ZodLiteral<"ftEditSquare">, import("zod").ZodLiteral<"wide">, import("zod").ZodLiteral<"portrait">, import("zod").ZodLiteral<"landscape">]>>;
         title: import("zod").ZodOptional<import("zod").ZodString>;
         description: import("zod").ZodOptional<import("zod").ZodString>;
@@ -337,8 +379,9 @@ export declare const articleSchema: import("zod").ZodObject<{
         maxDisplayWidth: import("zod").ZodOptional<import("zod").ZodString>;
         pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
         pixelHeight: import("zod").ZodOptional<import("zod").ZodNumber>;
+    }, {
         type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Graphic">;
-    }, "strip", import("zod").ZodTypeAny, {
+    }>, "strip", import("zod").ZodTypeAny, {
         id: string;
         type: "http://www.ft.com/ontology/content/Graphic";
         binaryUrl: string;
@@ -416,8 +459,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth?: string | undefined;
             pixelWidth?: number | undefined;
             pixelHeight?: number | undefined;
-        }>, import("zod").ZodObject<{
+        }>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
             id: import("zod").ZodString;
+            type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Image">;
             format: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"standardInline">, import("zod").ZodLiteral<"mobile">, import("zod").ZodLiteral<"desktop">, import("zod").ZodLiteral<"standard">, import("zod").ZodLiteral<"square">, import("zod").ZodLiteral<"ftEditSquare">, import("zod").ZodLiteral<"wide">, import("zod").ZodLiteral<"portrait">, import("zod").ZodLiteral<"landscape">]>>;
             title: import("zod").ZodOptional<import("zod").ZodString>;
             description: import("zod").ZodOptional<import("zod").ZodString>;
@@ -433,8 +477,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth: import("zod").ZodOptional<import("zod").ZodString>;
             pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
             pixelHeight: import("zod").ZodOptional<import("zod").ZodNumber>;
+        }, {
             type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Graphic">;
-        }, "strip", import("zod").ZodTypeAny, {
+        }>, "strip", import("zod").ZodTypeAny, {
             id: string;
             type: "http://www.ft.com/ontology/content/Graphic";
             binaryUrl: string;
@@ -672,8 +717,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth?: string | undefined;
             pixelWidth?: number | undefined;
             pixelHeight?: number | undefined;
-        }>, import("zod").ZodObject<{
+        }>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
             id: import("zod").ZodString;
+            type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Image">;
             format: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"standardInline">, import("zod").ZodLiteral<"mobile">, import("zod").ZodLiteral<"desktop">, import("zod").ZodLiteral<"standard">, import("zod").ZodLiteral<"square">, import("zod").ZodLiteral<"ftEditSquare">, import("zod").ZodLiteral<"wide">, import("zod").ZodLiteral<"portrait">, import("zod").ZodLiteral<"landscape">]>>;
             title: import("zod").ZodOptional<import("zod").ZodString>;
             description: import("zod").ZodOptional<import("zod").ZodString>;
@@ -689,8 +735,9 @@ export declare const articleSchema: import("zod").ZodObject<{
             maxDisplayWidth: import("zod").ZodOptional<import("zod").ZodString>;
             pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
             pixelHeight: import("zod").ZodOptional<import("zod").ZodNumber>;
+        }, {
             type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Graphic">;
-        }, "strip", import("zod").ZodTypeAny, {
+        }>, "strip", import("zod").ZodTypeAny, {
             id: string;
             type: "http://www.ft.com/ontology/content/Graphic";
             binaryUrl: string;
@@ -801,20 +848,20 @@ export declare const articleSchema: import("zod").ZodObject<{
                 pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
                 videoCodec: import("zod").ZodOptional<import("zod").ZodString>;
             }, "strip", import("zod").ZodTypeAny, {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }, {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }>, "many">;
             poster: import("zod").ZodOptional<import("zod").ZodObject<{
@@ -867,8 +914,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                     maxDisplayWidth?: string | undefined;
                     pixelWidth?: number | undefined;
                     pixelHeight?: number | undefined;
-                }>, import("zod").ZodObject<{
+                }>, import("zod").ZodObject<import("zod").objectUtil.extendShape<{
                     id: import("zod").ZodString;
+                    type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Image">;
                     format: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"standardInline">, import("zod").ZodLiteral<"mobile">, import("zod").ZodLiteral<"desktop">, import("zod").ZodLiteral<"standard">, import("zod").ZodLiteral<"square">, import("zod").ZodLiteral<"ftEditSquare">, import("zod").ZodLiteral<"wide">, import("zod").ZodLiteral<"portrait">, import("zod").ZodLiteral<"landscape">]>>;
                     title: import("zod").ZodOptional<import("zod").ZodString>;
                     description: import("zod").ZodOptional<import("zod").ZodString>;
@@ -884,8 +932,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                     maxDisplayWidth: import("zod").ZodOptional<import("zod").ZodString>;
                     pixelWidth: import("zod").ZodOptional<import("zod").ZodNumber>;
                     pixelHeight: import("zod").ZodOptional<import("zod").ZodNumber>;
+                }, {
                     type: import("zod").ZodLiteral<"http://www.ft.com/ontology/content/Graphic">;
-                }, "strip", import("zod").ZodTypeAny, {
+                }>, "strip", import("zod").ZodTypeAny, {
                     id: string;
                     type: "http://www.ft.com/ontology/content/Graphic";
                     binaryUrl: string;
@@ -985,12 +1034,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1032,12 +1081,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1117,12 +1166,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1161,9 +1210,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
+        description?: string | undefined;
         caption?: string | undefined;
         dataCopyright?: string | undefined;
-        description?: string | undefined;
         displayTitle?: string | undefined;
         contentWarning?: string[] | undefined;
         noAudio?: boolean | undefined;
@@ -1184,12 +1233,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1228,9 +1277,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
+        description?: string | undefined;
         caption?: string | undefined;
         dataCopyright?: string | undefined;
-        description?: string | undefined;
         displayTitle?: string | undefined;
         contentWarning?: string[] | undefined;
         noAudio?: boolean | undefined;
@@ -1245,7 +1294,23 @@ export declare const articleSchema: import("zod").ZodObject<{
             transcript?: string | undefined;
         } | undefined;
     }>]>, "many">>;
-}, "strip", import("zod").ZodTypeAny, {
+    dataSource: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+        binaryUrl: import("zod").ZodString;
+        duration: import("zod").ZodNumber;
+        filesize: import("zod").ZodNumber;
+        mediaType: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        binaryUrl: string;
+        duration: number;
+        mediaType: string;
+        filesize: number;
+    }, {
+        binaryUrl: string;
+        duration: number;
+        mediaType: string;
+        filesize: number;
+    }>, "many">>;
+}, "mainImage" | "leadImages" | "alternativeImages" | "leadFlourish" | "embeds">>, "strip", import("zod").ZodTypeAny, {
     id: string;
     types: string[];
     title: string;
@@ -1455,12 +1520,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1499,9 +1564,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
+        description?: string | undefined;
         caption?: string | undefined;
         dataCopyright?: string | undefined;
-        description?: string | undefined;
         displayTitle?: string | undefined;
         contentWarning?: string[] | undefined;
         noAudio?: boolean | undefined;
@@ -1726,12 +1791,12 @@ export declare const articleSchema: import("zod").ZodObject<{
             id: string;
             type: "http://www.ft.com/ontology/content/Clip";
             dataSource: {
-                audioCodec?: string | undefined;
                 binaryUrl?: string | undefined;
+                pixelWidth?: number | undefined;
+                pixelHeight?: number | undefined;
+                audioCodec?: string | undefined;
                 duration?: number | undefined;
                 mediaType?: string | undefined;
-                pixelHeight?: number | undefined;
-                pixelWidth?: number | undefined;
                 videoCodec?: string | undefined;
             }[];
             format?: "standardInline" | "mobile" | undefined;
@@ -1770,9 +1835,9 @@ export declare const articleSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
+        description?: string | undefined;
         caption?: string | undefined;
         dataCopyright?: string | undefined;
-        description?: string | undefined;
         displayTitle?: string | undefined;
         contentWarning?: string[] | undefined;
         noAudio?: boolean | undefined;