@financial-times/cp-content-pipeline-schema 5.2.1 → 5.3.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [5.3.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v5.2.1...cp-content-pipeline-schema-v5.3.0) (2026-06-24)
+
+
+### Features
+
+* add debug resolver for Content Tree API ([f603889](https://github.com/Financial-Times/cp-content-pipeline/commit/f603889f8664d62cd59538e280d345dedca5f353))
+* add rest Apollo ContentTreeApiDataSource ([e11117e](https://github.com/Financial-Times/cp-content-pipeline/commit/e11117eb86eef04f2cd3749ac6e4a7913c926e6e))
+* call /content-tree in Query.content ([a126760](https://github.com/Financial-Times/cp-content-pipeline/commit/a1267600b3a4bfbd1b7e81a3f2b1485bdc378bca))
+* configure Content Tree API specific timeout ([bfc00e6](https://github.com/Financial-Times/cp-content-pipeline/commit/bfc00e6dc309182a5fd02bb4b3e5b0bdff660713))
+* do not try to convert bodyTree to AST ([e7625fd](https://github.com/Financial-Times/cp-content-pipeline/commit/e7625fde484fe8187a58f67d388dde2cf831a93f))
+* handle /content-tree request errors ([cb2d2d1](https://github.com/Financial-Times/cp-content-pipeline/commit/cb2d2d1acc8c8195ff5856b2fff9f576205a984f))
+* mvp model for content with a bodyTree ([2b4aef3](https://github.com/Financial-Times/cp-content-pipeline/commit/2b4aef3504e3122153acac864485ef3262a683bf))
+* nested content requests call /content-tree ([0bd88ac](https://github.com/Financial-Times/cp-content-pipeline/commit/0bd88ac65cedafc6325d1ee18df7caf32541dfaf))
+* use ContentWithBodyTree model ([c88c023](https://github.com/Financial-Times/cp-content-pipeline/commit/c88c023641b928b1de6fdfb7505bcd0950168539))
+* useContentTree api query string param ([fe99a8f](https://github.com/Financial-Times/cp-content-pipeline/commit/fe99a8f826a9cefde12f71771e055abd54f2b112))
+
+
+### Bug Fixes
+
+* add bodyTree as RichTextSource ([462bae8](https://github.com/Financial-Times/cp-content-pipeline/commit/462bae85bb68e97ac34e9c7baf14f02c2da50bd9))
+* derive placeholder and podcast types ([4634657](https://github.com/Financial-Times/cp-content-pipeline/commit/4634657066028b7f573152bdac7024684e7ca8ca))
+* handle bodyTree.children as null ([d31597e](https://github.com/Financial-Times/cp-content-pipeline/commit/d31597e854f36e444fefbbaae4758892969f1634))
+* teaser title override needs types property to resolve ([42d700c](https://github.com/Financial-Times/cp-content-pipeline/commit/42d700c1741c289bd25d9e38698cf28acae1ecd6))
+* teaserMetadata needs types property to resolve ([940071e](https://github.com/Financial-Times/cp-content-pipeline/commit/940071ecd00f3e60e9b6ecf2eb2d2abf82a75659))
+
 ## [5.2.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v5.2.0...cp-content-pipeline-schema-v5.2.1) (2026-06-23)
 
 

package/lib/datasources/base-capi.d.ts

@@ -2,8 +2,9 @@ import { AugmentedRequest } from '@apollo/datasource-rest';
 import { InstrumentedRESTDataSource } from './instrumented';
 export declare class BaseCapiDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
-    capiKey: string;
     articleCacheTTL: number;
+    get requestTimeout(): number;
+    get capiKey(): string;
     get cachePrefix(): string;
     willSendRequest(path: string, request: AugmentedRequest): void;
 }

package/lib/datasources/base-capi.js

@@ -2,21 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCapiDataSource = void 0;
 const instrumented_1 = require("./instrumented");
-const REQUEST_TIMEOUT = process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT
+const DEFAULT_REQUEST_TIMEOUT = process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT
     ? parseInt(process.env.CAPI_DATASOURCE_REQUEST_TIMEOUT)
     : 500;
 class BaseCapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
     baseURL = process.env.CAPI_URL || 'https://api-t.ft.com/';
-    capiKey = process.env.CAPI_API_KEY || '';
     articleCacheTTL = process.env.ARTICLE_CACHE_TTL
         ? parseInt(process.env.ARTICLE_CACHE_TTL)
         : 60 * 60 * 24 * 7 * 4; // 4 weeks
+    get requestTimeout() {
+        return DEFAULT_REQUEST_TIMEOUT;
+    }
+    get capiKey() {
+        return process.env.CAPI_API_KEY || '';
+    }
     get cachePrefix() {
         return 'capi';
     }
     willSendRequest(path, request) {
         super.willSendRequest(path, request);
-        request.signal = AbortSignal.timeout(REQUEST_TIMEOUT);
+        request.signal = AbortSignal.timeout(this.requestTimeout);
         request.headers['x-api-key'] = this.capiKey;
     }
 }

package/lib/datasources/base-capi.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-capi.js","sourceRoot":"","sources":["../../src/datasources/base-capi.ts"],"names":[],"mappings":";;;AACA,iDAA2D;AAE3D,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B;IACjE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;IACvD,CAAC,CAAC,GAAG,CAAA;AAEP,MAAa,kBAAmB,SAAQ,yCAA0B;IAChE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,uBAAuB,CAAA;IACzD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;IACxC,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC7C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACzC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,UAAU;IAEnC,IAAa,WAAW;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAEQ,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QACrD,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7C,CAAC;CACF;AAjBD,gDAiBC"}
+{"version":3,"file":"base-capi.js","sourceRoot":"","sources":["../../src/datasources/base-capi.ts"],"names":[],"mappings":";;;AACA,iDAA2D;AAE3D,MAAM,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B;IACzE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;IACvD,CAAC,CAAC,GAAG,CAAA;AAEP,MAAa,kBAAmB,SAAQ,yCAA0B;IAChE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,uBAAuB,CAAA;IACzD,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC7C,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QACzC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,UAAU;IAEnC,IAAI,cAAc;QAChB,OAAO,uBAAuB,CAAA;IAChC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;IACvC,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,MAAM,CAAA;IACf,CAAC;IAEQ,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACzD,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7C,CAAC;CACF;AAxBD,gDAwBC"}

package/lib/datasources/content-helpers.d.ts

@@ -0,0 +1,3 @@
+import type { QueryContext } from '..';
+import { Content } from '../model/Content';
+export declare function getContentForRequest(context: QueryContext, uuid: string, packageContainer?: Content): Promise<Content>;

package/lib/datasources/content-helpers.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContentForRequest = getContentForRequest;
+async function getContentForRequest(context, uuid, packageContainer) {
+    if (context.useContentTree) {
+        return context.dataSources.contentTree.getContent(uuid, packageContainer);
+    }
+    return context.dataSources.capi.getContent(uuid, packageContainer);
+}
+//# sourceMappingURL=content-helpers.js.map

package/lib/datasources/content-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-helpers.js","sourceRoot":"","sources":["../../src/datasources/content-helpers.ts"],"names":[],"mappings":";;AAGA,oDAUC;AAVM,KAAK,UAAU,oBAAoB,CACxC,OAAqB,EACrB,IAAY,EACZ,gBAA0B;IAE1B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAC3E,CAAC;IAED,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;AACpE,CAAC"}

package/lib/datasources/content-helpers.test.d.ts

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

package/lib/datasources/content-helpers.test.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const content_helpers_1 = require("./content-helpers");
+const uuid = '00000000-0000-0000-0000-000000000000';
+describe('getContentForRequest', () => {
+    beforeEach(() => {
+        jest.restoreAllMocks();
+    });
+    it('routes to internal content api when useContentTree is false', async () => {
+        const packageContainer = {};
+        const content = {};
+        const context = {
+            useContentTree: false,
+            dataSources: {
+                capi: {
+                    getContent: jest.fn().mockResolvedValue(content),
+                },
+                contentTree: {
+                    getContent: jest.fn(),
+                },
+            },
+        };
+        await expect((0, content_helpers_1.getContentForRequest)(context, uuid, packageContainer)).resolves.toBe(content);
+        expect(context.dataSources.capi.getContent).toHaveBeenCalledWith(uuid, packageContainer);
+        expect(context.dataSources.contentTree.getContent).not.toHaveBeenCalled();
+    });
+    it('routes to content tree api when useContentTree is true', async () => {
+        const packageContainer = {};
+        const content = {};
+        const context = {
+            useContentTree: true,
+            dataSources: {
+                capi: {
+                    getContent: jest.fn(),
+                },
+                contentTree: {
+                    getContent: jest.fn().mockResolvedValue(content),
+                },
+            },
+        };
+        await expect((0, content_helpers_1.getContentForRequest)(context, uuid, packageContainer)).resolves.toBe(content);
+        expect(context.dataSources.contentTree.getContent).toHaveBeenCalledWith(uuid, packageContainer);
+        expect(context.dataSources.capi.getContent).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=content-helpers.test.js.map

package/lib/datasources/content-helpers.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-helpers.test.js","sourceRoot":"","sources":["../../src/datasources/content-helpers.test.ts"],"names":[],"mappings":";;AAEA,uDAAwD;AAExD,MAAM,IAAI,GAAG,sCAAsC,CAAA;AAEnD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,eAAe,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,gBAAgB,GAAG,EAAa,CAAA;QACtC,MAAM,OAAO,GAAG,EAAa,CAAA;QAC7B,MAAM,OAAO,GAAG;YACd,cAAc,EAAE,KAAK;YACrB,WAAW,EAAE;gBACX,IAAI,EAAE;oBACJ,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;iBACjD;gBACD,WAAW,EAAE;oBACX,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;iBACtB;aACF;SACyB,CAAA;QAE5B,MAAM,MAAM,CACV,IAAA,sCAAoB,EAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CACtD,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAExB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAC9D,IAAI,EACJ,gBAAgB,CACjB,CAAA;QACD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC3E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,gBAAgB,GAAG,EAAa,CAAA;QACtC,MAAM,OAAO,GAAG,EAAa,CAAA;QAC7B,MAAM,OAAO,GAAG;YACd,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE;gBACX,IAAI,EAAE;oBACJ,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;iBACtB;gBACD,WAAW,EAAE;oBACX,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;iBACjD;aACF;SACyB,CAAA;QAE5B,MAAM,MAAM,CACV,IAAA,sCAAoB,EAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,CACtD,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAExB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,oBAAoB,CACrE,IAAI,EACJ,gBAAgB,CACjB,CAAA;QACD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA;IACpE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/datasources/content-tree.d.ts

@@ -0,0 +1,9 @@
+import { Content } from '../model/Content';
+import { BaseCapiDataSource } from './base-capi';
+export declare class ContentTreeDataSource extends BaseCapiDataSource {
+    get requestTimeout(): number;
+    get backendSystemCode(): string;
+    get capiKey(): string;
+    getContent(uuid: string, packageContainer?: Content): Promise<Content>;
+    getHTTPCacheKeyForContent(uuid: string): Promise<string>;
+}

package/lib/datasources/content-tree.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContentTreeDataSource = void 0;
+const ContentWithBodyTree_1 = require("../model/ContentWithBodyTree");
+const base_capi_1 = require("./base-capi");
+const isPrefixing = (cache) => 'prefix' in cache;
+function getWrappedCacheKey(cache) {
+    if (isPrefixing(cache)) {
+        return getWrappedCacheKey(cache['wrapped']) + cache['prefix'];
+    }
+    return '';
+}
+class ContentTreeDataSource extends base_capi_1.BaseCapiDataSource {
+    get requestTimeout() {
+        return process.env.CONTENT_TREE_DATASOURCE_REQUEST_TIMEOUT
+            ? parseInt(process.env.CONTENT_TREE_DATASOURCE_REQUEST_TIMEOUT)
+            : 1500;
+    }
+    get backendSystemCode() {
+        return 'cm-cta';
+    }
+    get capiKey() {
+        return process.env.CONTENT_TREE_API_KEY || '';
+    }
+    async getContent(uuid, packageContainer) {
+        this.context.addSurrogateKeys([
+            {
+                prefix: 'contentPipelineArticle',
+                id: uuid,
+            },
+        ]);
+        const path = `content-tree/${uuid}`;
+        const content = await this.get(path, {
+            params: {
+                includeRelations: 'true',
+                unrollContent: 'true',
+            },
+            cacheOptions: { ttl: this.articleCacheTTL },
+        });
+        this.context.contentRequestedOnce = true;
+        this.calls.push(uuid);
+        return ContentWithBodyTree_1.ContentWithBodyTree.fromContentTree(content, this.context, packageContainer);
+    }
+    async getHTTPCacheKeyForContent(uuid) {
+        const dummyRequest = {
+            params: new URLSearchParams(),
+            headers: {},
+        };
+        const cacheKey = this.cacheKeyFor(await this.resolveURL(`content-tree/${uuid}?includeRelations=true&unrollContent=true`, dummyRequest));
+        return `${getWrappedCacheKey(this.httpCache['keyValueCache'])}${cacheKey}`;
+    }
+}
+exports.ContentTreeDataSource = ContentTreeDataSource;
+//# sourceMappingURL=content-tree.js.map

package/lib/datasources/content-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-tree.js","sourceRoot":"","sources":["../../src/datasources/content-tree.ts"],"names":[],"mappings":";;;AAQA,sEAAkE;AAClE,2CAAgD;AAEhD,MAAM,WAAW,GAAG,CAAC,KAAoB,EAAmC,EAAE,CAC5E,QAAQ,IAAI,KAAK,CAAA;AAEnB,SAAS,kBAAkB,CAAC,KAAoB;IAC9C,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,EAAE,CAAA;AACX,CAAC;AAED,MAAa,qBAAsB,SAAQ,8BAAkB;IAC3D,IAAI,cAAc;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,uCAAuC;YACxD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAA;IACV,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,gBAA0B;QACvD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC5B;gBACE,MAAM,EAAE,wBAAwB;gBAChC,EAAE,EAAE,IAAI;aACT;SACF,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,gBAAgB,IAAI,EAAE,CAAA;QAEnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACnC,MAAM,EAAE;gBACN,gBAAgB,EAAE,MAAM;gBACxB,aAAa,EAAE,MAAM;aACtB;YACD,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,OAAO,yCAAmB,CAAC,eAAe,CACxC,OAAgC,EAChC,IAAI,CAAC,OAAO,EACZ,gBAAgB,CACjB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,IAAY;QAC1C,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,IAAI,eAAe,EAAE;YAC7B,OAAO,EAAE,EAAE;SACZ,CAAA;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAC/B,MAAM,IAAI,CAAC,UAAU,CACnB,gBAAgB,IAAI,2CAA2C,EAC/D,YAAY,CACb,CACF,CAAA;QAED,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAA;IAC5E,CAAC;CACF;AAxDD,sDAwDC"}

package/lib/datasources/content-tree.test.d.ts

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

package/lib/datasources/content-tree.test.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@dotcom-reliability-kit/logger");
+const contentTreeObject_1 = require("../fixtures/contentTreeObject");
+const ContentWithBodyTree_1 = require("../model/ContentWithBodyTree");
+const capi_1 = require("./capi");
+const content_tree_1 = require("./content-tree");
+const logger = new logger_1.Logger();
+const metrics = { count: jest.fn(), aggregate: jest.fn() };
+const cache = {
+    get: jest.fn(),
+    set: jest.fn(),
+    delete: jest.fn(),
+};
+const context = {
+    versions: { api: '1.0.0', schema: '1.0.0' },
+    logger,
+    metrics,
+    addSurrogateKeys: jest.fn(),
+};
+const contentTree = new content_tree_1.ContentTreeDataSource({
+    cache,
+    context,
+});
+const capi = new capi_1.CapiDataSource({
+    cache,
+    context,
+});
+const id = '00000000-0000-0000-0000-000000000000';
+const fetchResult = {
+    parsedBody: {
+        ...contentTreeObject_1.baseContentTreeObject,
+        id: `http://www.ft.com/thing/${id}`,
+    },
+};
+describe('ContentTreeDataSource', () => {
+    beforeAll(() => {
+        jest.spyOn(global, 'fetch').mockImplementation(async () => new Response(JSON.stringify({
+            ...contentTreeObject_1.baseContentTreeObject,
+            id: `http://www.ft.com/thing/${id}`,
+        }), {
+            headers: new Headers([['content-type', 'application/json']]),
+        }));
+    });
+    beforeEach(() => {
+        jest.clearAllMocks();
+        delete context.contentRequestedOnce;
+        delete context.requestId;
+    });
+    describe('cache keys', () => {
+        it('should return the same cache key that it actually stored in the cache', async () => {
+            await contentTree.getContent(id);
+            expect(cache.set).toBeCalled();
+            await expect(contentTree.getHTTPCacheKeyForContent(id)).resolves.toBe(cache.set.mock.lastCall?.[0]);
+        });
+        it('should use a different cache key from internal content for the same uuid', async () => {
+            const contentTreeCacheKey = await contentTree.getHTTPCacheKeyForContent(id);
+            const capiCacheKey = await capi.getHTTPCacheKeyForContent(id);
+            expect(capiCacheKey).toBe(`capi:httpcache:https://api-t.ft.com/internalcontent/${id}`);
+            expect(contentTreeCacheKey).toBe(`capi:httpcache:https://api-t.ft.com/content-tree/${id}?includeRelations=true&unrollContent=true`);
+        });
+    });
+    describe('error handling', () => {
+        it('should include the system code in errors', async () => {
+            ;
+            global.fetch.mockResolvedValueOnce(new Response('Errored', {
+                status: 500,
+            }));
+            await expect(contentTree.getContent(id)).rejects.toMatchObject({
+                relatesToSystems: ['cm-cta'],
+            });
+        });
+    });
+    describe('getContent', () => {
+        it('should return a ContentWithBodyTree model', async () => {
+            await expect(contentTree.getContent(id)).resolves.toBeInstanceOf(ContentWithBodyTree_1.ContentWithBodyTree);
+        });
+        it('should add the uuid to the context surrogate keys', async () => {
+            await contentTree.getContent(id);
+            expect(context.addSurrogateKeys).toBeCalledWith(expect.arrayContaining([
+                expect.objectContaining({
+                    prefix: 'contentPipelineArticle',
+                    id,
+                }),
+            ]));
+        });
+        it('should set cacheOptions ttl', async () => {
+            const fetchSpy = jest
+                .spyOn(contentTree, 'fetch')
+                .mockResolvedValue(fetchResult);
+            await contentTree.getContent(id);
+            expect(fetchSpy).toBeCalledWith(`content-tree/${id}`, {
+                params: {
+                    includeRelations: 'true',
+                    unrollContent: 'true',
+                },
+                method: 'GET',
+                cacheOptions: { ttl: contentTree.articleCacheTTL },
+            });
+            fetchSpy.mockRestore();
+        });
+        it('should fetch from "/content-tree"', async () => {
+            await contentTree.getContent(id);
+            expect(global.fetch).toBeCalledWith(`https://api-t.ft.com/content-tree/${id}?includeRelations=true&unrollContent=true`, expect.objectContaining({
+                headers: expect.objectContaining({
+                    'user-agent': 'cp-content-pipeline-api/1.0.0 cp-content-pipeline-schema/1.0.0 ',
+                    'x-api-key': '',
+                }),
+                signal: expect.any(AbortSignal),
+            }));
+        });
+        it('should include the request id on the first content request', async () => {
+            context.requestId = 'request-id';
+            await contentTree.getContent(id);
+            expect(global.fetch).toBeCalledWith(`https://api-t.ft.com/content-tree/${id}?includeRelations=true&unrollContent=true`, expect.objectContaining({
+                headers: expect.objectContaining({
+                    'x-request-id': 'request-id',
+                }),
+            }));
+        });
+        it('should not include the request id after content has already been requested once', async () => {
+            context.requestId = 'request-id';
+            await contentTree.getContent(id);
+            await contentTree.getContent(id);
+            expect(global.fetch).toHaveBeenNthCalledWith(2, `https://api-t.ft.com/content-tree/${id}?includeRelations=true&unrollContent=true`, expect.objectContaining({
+                headers: expect.not.objectContaining({
+                    'x-request-id': 'request-id',
+                }),
+            }));
+        });
+    });
+});
+//# sourceMappingURL=content-tree.test.js.map

package/lib/datasources/content-tree.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-tree.test.js","sourceRoot":"","sources":["../../src/datasources/content-tree.test.ts"],"names":[],"mappings":"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"}

package/lib/datasources/index.d.ts

@@ -1,5 +1,6 @@
 import { BaseDataSourceOptions } from './base';
 import { CapiDataSource } from './capi';
+import { ContentTreeDataSource } from './content-tree';
 import { EnrichedContentDataSource } from './enriched-content';
 import { ListsDataSource } from './lists';
 import { OrigamiImageDataSource } from './origami-image';
@@ -8,6 +9,7 @@ import { TwitterDataSource } from './twitter';
 import { URLManagementDataSource } from './url-management';
 export declare const initDataSources: (options: BaseDataSourceOptions) => {
     capi: CapiDataSource;
+    contentTree: ContentTreeDataSource;
     enrichedContent: EnrichedContentDataSource;
     lists: ListsDataSource;
     origami: OrigamiImageDataSource;

package/lib/datasources/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDataSources = void 0;
 const capi_1 = require("./capi");
+const content_tree_1 = require("./content-tree");
 const enriched_content_1 = require("./enriched-content");
 const lists_1 = require("./lists");
 const origami_image_1 = require("./origami-image");
@@ -10,6 +11,7 @@ const twitter_1 = require("./twitter");
 const url_management_1 = require("./url-management");
 const initDataSources = (options) => ({
     capi: new capi_1.CapiDataSource(options),
+    contentTree: new content_tree_1.ContentTreeDataSource(options),
     enrichedContent: new enriched_content_1.EnrichedContentDataSource(options),
     lists: new lists_1.ListsDataSource(options),
     origami: new origami_image_1.OrigamiImageDataSource(options),

package/lib/datasources/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":";;;AACA,iCAAuC;AACvC,yDAA8D;AAC9D,mCAAyC;AACzC,mDAAwD;AACxD,qCAA2C;AAC3C,uCAA6C;AAC7C,qDAA0D;AAEnD,MAAM,eAAe,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,CAAC;IAClE,IAAI,EAAE,IAAI,qBAAc,CAAC,OAAO,CAAC;IACjC,eAAe,EAAE,IAAI,4CAAyB,CAAC,OAAO,CAAC;IACvD,KAAK,EAAE,IAAI,uBAAe,CAAC,OAAO,CAAC;IACnC,OAAO,EAAE,IAAI,sCAAsB,CAAC,OAAO,CAAC;IAC5C,MAAM,EAAE,IAAI,yBAAgB,CAAC,OAAO,CAAC;IACrC,UAAU,EAAE,IAAI,wCAAuB,CAAC,OAAO,CAAC;IAChD,OAAO,EAAE,IAAI,2BAAiB,CAAC,OAAO,CAAC;CACxC,CAAC,CAAA;AARW,QAAA,eAAe,mBAQ1B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":";;;AACA,iCAAuC;AACvC,iDAAsD;AACtD,yDAA8D;AAC9D,mCAAyC;AACzC,mDAAwD;AACxD,qCAA2C;AAC3C,uCAA6C;AAC7C,qDAA0D;AAEnD,MAAM,eAAe,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,CAAC;IAClE,IAAI,EAAE,IAAI,qBAAc,CAAC,OAAO,CAAC;IACjC,WAAW,EAAE,IAAI,oCAAqB,CAAC,OAAO,CAAC;IAC/C,eAAe,EAAE,IAAI,4CAAyB,CAAC,OAAO,CAAC;IACvD,KAAK,EAAE,IAAI,uBAAe,CAAC,OAAO,CAAC;IACnC,OAAO,EAAE,IAAI,sCAAsB,CAAC,OAAO,CAAC;IAC5C,MAAM,EAAE,IAAI,yBAAgB,CAAC,OAAO,CAAC;IACrC,UAAU,EAAE,IAAI,wCAAuB,CAAC,OAAO,CAAC;IAChD,OAAO,EAAE,IAAI,2BAAiB,CAAC,OAAO,CAAC;CACxC,CAAC,CAAA;AATW,QAAA,eAAe,mBAS1B"}

package/lib/fixtures/contentTreeObject.d.ts

@@ -0,0 +1,2 @@
+import type { ContentTreeApiContent } from '../types/content-tree-api';
+export declare const baseContentTreeObject: ContentTreeApiContent;

package/lib/fixtures/contentTreeObject.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseContentTreeObject = void 0;
+exports.baseContentTreeObject = {
+    id: 'http://www.ft.com/thing/3071cae8-a27c-4ab4-a0d4-7bb00df1d477',
+    type: 'http://www.ft.com/ontology/content/Article',
+    title: 'Kwarteng faces test persuading UK watchdog of fiscal plans',
+    standfirst: 'A standfirst from content-tree',
+    byline: 'Chris Giles in London',
+    webUrl: 'https://www.ft.com/content/3071cae8-a27c-4ab4-a0d4-7bb00df1d477',
+    publishedDate: '2024-04-02T10:00:09.935Z',
+    firstPublishedDate: '2024-04-02T10:00:09.935Z',
+    lastModified: '2024-04-02T12:34:56.789Z',
+    canBeSyndicated: 'yes',
+    accessLevel: 'premium',
+    editorialDesk: '/FT/WorldNews/UK',
+    annotations: [
+        {
+            apiUrl: 'http://api.ft.com/things/9bfe954c-e0ec-4716-ae91-24bd0f7860c9',
+            directType: 'http://www.ft.com/ontology/Topic',
+            id: 'http://api.ft.com/things/9bfe954c-e0ec-4716-ae91-24bd0f7860c9',
+            predicate: 'http://www.ft.com/ontology/annotation/about',
+            prefLabel: 'UK financial crisis',
+        },
+        {
+            apiUrl: 'http://api.ft.com/things/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+            directType: 'http://www.ft.com/ontology/person/Person',
+            id: 'http://api.ft.com/things/1d556016-ad16-4fe7-8724-42b3fb15ad28',
+            predicate: 'http://www.ft.com/ontology/annotation/hasAuthor',
+            prefLabel: 'Chris Giles',
+        },
+    ],
+    bodyTree: {
+        type: 'body',
+        version: 1,
+        children: [
+            {
+                type: 'paragraph',
+                children: [
+                    {
+                        type: 'text',
+                        value: 'First content tree paragraph.',
+                    },
+                ],
+            },
+            {
+                type: 'paragraph',
+                children: [
+                    {
+                        type: 'text',
+                        value: 'Second paragraph.',
+                    },
+                ],
+            },
+        ],
+    },
+};
+//# sourceMappingURL=contentTreeObject.js.map

package/lib/fixtures/contentTreeObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contentTreeObject.js","sourceRoot":"","sources":["../../src/fixtures/contentTreeObject.ts"],"names":[],"mappings":";;;AAEa,QAAA,qBAAqB,GAA0B;IAC1D,EAAE,EAAE,8DAA8D;IAClE,IAAI,EAAE,4CAA4C;IAClD,KAAK,EAAE,4DAA4D;IACnE,UAAU,EAAE,gCAAgC;IAC5C,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,iEAAiE;IACzE,aAAa,EAAE,0BAA0B;IACzC,kBAAkB,EAAE,0BAA0B;IAC9C,YAAY,EAAE,0BAA0B;IACxC,eAAe,EAAE,KAAK;IACtB,WAAW,EAAE,SAAS;IACtB,aAAa,EAAE,kBAAkB;IACjC,WAAW,EAAE;QACX;YACE,MAAM,EAAE,+DAA+D;YACvE,UAAU,EAAE,kCAAkC;YAC9C,EAAE,EAAE,+DAA+D;YACnE,SAAS,EAAE,6CAA6C;YACxD,SAAS,EAAE,qBAAqB;SACjC;QACD;YACE,MAAM,EAAE,+DAA+D;YACvE,UAAU,EAAE,0CAA0C;YACtD,EAAE,EAAE,+DAA+D;YACnE,SAAS,EAAE,iDAAiD;YAC5D,SAAS,EAAE,aAAa;SACzB;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,+BAA+B;qBACvC;iBACF;aACF;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,mBAAmB;qBAC3B;iBACF;aACF;SACF;KACF;CACF,CAAA"}

package/lib/fixtures/dummyContext.js

@@ -13,6 +13,7 @@ const addSurrogateKeys = (ids) => {
 };
 exports.default = {
     addSurrogateKeys,
+    useContentTree: false,
     dataSources: {
         vanityUrls: {
             get: (url) => Promise.resolve(url),
@@ -24,6 +25,9 @@ exports.default = {
                 publishedDate: new Date(now + parseInt(id.slice(-2), 10)).toISOString(),
             }), { addSurrogateKeys })),
         },
+        contentTree: {
+            getContent: jest.fn(),
+        },
         people: {
             getPerson: jest.fn(),
         },

package/lib/fixtures/dummyContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"dummyContext.js","sourceRoot":"","sources":["../../src/fixtures/dummyContext.ts"],"names":[],"mappings":";;;;;AAAA,8CAA0C;AAC1C,6CAA6C;AAC7C,4DAAkC;AAElC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AAEtB,MAAM,gBAAgB,GAAG,CAAC,GAAqC,EAAE,EAAE;IACjE,MAAM,IAAI,GAAG,EAAE,CAAA;IACf,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;AACnB,CAAC,CAAA;AAED,kBAAe;IACb,gBAAgB;IAChB,WAAW,EAAE;QACX,UAAU,EAAE;YACV,GAAG,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;SAC3C;QACD,IAAI,EAAE;YACJ,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CACzB,OAAO,CAAC,OAAO,CACb,IAAI,iBAAO,CACT,IAAA,oBAAS,EAAC;gBACR,GAAG,2BAAc;gBACjB,EAAE;gBACF,aAAa,EAAE,IAAI,IAAI,CACrB,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACjC,CAAC,WAAW,EAAE;aAChB,CAAC,EACF,EAAE,gBAAgB,EAAkB,CACrC,CACF;SACJ;QACD,MAAM,EAAE;YACN,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;SACrB;KACF;IACD,MAAM,EAAE;QACN,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;KAChB;CACyB,CAAA"}
+{"version":3,"file":"dummyContext.js","sourceRoot":"","sources":["../../src/fixtures/dummyContext.ts"],"names":[],"mappings":";;;;;AAAA,8CAA0C;AAC1C,6CAA6C;AAC7C,4DAAkC;AAElC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AAEtB,MAAM,gBAAgB,GAAG,CAAC,GAAqC,EAAE,EAAE;IACjE,MAAM,IAAI,GAAG,EAAE,CAAA;IACf,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA;AACnB,CAAC,CAAA;AAED,kBAAe;IACb,gBAAgB;IAChB,cAAc,EAAE,KAAK;IACrB,WAAW,EAAE;QACX,UAAU,EAAE;YACV,GAAG,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;SAC3C;QACD,IAAI,EAAE;YACJ,UAAU,EAAE,CAAC,EAAU,EAAE,EAAE,CACzB,OAAO,CAAC,OAAO,CACb,IAAI,iBAAO,CACT,IAAA,oBAAS,EAAC;gBACR,GAAG,2BAAc;gBACjB,EAAE;gBACF,aAAa,EAAE,IAAI,IAAI,CACrB,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACjC,CAAC,WAAW,EAAE;aAChB,CAAC,EACF,EAAE,gBAAgB,EAAkB,CACrC,CACF;SACJ;QACD,WAAW,EAAE;YACX,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;SACtB;QACD,MAAM,EAAE;YACN,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;SACrB;KACF;IACD,MAAM,EAAE;QACN,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;KAChB;CACyB,CAAA"}

package/lib/generated/index.d.ts

@@ -16,6 +16,7 @@ import type { Author as AuthorNode, ClipSet as ClipSetNode, OldClip as OldClipNo
 import type { DataSourceFetchResult } from '@apollo/datasource-rest';
 import type { DataSources } from '../datasources';
 import type { CapiDataSource } from '../datasources/capi';
+import type { ContentTreeDataSource } from '../datasources/content-tree';
 import type { EnrichedContentDataSource } from '../datasources/enriched-content';
 import type { OrigamiImageDataSource } from '../datasources/origami-image';
 import type { ListsDataSource } from '../datasources/lists';
@@ -118,8 +119,8 @@ export type Scalars = {
         output: 'special-report' | 'extra' | 'basic' | 'extra-wide';
     };
     RichTextSource: {
-        input: 'standfirst' | 'summary' | 'bodyXML' | 'transcript';
-        output: 'standfirst' | 'summary' | 'bodyXML' | 'transcript';
+        input: 'standfirst' | 'summary' | 'bodyXML' | 'transcript' | 'bodyTree';
+        output: 'standfirst' | 'summary' | 'bodyXML' | 'transcript' | 'bodyTree';
     };
     TopperBackgroundColour: {
         input: 'paper' | 'wheat' | 'white' | 'black' | 'claret' | 'oxford' | 'slate' | 'crimson' | 'sky' | 'matisse';
@@ -685,6 +686,14 @@ export type ContentPackageUrlArgs = {
     relative?: InputMaybe<Scalars['Boolean']['input']>;
     vanity?: InputMaybe<Scalars['Boolean']['input']>;
 };
+export type ContentTreeDebug = {
+    /** Call the /content-tree endpoint for debugging */
+    readonly content: DebugResponse;
+};
+export type ContentTreeDebugContentArgs = {
+    skipCache?: InputMaybe<Scalars['Boolean']['input']>;
+    uuid: Scalars['String']['input'];
+};
 export type CustomCodeComponent = Reference & {
     /** Configuration data to be passed to the component. */
     readonly attributes: Scalars['JSON']['output'];
@@ -702,8 +711,10 @@ export type CustomCodeComponent = Reference & {
     readonly versionRange: Scalars['String']['output'];
 };
 export type DataSourceDebug = {
-    /** Call the Content API datasource for debugging */
+    /** Call the Internal Content API datasource for debugging */
     readonly capi?: Maybe<CapiDebug>;
+    /** Call the Content Tree datasource for debugging */
+    readonly contentTree?: Maybe<ContentTreeDebug>;
     /** Call the Enriched Content datasource for debugging */
     readonly enrichedContent?: Maybe<EnrichedContentDebug>;
     /** Call the Image Service datasource for debugging */
@@ -2081,6 +2092,7 @@ export type ResolversTypes = ResolversObject<{
         node: Maybe<ResolversTypes['Content']>;
     }>;
     ContentPackage: ResolverTypeWrapper<ContentModel>;
+    ContentTreeDebug: ResolverTypeWrapper<ContentTreeDataSource>;
     ContentType: ResolverTypeWrapper<Scalars['ContentType']['output']>;
     CustomCodeComponent: ResolverTypeWrapper<ReferenceWithCAPIData<ContentTree.CustomCodeComponent>>;
     DataSourceDebug: ResolverTypeWrapper<DataSources>;
@@ -2203,6 +2215,7 @@ export type ResolversParentTypes = ResolversObject<{
         node: Maybe<ResolversParentTypes['Content']>;
     };
     ContentPackage: ContentModel;
+    ContentTreeDebug: ContentTreeDataSource;
     ContentType: Scalars['ContentType']['output'];
     CustomCodeComponent: ReferenceWithCAPIData<ContentTree.CustomCodeComponent>;
     DataSourceDebug: DataSources;
@@ -2577,6 +2590,10 @@ export type ContentPackageResolvers<ContextType = QueryContext, ParentType exten
     url: Resolver<ResolversTypes['String'], ParentType, ContextType, Partial<ContentPackageUrlArgs>>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
+export type ContentTreeDebugResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['ContentTreeDebug'] = ResolversParentTypes['ContentTreeDebug']> = ResolversObject<{
+    content: Resolver<ResolversTypes['DebugResponse'], ParentType, ContextType, RequireFields<ContentTreeDebugContentArgs, 'uuid'>>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
 export interface ContentTypeScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['ContentType'], any> {
     name: 'ContentType';
 }
@@ -2592,6 +2609,7 @@ export type CustomCodeComponentResolvers<ContextType = QueryContext, ParentType
 }>;
 export type DataSourceDebugResolvers<ContextType = QueryContext, ParentType extends ResolversParentTypes['DataSourceDebug'] = ResolversParentTypes['DataSourceDebug']> = ResolversObject<{
     capi: Resolver<Maybe<ResolversTypes['CapiDebug']>, ParentType, ContextType>;
+    contentTree: Resolver<Maybe<ResolversTypes['ContentTreeDebug']>, ParentType, ContextType>;
     enrichedContent: Resolver<Maybe<ResolversTypes['EnrichedContentDebug']>, ParentType, ContextType>;
     imageService: Resolver<Maybe<ResolversTypes['ImageServiceDebug']>, ParentType, ContextType>;
     lists: Resolver<Maybe<ResolversTypes['ListsDebug']>, ParentType, ContextType>;
@@ -3345,6 +3363,7 @@ export type Resolvers<ContextType = QueryContext> = ResolversObject<{
     ContentConnection: ContentConnectionResolvers<ContextType>;
     ContentEdge: ContentEdgeResolvers<ContextType>;
     ContentPackage: ContentPackageResolvers<ContextType>;
+    ContentTreeDebug: ContentTreeDebugResolvers<ContextType>;
     ContentType: GraphQLScalarType;
     CustomCodeComponent: CustomCodeComponentResolvers<ContextType>;
     DataSourceDebug: DataSourceDebugResolvers<ContextType>;

package/lib/index.d.ts

@@ -21,6 +21,7 @@ export interface QueryContext {
     dataSources: DataSources;
     systemCode: string;
     requestId?: string;
+    readonly useContentTree: boolean;
     contentRequestedOnce?: boolean;
     contentTimedOut?: boolean;
     logger: Logger;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4D;AAmDnD,gGAnDA,6BAAe,OAmDA;AAhDxB,8CAAoD;AACpD,4EAAsE;AACtE,2CAA4B;AAC5B,2BAAiC;AAiCpB,QAAA,oBAAoB,GAAG,IAAA,iBAAY,EAC9C,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAC7C,OAAO,CACR,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,qBAAc,EACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,EAChD;IACE,OAAO,EAAE,CAAC,IAAI,uCAAiB,EAAE,CAAC;CACnC,CACF,CAAA;AAGD,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,mHAAA,OAAO,OAAW;AAC3B,yCAA0C;AAAjC,+FAAA,OAAO,OAAA;AAEhB,+FAA8E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA4D;AAoDnD,gGApDA,6BAAe,OAoDA;AAjDxB,8CAAoD;AACpD,4EAAsE;AACtE,2CAA4B;AAC5B,2BAAiC;AAkCpB,QAAA,oBAAoB,GAAG,IAAA,iBAAY,EAC9C,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAC7C,OAAO,CACR,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,qBAAc,EACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,EAChD;IACE,OAAO,EAAE,CAAC,IAAI,uCAAiB,EAAE,CAAC;CACnC,CACF,CAAA;AAGD,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,+CAAwD;AAA/C,mHAAA,OAAO,OAAW;AAC3B,yCAA0C;AAAjC,+FAAA,OAAO,OAAA;AAEhB,+FAA8E"}