@financial-times/cp-content-pipeline-schema 0.3.5 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.4.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.4.0...cp-content-pipeline-schema-v0.4.1) (2022-11-10)
+
+
+### Bug Fixes
+
+* add missing colon to url management cache prefix ([1e613e2](https://github.com/Financial-Times/cp-content-pipeline/commit/1e613e216f97ce16129e7a1b3142aaab7195c9ab))
+* ensure correct cache prefixes for data sources ([95cb3f9](https://github.com/Financial-Times/cp-content-pipeline/commit/95cb3f994c1738406683a6b8a8374a7cce7780a4))
+
+## [0.4.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.3.5...cp-content-pipeline-schema-v0.4.0) (2022-11-09)
+
+
+### ⚠ BREAKING CHANGES
+
+* This will change the output of concept types that are already in use. For example within teasers
+
+### Features
+
+* add a cache prefix per datasource ([0722f55](https://github.com/Financial-Times/cp-content-pipeline/commit/0722f55a55c9899fbe2819dcc5121f900d6359b7))
+* migrate to Apollo Server v4 ([47fcd69](https://github.com/Financial-Times/cp-content-pipeline/commit/47fcd6964b4db235fcb2023ce0b72253a8a8dd88))
+* return annotations as part of the article query ([151d59c](https://github.com/Financial-Times/cp-content-pipeline/commit/151d59c5b27cd062a467eca77941a1612ba2320a))
+* return only the uuid for concept ID properties ([7eea0a0](https://github.com/Financial-Times/cp-content-pipeline/commit/7eea0a00c67a92b52fbb5cdf2cc572f0642f3c89))
+
 ## [0.3.5](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.3.4...cp-content-pipeline-schema-v0.3.5) (2022-11-01)
 
 

package/lib/concept.js

@@ -3,7 +3,7 @@ export const typeDef = gql `
   type Concept {
     apiUrl: String!
     directType: String
-    id: String!
+    id: ID!
     predicate: String!
     prefLabel: String!
     type: String!
@@ -15,7 +15,7 @@ export const resolvers = {
     Concept: {
         apiUrl: (parent) => parent.apiUrl(),
         directType: (parent) => parent.directType(),
-        id: (parent) => parent.id(),
+        id: (parent) => parent.uuid(),
         predicate: (parent) => parent.predicate(),
         prefLabel: (parent) => parent.prefLabel(),
         type: (parent) => parent.type(),

package/lib/concept.js.map

@@ -1 +1 @@
-{"version":3,"file":"concept.js","sourceRoot":"","sources":["../src/concept.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA;;;;;;;;;;;CAWzB,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAA6C;IACjE,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QAC5C,UAAU,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QACpD,EAAE,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;QACpC,SAAS,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QAClD,SAAS,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QAClD,IAAI,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACxC,KAAK,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC1C,GAAG,EAAE,KAAK,EAAE,MAAe,EAAE,IAAkB,EAAE,OAAO,EAAE,EAAE,CAC1D,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;KACnB;CACF,CAAA"}
+{"version":3,"file":"concept.js","sourceRoot":"","sources":["../src/concept.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA;;;;;;;;;;;CAWzB,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAA6C;IACjE,OAAO,EAAE;QACP,MAAM,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QAC5C,UAAU,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QACpD,EAAE,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACtC,SAAS,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QAClD,SAAS,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QAClD,IAAI,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACxC,KAAK,EAAE,CAAC,MAAe,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC1C,GAAG,EAAE,KAAK,EAAE,MAAe,EAAE,IAAkB,EAAE,OAAO,EAAE,EAAE,CAC1D,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;KACnB;CACF,CAAA"}

package/lib/content.js

@@ -17,6 +17,7 @@ const contentFields = `
   altStandfirst: AltStandfirst
   byline: StructuredContent
   teaser: Teaser
+  annotations: [Concept]
 `;
 export const typeDef = [
     gql `
@@ -81,6 +82,7 @@ export const resolvers = {
         altTitle: (parent) => parent.alternativeTitle(),
         altStandfirst: (parent) => parent.alternativeStandfirst(),
         publishedDate: (parent) => parent.publishedDate(),
+        annotations: (parent) => parent.annotations(),
     },
     LiveBlogPackage: {
         liveBlogPosts: (parent) => parent.liveBlogPosts(),

package/lib/content.js.map

@@ -1 +1 @@
-{"version":3,"file":"content.js","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;CAgBrB,CAAA;AACD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,CAAA;;QAEG,aAAa;;;;;;;;;;QAUb,aAAa;;;;QAIb,aAAa;;;;;;QAMb,aAAa;;;;QAIb,aAAa;;;;QAIb,aAAa;;;;QAIb,aAAa;;GAElB;CACF,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAA6C;IACjE,OAAO,EAAE;QACP,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACtD,IAAI,CAAC,MAAoB;YACvB,OAAO;gBACL,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE;gBACvB,cAAc,EAAE,MAAM;aACvB,CAAA;QACH,CAAC;QACD,MAAM,EAAE,CAAC,MAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAC9C,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAC7B,MAAM,CAAC,MAAoB;YACzB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAA;YAClC,IAAI,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAA;YAC5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAA;YACrD,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,eAAe,EAAE,CAAA;QACnE,CAAC;QACD,GAAG,EAAE,CAAC,MAAoB,EAAE,IAA2B,EAAE,EAAE,CACzD,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QACrD,IAAI,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC7C,SAAS,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACvD,QAAQ,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC7D,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,EAAE;QACvE,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;KAChE;IAED,eAAe,EAAE;QACf,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/D,QAAQ,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;KACtD;CACF,CAAA"}
+{"version":3,"file":"content.js","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;CAiBrB,CAAA;AACD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,CAAA;;QAEG,aAAa;;;;;;;;;;QAUb,aAAa;;;;QAIb,aAAa;;;;;;QAMb,aAAa;;;;QAIb,aAAa;;;;QAIb,aAAa;;;;QAIb,aAAa;;GAElB;CACF,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAA6C;IACjE,OAAO,EAAE;QACP,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACtD,IAAI,CAAC,MAAoB;YACvB,OAAO;gBACL,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE;gBACvB,cAAc,EAAE,MAAM;aACvB,CAAA;QACH,CAAC;QACD,MAAM,EAAE,CAAC,MAAoB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAC9C,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAC7B,MAAM,CAAC,MAAoB;YACzB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAA;YAClC,IAAI,CAAC,UAAU;gBAAE,OAAO,IAAI,CAAA;YAC5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAA;YACrD,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,eAAe,EAAE,CAAA;QACnE,CAAC;QACD,GAAG,EAAE,CAAC,MAAoB,EAAE,IAA2B,EAAE,EAAE,CACzD,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QACrD,IAAI,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC7C,SAAS,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;QACvD,QAAQ,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC7D,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,qBAAqB,EAAE;QACvE,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/D,WAAW,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;KAC5D;IAED,eAAe,EAAE;QACf,aAAa,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/D,QAAQ,EAAE,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;KACtD;CACF,CAAA"}

package/lib/datasources/base.d.ts

@@ -0,0 +1,9 @@
+import { KeyValueCache } from '@apollo/utils.keyvaluecache';
+import { QueryContext } from '../index.js';
+export interface BaseDataSource {
+    context: QueryContext;
+}
+export declare type BaseDataSourceOptions = {
+    cache: KeyValueCache;
+    context: QueryContext;
+};

package/lib/datasources/base.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=base.js.map

package/lib/datasources/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/datasources/base.ts"],"names":[],"mappings":""}

package/lib/datasources/capi.d.ts

@@ -1,13 +1,15 @@
-import { RequestOptions } from 'apollo-datasource-rest';
+import { WillSendRequestOptions } from '@apollo/datasource-rest';
 import { CapiResponse } from '../model/CapiResponse.js';
 import { InstrumentedRESTDataSource } from './instrumented.js';
 import { CapiPerson } from '../types/internal-content.js';
+import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource.js';
 export declare class CapiDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     capiKey: string;
     articleCacheTTL: number;
     peopleCacheTTL: number;
-    willSendRequest(request: RequestOptions): void;
+    willSendRequest(request: WillSendRequestOptions): void;
+    protected cacheOptionsFor(url: string): CacheOptions | undefined;
     getContent(uuid: string): Promise<CapiResponse>;
     getPerson(uuid: string): Promise<CapiPerson>;
 }

package/lib/datasources/capi.js

@@ -13,18 +13,21 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
             : 600; // 10 minutes
     }
     willSendRequest(request) {
-        super.willSendRequest(request);
-        request.headers.set('x-api-key', this.capiKey);
+        request.headers['x-api-key'] = this.capiKey;
+    }
+    cacheOptionsFor(url) {
+        if (url.startsWith('internalcontent/')) {
+            return { ttl: this.articleCacheTTL };
+        }
+        else if (url.startsWith('people/')) {
+            return { ttl: this.peopleCacheTTL };
+        }
     }
     async getContent(uuid) {
-        return this.get(`internalcontent/${uuid}`, undefined, {
-            cacheOptions: { ttl: this.articleCacheTTL },
-        }).then((response) => new CapiResponse(response, this.context));
+        return this.get(`internalcontent/${uuid}`).then((response) => new CapiResponse(response, this.context));
     }
     async getPerson(uuid) {
-        return this.get(`people/${uuid}`, undefined, {
-            cacheOptions: { ttl: this.peopleCacheTTL },
-        });
+        return this.get(`people/${uuid}`);
     }
 }
 //# 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":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAG9D,MAAM,OAAO,cAAe,SAAQ,0BAA0B;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,CAAA,CAAC,aAAa;QACpB,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;IAkBvB,CAAC;IAhBC,eAAe,CAAC,OAAuB;QACrC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC9B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,EAAE,SAAS,EAAE;YACpD,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE;SAC5C,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,EAAE,SAAS,EAAE;YAC3C,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE;SAC3C,CAAC,CAAA;IACJ,CAAC;CACF"}
+{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAI9D,MAAM,OAAO,cAAe,SAAQ,0BAA0B;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,CAAA,CAAC,aAAa;QACpB,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;IAuBvB,CAAC;IArBU,eAAe,CAAC,OAA+B;QACtD,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7C,CAAC;IAES,eAAe,CAAC,GAAW;QACnC,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;YACtC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,CAAA;SACrC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YACpC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,CAAA;SACpC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,IAAI,CAC7C,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CACvD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAA;IACnC,CAAC;CACF"}

package/lib/datasources/index.d.ts

@@ -1,11 +1,12 @@
+import { BaseDataSourceOptions } from './base.js';
 import { CapiDataSource } from './capi.js';
 import { OrigamiImageDataSource } from './origami-image.js';
 import { TwitterDataSource } from './twitter.js';
 import { URLManagementDataSource } from './url-management.js';
-export declare const dataSources: () => {
+export declare const initDataSources: (options: BaseDataSourceOptions) => {
     capi: CapiDataSource;
     origami: OrigamiImageDataSource;
     vanityUrls: URLManagementDataSource;
     twitter: TwitterDataSource;
 };
-export declare type DataSources = ReturnType<typeof dataSources>;
+export declare type DataSources = ReturnType<typeof initDataSources>;

package/lib/datasources/index.js

@@ -2,10 +2,10 @@ import { CapiDataSource } from './capi.js';
 import { OrigamiImageDataSource } from './origami-image.js';
 import { TwitterDataSource } from './twitter.js';
 import { URLManagementDataSource } from './url-management.js';
-export const dataSources = () => ({
-    capi: new CapiDataSource(),
-    origami: new OrigamiImageDataSource(),
-    vanityUrls: new URLManagementDataSource(),
-    twitter: new TwitterDataSource(),
+export const initDataSources = (options) => ({
+    capi: new CapiDataSource(options),
+    origami: new OrigamiImageDataSource(options),
+    vanityUrls: new URLManagementDataSource(options),
+    twitter: new TwitterDataSource(options),
 });
 //# sourceMappingURL=index.js.map

package/lib/datasources/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC;IAChC,IAAI,EAAE,IAAI,cAAc,EAAE;IAC1B,OAAO,EAAE,IAAI,sBAAsB,EAAE;IACrC,UAAU,EAAE,IAAI,uBAAuB,EAAE;IACzC,OAAO,EAAE,IAAI,iBAAiB,EAAE;CACjC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,CAAC;IAClE,IAAI,EAAE,IAAI,cAAc,CAAC,OAAO,CAAC;IACjC,OAAO,EAAE,IAAI,sBAAsB,CAAC,OAAO,CAAC;IAC5C,UAAU,EAAE,IAAI,uBAAuB,CAAC,OAAO,CAAC;IAChD,OAAO,EAAE,IAAI,iBAAiB,CAAC,OAAO,CAAC;CACxC,CAAC,CAAA"}

package/lib/datasources/instrumented.d.ts

@@ -1,8 +1,13 @@
-import { Request, RequestOptions, Response, RESTDataSource } from 'apollo-datasource-rest';
+import { WillSendRequestOptions, RESTDataSource, RequestOptions } from '@apollo/datasource-rest';
+import type { FetcherResponse } from '@apollo/utils.fetcher';
 import { QueryContext } from '../index.js';
-export declare class InstrumentedRESTDataSource extends RESTDataSource<QueryContext> {
+import { BaseDataSource, BaseDataSourceOptions } from './base.js';
+export declare class InstrumentedRESTDataSource extends RESTDataSource implements BaseDataSource {
     startTime?: bigint;
     includeHeadersInLogs: string[];
-    willSendRequest(request: RequestOptions): void;
-    didReceiveResponse<TResult>(response: Response, request: Request): Promise<TResult>;
+    context: QueryContext;
+    constructor({ cache, context }: BaseDataSourceOptions);
+    get cachePrefix(): string;
+    trace<TResult>(url: URL, request: WillSendRequestOptions, fn: () => Promise<TResult>): Promise<TResult>;
+    didReceiveResponse<TResult>(response: FetcherResponse, request: RequestOptions): Promise<TResult>;
 }

package/lib/datasources/instrumented.js

@@ -1,10 +1,24 @@
-import { RESTDataSource, } from 'apollo-datasource-rest';
+import { RESTDataSource, } from '@apollo/datasource-rest';
+import { PrefixingKeyValueCache } from '@apollo/utils.keyvaluecache';
+import { isContextableCache } from '../types/cache.js';
 export class InstrumentedRESTDataSource extends RESTDataSource {
-    constructor() {
-        super(...arguments);
+    constructor({ cache, context }) {
+        const wrappedCache = new PrefixingKeyValueCache(isContextableCache(cache) ? cache.withContext(context) : cache, 'placeholder_prefix_if_you_see_this_in_redis_something_is_very_wrong:' // can't use `this` yet to get our prefix
+        );
+        super({
+            cache: wrappedCache,
+        });
         this.includeHeadersInLogs = [];
+        // okay _now_ we can use `this`
+        // also that's a private property so use the [] escape hatch
+        // sorry
+        wrappedCache['prefix'] = this.cachePrefix + ':';
+        this.context = context;
+    }
+    get cachePrefix() {
+        return this.constructor.name.replace(/DataSource$/, '').toLowerCase();
     }
-    willSendRequest(request) {
+    async trace(url, request, fn) {
         var _a;
         this.startTime = process.hrtime.bigint();
         (_a = this.context.metrics) === null || _a === void 0 ? void 0 : _a.count(`graphql.datasource.${this.constructor.name}.request.count`, 1);
@@ -13,19 +27,15 @@ export class InstrumentedRESTDataSource extends RESTDataSource {
             datasource: this.constructor.name,
             request: {
                 id: this.context.requestId,
-                url: this.baseURL + request.path,
+                url: url.href,
                 method: request.method,
-                headers: request.headers
-                    ? Object.fromEntries(this.includeHeadersInLogs.map((header) => [
-                        header,
-                        request.headers.get(header),
-                    ]))
-                    : {},
+                headers: request.headers,
             },
         });
         if (this.context.requestId) {
-            request.headers.set('x-request-id', this.context.requestId);
+            request.headers['x-request-id'] = this.context.requestId;
         }
+        return fn();
     }
     async didReceiveResponse(response, request) {
         var _a, _b;

package/lib/datasources/instrumented.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,GACf,MAAM,wBAAwB,CAAA;AAM/B,MAAM,OAAO,0BAA2B,SAAQ,cAA4B;IAA5E;;QAEE,yBAAoB,GAAa,EAAE,CAAA;IAkDrC,CAAC;IAhDC,eAAe,CAAC,OAAuB;;QACrC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QACxC,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,gBAAgB,EAC3D,CAAC,CACF,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,oBAAoB;YAC3B,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;YACjC,OAAO,EAAE;gBACP,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBAC1B,GAAG,EAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI;gBAChC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACtB,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;wBACxC,MAAM;wBACN,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;qBAC5B,CAAC,CACH;oBACH,CAAC,CAAC,EAAE;aACc;SACvB,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;SAC5D;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAkB,EAClB,OAAgB;;QAEhB,wGAAwG;QACxG,oEAAoE;QACpE,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAU,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAE1E,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,QAAQ,CAAC,MAAM,QAAQ,EAC/E,CAAC,CACF,CAAA;QACD,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,QAAQ,CAAC,MAAM,OAAO,EAC9E,MAAM,CAAC,QAAQ,CAAC,CACjB,CAAA;QAED,OAAO,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF"}
+{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,GAEf,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAGtD,MAAM,OAAO,0BACX,SAAQ,cAAc;IAOtB,YAAY,EAAE,KAAK,EAAE,OAAO,EAAyB;QACnD,MAAM,YAAY,GAAG,IAAI,sBAAsB,CAC7C,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAC9D,sEAAsE,CAAC,yCAAyC;SACjH,CAAA;QAED,KAAK,CAAC;YACJ,KAAK,EAAE,YAAY;SACpB,CAAC,CAAA;QAXJ,yBAAoB,GAAa,EAAE,CAAA;QAajC,+BAA+B;QAC/B,4DAA4D;QAC5D,QAAQ;QACR,YAAY,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,GAAG,GAAG,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;IACvE,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,GAAQ,EACR,OAA+B,EAC/B,EAA0B;;QAE1B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QAExC,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,gBAAgB,EAC3D,CAAC,CACF,CAAA;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,oBAAoB;YAC3B,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;YACjC,OAAO,EAAE;gBACP,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBAC1B,GAAG,EAAE,GAAG,CAAC,IAAI;gBACb,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;aACJ;SACvB,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAA;SACzD;QAED,OAAO,EAAE,EAAE,CAAA;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAyB,EACzB,OAAuB;;QAEvB,wGAAwG;QACxG,oEAAoE;QACpE,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAU,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAE1E,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,QAAQ,CAAC,MAAM,QAAQ,EAC/E,CAAC,CACF,CAAA;QACD,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,KAAK,CACzB,sBAAsB,IAAI,CAAC,WAAW,CAAC,IAAI,aAAa,QAAQ,CAAC,MAAM,OAAO,EAC9E,MAAM,CAAC,QAAQ,CAAC,CACjB,CAAA;QAED,OAAO,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF"}

package/lib/datasources/url-management.d.ts

@@ -1,11 +1,11 @@
-import { DataSource, DataSourceConfig } from 'apollo-datasource';
-import { KeyValueCache } from 'apollo-server-caching';
+import { KeyValueCache } from '@apollo/utils.keyvaluecache';
 import { QueryContext } from '../index.js';
-export declare class URLManagementDataSource extends DataSource {
-    context: QueryContext;
-    cache: KeyValueCache;
+import { BaseDataSource, BaseDataSourceOptions } from './base.js';
+export declare class URLManagementDataSource implements BaseDataSource {
     memoizedResults: Map<string, Promise<string>>;
+    cache: KeyValueCache;
+    context: QueryContext;
     static clientInitialised: boolean;
-    initialize({ context, cache, }: DataSourceConfig<QueryContext>): void;
+    constructor({ context, cache }: BaseDataSourceOptions);
     get(fromURL: string, ttl?: number): Promise<string>;
 }

package/lib/datasources/url-management.js

@@ -1,14 +1,10 @@
-import { DataSource } from 'apollo-datasource';
-import { InMemoryLRUCache, PrefixingKeyValueCache, } from 'apollo-server-caching';
+import { PrefixingKeyValueCache, } from '@apollo/utils.keyvaluecache';
 import * as nUrlManagementApiReadClient from '@financial-times/n-url-management-api-read-client';
-const CACHE_PREFIX = 'nurlmgmtapi';
+const CACHE_PREFIX = 'nurlmgmtapi:';
 const DEFAULT_TTL_IN_SECONDS = 60 * 60; // one hour
-export class URLManagementDataSource extends DataSource {
-    constructor() {
-        super(...arguments);
+export class URLManagementDataSource {
+    constructor({ context, cache }) {
         this.memoizedResults = new Map();
-    }
-    initialize({ context, cache = new InMemoryLRUCache(), }) {
         if (!URLManagementDataSource.clientInitialised) {
             nUrlManagementApiReadClient.init({ metrics: context.metrics });
             URLManagementDataSource.clientInitialised = true;

package/lib/datasources/url-management.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-management.js","sourceRoot":"","sources":["../../src/datasources/url-management.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAoB,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAEL,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,2BAA2B,MAAM,mDAAmD,CAAA;AAIhG,MAAM,YAAY,GAAG,aAAa,CAAA;AAClC,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,CAAA,CAAC,WAAW;AAElD,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAAvD;;QAGE,oBAAe,GAAG,IAAI,GAAG,EAA2B,CAAA;IA4CtD,CAAC;IAxCU,UAAU,CAAC,EAClB,OAAO,EACP,KAAK,GAAG,IAAI,gBAAgB,EAAE,GACC;QAC/B,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE;YAC9C,2BAA2B,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9D,uBAAuB,CAAC,iBAAiB,GAAG,IAAI,CAAA;SACjD;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,sBAAsB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAe,EACf,MAAc,sBAAsB;QAEpC,MAAM,SAAS,GAAG,KAAK,IAAqB,EAAE;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC/C,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAA;aACjB;YAED,MAAM,YAAY,GAChB,MAAM,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1D,OAAO,YAAY,CAAC,KAAK,CAAA;QAC3B,CAAC,CAAA;QAED,IAAI,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAE/C,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAA;SACf;QAED,OAAO,GAAG,SAAS,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAE1C,OAAO,OAAO,CAAA;IAChB,CAAC;;AAzCM,yCAAiB,GAAG,KAAK,CAAA"}
+{"version":3,"file":"url-management.js","sourceRoot":"","sources":["../../src/datasources/url-management.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,KAAK,2BAA2B,MAAM,mDAAmD,CAAA;AAKhG,MAAM,YAAY,GAAG,cAAc,CAAA;AACnC,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,CAAA,CAAC,WAAW;AAElD,MAAM,OAAO,uBAAuB;IAOlC,YAAY,EAAE,OAAO,EAAE,KAAK,EAAyB;QANrD,oBAAe,GAAG,IAAI,GAAG,EAA2B,CAAA;QAOlD,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE;YAC9C,2BAA2B,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;YAC9D,uBAAuB,CAAC,iBAAiB,GAAG,IAAI,CAAA;SACjD;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,sBAAsB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAe,EACf,MAAc,sBAAsB;QAEpC,MAAM,SAAS,GAAG,KAAK,IAAqB,EAAE;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC/C,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAA;aACjB;YAED,MAAM,YAAY,GAChB,MAAM,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1D,OAAO,YAAY,CAAC,KAAK,CAAA;QAC3B,CAAC,CAAA;QAED,IAAI,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAE/C,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAA;SACf;QAED,OAAO,GAAG,SAAS,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAE1C,OAAO,OAAO,CAAA;IAChB,CAAC;;AAtCM,yCAAiB,GAAG,KAAK,CAAA"}

package/lib/datasources/url-management.test.js

@@ -7,7 +7,7 @@ jest.unstable_mockModule('@financial-times/n-url-management-api-read-client', ()
 const urlmgmtimport = await import('./url-management.js');
 const URLManagementDataSource = urlmgmtimport.URLManagementDataSource;
 const nUrlManagementApiReadClient = await import('@financial-times/n-url-management-api-read-client');
-import { InMemoryLRUCache } from 'apollo-server-caching';
+import { InMemoryLRUCache } from '@apollo/utils.keyvaluecache';
 import { jest } from '@jest/globals';
 const getMock = nUrlManagementApiReadClient.get;
 const context = {};
@@ -16,12 +16,12 @@ describe('URL management data source', () => {
         jest.resetAllMocks();
     });
     it('only initialises the client library once', async () => {
-        new URLManagementDataSource().initialize({
+        new URLManagementDataSource({
             context,
             cache: new InMemoryLRUCache(),
         });
         expect(nUrlManagementApiReadClient.init).toHaveBeenCalledTimes(1);
-        new URLManagementDataSource().initialize({
+        new URLManagementDataSource({
             context,
             cache: new InMemoryLRUCache(),
         });
@@ -31,34 +31,34 @@ describe('URL management data source', () => {
         getMock.mockResolvedValue({
             toURL: 'vanity.url',
         });
-        const dataSource = new URLManagementDataSource();
-        dataSource.initialize({ context, cache: new InMemoryLRUCache() });
+        const dataSource = new URLManagementDataSource({
+            context,
+            cache: new InMemoryLRUCache(),
+        });
         const vanity = await dataSource.get('original.url');
         expect(vanity).toEqual('vanity.url');
         expect(nUrlManagementApiReadClient.get).toHaveBeenCalled();
     });
     it('gets subsequent requests from the cache', async () => {
         getMock.mockImplementation((fromUrl) => Promise.resolve({ toURL: `${fromUrl}.vanity` }));
-        const dataSource = new URLManagementDataSource();
         const cache = new InMemoryLRUCache();
-        dataSource.initialize({ context, cache });
+        const dataSource = new URLManagementDataSource({ context, cache });
         const firstRequest = await dataSource.get('original.url');
         expect(firstRequest).toEqual('original.url.vanity');
-        expect(await cache.getTotalSize()).toEqual(19); // string length of original.url.vanity
+        expect(cache['cache'].calculatedSize).toEqual(19); // string length of original.url.vanity
         const secondRequest = await dataSource.get('original.url');
         expect(secondRequest).toEqual('original.url.vanity');
         expect(nUrlManagementApiReadClient.get).toHaveBeenCalledTimes(1);
-        expect(await cache.getTotalSize()).toEqual(19);
+        expect(cache['cache'].calculatedSize).toEqual(19);
         const differentRequest = await dataSource.get('different.url');
         expect(differentRequest).toEqual('different.url.vanity');
         expect(nUrlManagementApiReadClient.get).toHaveBeenCalledTimes(2);
-        expect(await cache.getTotalSize()).toEqual(39);
+        expect(cache['cache'].calculatedSize).toEqual(39);
     });
     it('memoizes requests made in the same query', async () => {
         getMock.mockImplementation((fromUrl) => Promise.resolve({ toURL: `${fromUrl}.vanity` }));
-        const dataSource = new URLManagementDataSource();
         const cache = new InMemoryLRUCache();
-        dataSource.initialize({ context, cache });
+        const dataSource = new URLManagementDataSource({ context, cache });
         const firstRequest = dataSource.get('original.url');
         const secondRequest = dataSource.get('original.url');
         const differentRequest = dataSource.get('different.url');

package/lib/datasources/url-management.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-management.test.js","sourceRoot":"","sources":["../../src/datasources/url-management.test.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,oDAAoD;AAEpD,IAAI,CAAC,mBAAmB,CACtB,mDAAmD,EACnD,GAAG,EAAE,CAAC,CAAC;IACL,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;IACd,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;CAChB,CAAC,CACH,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAA;AAEzD,MAAM,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAA;AACrE,MAAM,2BAA2B,GAAG,MAAM,MAAM,CAC9C,mDAAmD,CACpD,CAAA;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAEpC,MAAM,OAAO,GAAG,2BAA2B,CAAC,GAAgB,CAAA;AAE5D,MAAM,OAAO,GAAG,EAA6B,CAAA;AAE7C,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,IAAI,uBAAuB,EAAE,CAAC,UAAU,CAAC;YACvC,OAAO;YACP,KAAK,EAAE,IAAI,gBAAgB,EAAE;SAC9B,CAAC,CAAA;QACF,MAAM,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QACjE,IAAI,uBAAuB,EAAE,CAAC,UAAU,CAAC;YACvC,OAAO;YACP,KAAK,EAAE,IAAI,gBAAgB,EAAE;SAC9B,CAAC,CAAA;QACF,MAAM,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,OAAO,CAAC,iBAAiB,CAAC;YACxB,KAAK,EAAE,YAAY;SACpB,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;QAChD,UAAU,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,gBAAgB,EAAE,EAAE,CAAC,CAAA;QACjE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACpC,MAAM,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,CAAA;IAC5D,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,EAAE,CACrC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,OAAO,SAAS,EAAE,CAAC,CAChD,CAAA;QAED,MAAM,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;QAChD,MAAM,KAAK,GAAG,IAAI,gBAAgB,EAAE,CAAA;QACpC,UAAU,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QACzC,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACzD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QACnD,MAAM,CAAC,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC,uCAAuC;QACtF,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QACpD,MAAM,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAChE,MAAM,CAAC,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAE9C,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAC9D,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QACxD,MAAM,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAChE,MAAM,CAAC,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,EAAE,CACrC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,OAAO,SAAS,EAAE,CAAC,CAChD,CAAA;QAED,MAAM,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;QAChD,MAAM,KAAK,GAAG,IAAI,gBAAgB,EAAE,CAAA;QACpC,UAAU,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QACzC,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACnD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACpD,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAExD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnD,YAAY;YACZ,aAAa;YACb,gBAAgB;SACjB,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAC7C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QACjD,MAAM,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"url-management.test.js","sourceRoot":"","sources":["../../src/datasources/url-management.test.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -1,14 +1,14 @@
 import type { IResolvers } from '@graphql-tools/utils';
-import { dataSources, DataSources } from './datasources/index.js';
+import { initDataSources, DataSources } from './datasources/index.js';
 import type { Metrics } from 'next-metrics';
 import type { Logger } from '@dotcom-reliability-kit/logger';
-export declare type QueryContext = {
+export interface QueryContext {
     metrics: Metrics;
     dataSources: DataSources;
     systemCode: string;
     requestId?: string;
     logger: Logger;
-};
+}
 export declare const resolvers: IResolvers<unknown, Pick<QueryContext, 'dataSources'>>;
 export declare const typeDefs: (import("graphql").DocumentNode | import("graphql").DocumentNode[])[];
-export { dataSources, DataSources };
+export { initDataSources, DataSources };

package/lib/index.js

@@ -1,5 +1,5 @@
 import { gql } from 'graphql-tag';
-import { dataSources } from './datasources/index.js';
+import { initDataSources } from './datasources/index.js';
 import { typeDef as Content, resolvers as contentResolvers } from './content.js';
 import { typeDef as Concept, resolvers as conceptResolvers } from './concept.js';
 import { typeDef as Picture, resolvers as pictureResolvers } from './picture.js';
@@ -51,5 +51,5 @@ export const typeDefs = [
     Tag,
     coreTypeDefs,
 ];
-export { dataSources };
+export { initDataSources };
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAE,WAAW,EAAe,MAAM,wBAAwB,CAAA;AAEjE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,EACL,OAAO,IAAI,QAAQ,EACnB,SAAS,IAAI,iBAAiB,GAC/B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,SAAS,IAAI,oBAAoB,GAClC,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,OAAO,IAAI,GAAG,EACd,eAAe,IAAI,SAAS,EAC5B,SAAS,IAAI,YAAY,GAC1B,MAAM,iBAAiB,CAAA;AAIxB,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAUD,MAAM,CAAC,MAAM,SAAS,GAGlB;IACF,KAAK,EAAE;QACL,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YACjC,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,CAAC;QACD,eAAe,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE;YAC5B,OAAO,OAAO,CAAA;QAChB,CAAC;KACF;IAED,SAAS,EAAE;QACT,aAAa,CAAC,GAAsC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAA;QAC7B,CAAC;KACF;IAED,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,cAAc;IACjB,GAAG,YAAY;IACf,GAAG,eAAe;IAClB,GAAG,iBAAiB;IACpB,GAAG,oBAAoB;CACxB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,WAAW;IACX,SAAS;IACT,GAAG;IACH,YAAY;CACb,CAAA;AAED,OAAO,EAAE,WAAW,EAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAE,eAAe,EAAe,MAAM,wBAAwB,CAAA;AAErE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,EACL,OAAO,IAAI,QAAQ,EACnB,SAAS,IAAI,iBAAiB,GAC/B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,SAAS,IAAI,oBAAoB,GAClC,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,OAAO,IAAI,GAAG,EACd,eAAe,IAAI,SAAS,EAC5B,SAAS,IAAI,YAAY,GAC1B,MAAM,iBAAiB,CAAA;AAIxB,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAUD,MAAM,CAAC,MAAM,SAAS,GAGlB;IACF,KAAK,EAAE;QACL,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YACjC,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,CAAC;QACD,eAAe,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE;YAC5B,OAAO,OAAO,CAAA;QAChB,CAAC;KACF;IAED,SAAS,EAAE;QACT,aAAa,CAAC,GAAsC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAA;QAC7B,CAAC;KACF;IAED,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,cAAc;IACjB,GAAG,YAAY;IACf,GAAG,eAAe;IAClB,GAAG,iBAAiB;IACpB,GAAG,oBAAoB;CACxB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,WAAW;IACX,SAAS;IACT,GAAG;IACH,YAAY;CACb,CAAA;AAED,OAAO,EAAE,eAAe,EAAe,CAAA"}

package/lib/model/CapiResponse.d.ts

@@ -29,7 +29,7 @@ export declare class CapiResponse {
     alternativeStandfirst(): string | undefined;
     overrideTitle(title: string): CapiResponse;
     teaserMetadata(field: MetaFields): string | Concept | undefined;
-    teaser(title: string | undefined): CapiResponse;
+    teaser(): CapiResponse;
     isEditorsChoice(): boolean;
     isExclusive(): boolean;
     isScoop(): boolean;

package/lib/model/CapiResponse.js

@@ -94,11 +94,8 @@ export class CapiResponse {
             return new Concept(metaField, this.context);
         }
     }
-    teaser(title) {
-        const clone = structuredClone(this.capiData);
-        if (title) {
-            clone.title = title;
-        }
+    teaser() {
+        const clone = cloneDeep(this.capiData);
         return new CapiResponse(clone, this.context);
     }
     isEditorsChoice() {
@@ -137,7 +134,7 @@ export class CapiResponse {
         }
     }
     rawCapiData() {
-        return structuredClone(this.capiData);
+        return cloneDeep(this.capiData);
     }
     getAuthorUrlMapping() {
         const authorAnnotations = this.getAuthors();

package/lib/model/CapiResponse.js.map

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

package/lib/types/cache.d.ts

@@ -0,0 +1,10 @@
+import { KeyValueCache } from '@apollo/utils.keyvaluecache';
+import { QueryContext } from '../index.js';
+interface CacheWithContext<TContext extends QueryContext> extends KeyValueCache {
+    context?: TContext;
+}
+interface ContextableCache<TContext extends QueryContext> {
+    withContext(context: TContext): CacheWithContext<TContext>;
+}
+export declare function isContextableCache<TContext extends QueryContext>(cache: any): cache is ContextableCache<TContext>;
+export {};

package/lib/types/cache.js

@@ -0,0 +1,4 @@
+export function isContextableCache(cache) {
+    return 'withContext' in cache;
+}
+//# sourceMappingURL=cache.js.map

package/lib/types/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/types/cache.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,kBAAkB,CAChC,KAAU;IAEV,OAAO,aAAa,IAAI,KAAK,CAAA;AAC/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "",
   "main": "lib/index.js",
   "type": "module",
@@ -19,14 +19,14 @@
   },
   "homepage": "https://github.com/Financial-Times/cp-content-pipeline#readme",
   "dependencies": {
+    "@apollo/datasource-rest": "^4.3.2",
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "@dotcom-reliability-kit/serialize-request": "^1.0.4",
     "@financial-times/n-concept-ids": "^1.21.0",
     "@financial-times/n-display-metadata": "^1.1.1",
     "@financial-times/n-url-management-api-read-client": "^7.0.0",
     "@graphql-tools/utils": "^8.12.0",
     "@types/clone-deep": "^4.0.1",
-    "apollo-datasource-rest": "^3.6.1",
-    "apollo-server-caching": "^3.3.0",
     "clone-deep": "^4.0.1",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
@@ -39,6 +39,7 @@
     "unist-util-visit": "^4.1.1"
   },
   "devDependencies": {
+    "@apollo/utils.fetcher": "^1.1.1",
     "@dotcom-reliability-kit/logger": "^0.1.0",
     "@dotcom-tool-kit/npm": "^2.0.9",
     "@types/graphql": "^14.5.0",

package/src/concept.ts

@@ -7,7 +7,7 @@ export const typeDef = gql`
   type Concept {
     apiUrl: String!
     directType: String
-    id: String!
+    id: ID!
     predicate: String!
     prefLabel: String!
     type: String!
@@ -20,7 +20,7 @@ export const resolvers: IResolvers<Concept, QueryContext, never> = {
   Concept: {
     apiUrl: (parent: Concept) => parent.apiUrl(),
     directType: (parent: Concept) => parent.directType(),
-    id: (parent: Concept) => parent.id(),
+    id: (parent: Concept) => parent.uuid(),
     predicate: (parent: Concept) => parent.predicate(),
     prefLabel: (parent: Concept) => parent.prefLabel(),
     type: (parent: Concept) => parent.type(),