@financial-times/cp-content-pipeline-schema 0.2.1 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.3.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.3.0...cp-content-pipeline-schema-v0.3.1) (2022-10-11)
+
+
+### Features
+
+* instrument REST datasources ([ce509a2](https://github.com/Financial-Times/cp-content-pipeline/commit/ce509a2f4bc91e6e9593ef21f7341a5e504727b4))
+* split restdatasource metrics by response status ([3c2356c](https://github.com/Financial-Times/cp-content-pipeline/commit/3c2356c12001bb6af30c5820111d21a6c7766588))
+
+## [0.3.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.2.1...cp-content-pipeline-schema-v0.3.0) (2022-10-11)
+
+
+### ⚠ BREAKING CHANGES
+
+* render byline as part of a new ArticleInfo component
+
+### Features
+
+* add pull-quotes ([b4cd5d6](https://github.com/Financial-Times/cp-content-pipeline/commit/b4cd5d65b8ae50c64e774ae55049e1d43c7b1c7e))
+* render byline as part of a new ArticleInfo component ([de58076](https://github.com/Financial-Times/cp-content-pipeline/commit/de580765ec5094252b23132b6b457003ca66c4fb))
+
+
+### Bug Fixes
+
+* implement min/max width resolvers ([8140aa2](https://github.com/Financial-Times/cp-content-pipeline/commit/8140aa27b39dbe89970a5f52a5c500546ec6d587))
+* show brand as displayConcept for opinion articles ([c86060e](https://github.com/Financial-Times/cp-content-pipeline/commit/c86060eea95d8ef632105e9a10deff16aab9ee0f))
+* show brand tags on fancy toppers with brands ([b3d4748](https://github.com/Financial-Times/cp-content-pipeline/commit/b3d4748c518e96200369abf5a8e9068e68580fc0))
+* support articles without bylines ([0996c75](https://github.com/Financial-Times/cp-content-pipeline/commit/0996c75f0452aa2fec8b4b1e5617f3246e16c915))
+* use image model for teaser image ([0eae6f8](https://github.com/Financial-Times/cp-content-pipeline/commit/0eae6f82f508369dd4384d24b2fc25cbd417af0e))
+* use wheat as 'auto' colour for fancy toppers ([dfb1eac](https://github.com/Financial-Times/cp-content-pipeline/commit/dfb1eac6b0948199d0cb41d71a05b857a4456dec))
+
 ## [0.2.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.2.0...cp-content-pipeline-schema-v0.2.1) (2022-09-27)
 
 

package/README.md

@@ -0,0 +1,57 @@
+# Schema
+
+## What is this?
+
+The GraphQL schema, data sources, and business logic for the content pipeline API. It is consumed by the
+[api package](../api) and not intended for use outside this project.
+
+## Usage
+
+```typescript
+import { ApolloServer } from 'apollo-server'
+import {
+    resolvers,
+    typeDefs,
+    dataSources,
+} from '@financial-times/cp-content-pipeline-schema'
+
+const server = new ApolloServer({
+    typeDefs,
+    resolvers,
+    dataSources,
+})
+```
+
+See the [api package entry point](../api/src/index.ts) for a more complex example.
+
+## How does it work?
+
+This package's exports are shown below. They are consumed by a GraphQL server framework:
+
+```typescript
+import {
+    resolvers,
+    typeDefs,
+    dataSources,
+    DataSources,
+    QueryContext,
+} from '@financial-times/cp-content-pipeline-schema'
+```
+
+The schema is a collection of type definitions that is exported as `typeDefs`. It defines the 'shape' of queries that
+are executed against our data.
+
+The schema is split into files at the root of the `src` directory and brought together in `src/index.ts` for export.
+
+Resolvers define the technique for fetching the types defined in the schema. The resolvers for each part of the schema
+are defined in the
+same file the schema definition is in. They are exported as `resolvers`.
+
+Data sources are used to fetch data from external sources, such as the content API. These are defined in the
+[data sources directory](src/datasources). Its type is exported as `DataSources`, its factory function is exported as
+`dataSources`.
+
+The `QueryContext` type defines the context object sent to each resolver function.
+
+The model contains the business logic gluing the data sources and resolvers together. It is defined in the
+[model](src/model) directory and consumed by the resolvers.

package/lib/concept.d.ts

@@ -1,7 +1,5 @@
 import { IResolvers } from '@graphql-tools/utils';
-import { DataSources } from './index.js';
+import type { QueryContext } from './index.js';
+import { Concept } from './model/Concept.js';
 export declare const typeDef: import("graphql").DocumentNode;
-export declare const resolvers: IResolvers<unknown, {
-    systemCode: string;
-    dataSources: DataSources;
-}, never>;
+export declare const resolvers: IResolvers<Concept, QueryContext, never>;

package/lib/concept.js

@@ -1,7 +1,4 @@
 import { gql } from 'graphql-tag';
-const CAPI_ID_PREFIX = /^https?:\/\/(?:www|api)\.ft\.com\/things?\//;
-const BASE_URL = 'https://www.ft.com/stream/';
-const FT_URL = 'https://www.ft.com';
 export const typeDef = gql `
   type Concept {
     apiUrl: String!
@@ -16,24 +13,14 @@ export const typeDef = gql `
 `;
 export const resolvers = {
     Concept: {
-        async url(parent, args = { vanity: false, relative: false }, context) {
-            let url = parent.id.replace(CAPI_ID_PREFIX, BASE_URL);
-            if (args.vanity) {
-                try {
-                    const vanity = await context.dataSources.vanityUrls.get(url);
-                    if (vanity !== null) {
-                        url = vanity;
-                    }
-                }
-                catch (err) {
-                    //TODO:AG:26-09-2022 log error here, but fail gracefully to use non-vanity
-                }
-            }
-            if (args.relative) {
-                url = url.replace(FT_URL, '');
-            }
-            return url;
-        },
+        apiUrl: (parent) => parent.apiUrl(),
+        directType: (parent) => parent.directType(),
+        id: (parent) => parent.id(),
+        predicate: (parent) => parent.predicate(),
+        prefLabel: (parent) => parent.prefLabel(),
+        type: (parent) => parent.type(),
+        types: (parent) => parent.types(),
+        url: async (parent, args, context) => parent.url(args),
     },
 };
 //# sourceMappingURL=concept.js.map

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;AAGjC,MAAM,cAAc,GAAG,6CAA6C,CAAA;AACpE,MAAM,QAAQ,GAAG,4BAA4B,CAAA;AAC7C,MAAM,MAAM,GAAG,oBAAoB,CAAA;AAOnC,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA;;;;;;;;;;;CAWzB,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAIlB;IACF,OAAO,EAAE;QACP,KAAK,CAAC,GAAG,CACP,MAAsB,EACtB,OAAqB,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EACvD,OAAO;YAEP,IAAI,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;YAErD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI;oBACF,MAAM,MAAM,GACV,MAAM,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;oBAC/C,IAAI,MAAM,KAAK,IAAI,EAAE;wBACnB,GAAG,GAAG,MAAM,CAAA;qBACb;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,0EAA0E;iBAC3E;aACF;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;aAC9B;YACD,OAAO,GAAG,CAAA;QACZ,CAAC;KACF;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,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"}

package/lib/content.d.ts

@@ -1,55 +1,4 @@
-import type { InternalContent } from './types/internal-content.js';
+import { IResolvers } from '@graphql-tools/utils';
+import type { QueryContext } from './index.js';
 export declare const typeDef: import("graphql").DocumentNode[];
-export declare const resolvers: {
-    Content: {
-        body(parent: InternalContent): {
-            source: string;
-            value: string;
-            contentApiData: InternalContent;
-        };
-        topper(parent: InternalContent): InternalContent;
-        byline(parent: InternalContent): {
-            tree: {
-                type: string;
-                children: ({
-                    type: string;
-                    tagName: string;
-                    properties: {
-                        href: string;
-                    };
-                    children: {
-                        type: string;
-                        value: string;
-                    }[];
-                    value?: undefined;
-                } | {
-                    type: string;
-                    value: string;
-                    tagName?: undefined;
-                    properties?: undefined;
-                    children?: undefined;
-                })[];
-            };
-        };
-        metaLink(parent: InternalContent): any;
-        metaAltLink(parent: InternalContent): any;
-        metaPrefixText(parent: InternalContent): any;
-        metaSuffixText(parent: InternalContent): any;
-        url(parent: InternalContent, args: {
-            relative: boolean;
-        }): string;
-        type(parent: InternalContent): string;
-        mainImage(parent: InternalContent): import("./types/internal-content.js").Image | undefined;
-        altTitle(parent: InternalContent): string | undefined;
-        altStandfirst(parent: InternalContent): string | undefined;
-        indicators(parent: InternalContent): {
-            accessLevel: import("./types/internal-content.js").AccessLevel;
-            isOpinion: boolean;
-            isColumn: boolean;
-            isPodcast: boolean;
-            isEditorsChoice: boolean;
-            isExclusive: boolean;
-            isScoop: boolean;
-        };
-    };
-};
+export declare const resolvers: IResolvers<unknown, QueryContext, never>;

package/lib/content.js

@@ -1,8 +1,6 @@
 import { gql } from 'graphql-tag';
-import metadata from '@financial-times/n-display-metadata';
-import { getAuthorUrlMapping, isColumn, isEditorsChoice, isExclusive, isOpinion, isPodcast, isScoop, } from './helpers/metadata.js';
-import { buildUrlTree } from './helpers/syntaxTree.js';
-import { splitBylineByName } from './helpers/byline.js';
+import { Topper } from './model/Topper.js';
+import { Byline } from './model/Byline.js';
 export const typeDef = [
     gql `
     type Content {
@@ -16,30 +14,11 @@ export const typeDef = [
       url(relative: Boolean): String!
       publishedDate: String!
       firstPublishedDate: String!
-      metaLink: Concept
-      metaAltLink: Concept
-      metaPrefixText: String
-      metaSuffixText: String
       mainImage: Image
-      indicators: Indicators!
       altTitle: AltTitle
       altStandfirst: AltStandfirst
-      byline: StructuredContent!
-    }
-    type Indicators {
-      accessLevel: AccessLevel
-      isOpinion: Boolean
-      isColumn: Boolean
-      isPodcast: Boolean
-      isEditorsChoice: Boolean
-      isExclusive: Boolean
-      isScoop: Boolean
-    }
-    enum AccessLevel {
-      premium
-      subscribed
-      registered
-      free
+      byline: StructuredContent
+      teaser: Teaser
     }
     type AltTitle {
       promotionalTitle: String
@@ -49,85 +28,29 @@ export const typeDef = [
     }
   `,
 ];
-function getTeaserMetadata(annotations, field) {
-    const meta = metadata.teaser({
-        annotations,
-    });
-    return meta[field];
-}
 export const resolvers = {
     Content: {
         body(parent) {
             return {
                 source: 'bodyXML',
-                value: parent.bodyXML,
+                value: parent.bodyXML(),
                 contentApiData: parent,
             };
         },
-        topper(parent) {
-            return parent;
-        },
+        topper: (parent, args, context) => new Topper(parent, context),
         byline(parent) {
-            const { annotations } = parent;
-            const authorUrlMapping = getAuthorUrlMapping(annotations);
-            const split = splitBylineByName(parent.byline, [
-                ...authorUrlMapping.keys(),
-            ]);
-            return buildUrlTree(authorUrlMapping, split);
-        },
-        metaLink(parent) {
-            return getTeaserMetadata(parent.annotations, 'link');
-        },
-        metaAltLink(parent) {
-            return getTeaserMetadata(parent.annotations, 'altLink');
-        },
-        metaPrefixText(parent) {
-            return getTeaserMetadata(parent.annotations, 'prefixText');
-        },
-        metaSuffixText(parent) {
-            return getTeaserMetadata(parent.annotations, 'suffixText');
-        },
-        url(parent, args) {
-            const RELATIVE_URL_REGEX = /https?:\/\/www.ft.com/;
-            if (args.relative) {
-                return parent.webUrl.replace(RELATIVE_URL_REGEX, '');
-            }
-            else {
-                return parent.webUrl;
-            }
-        },
-        type(parent) {
-            const TYPE_REGEX = /https?:\/\/www.ft.com\/ontology\/content\//;
-            return parent.types[0].replace(TYPE_REGEX, '').toLowerCase();
-        },
-        mainImage(parent) {
-            var _a, _b;
-            if (((_a = parent.mainImage) === null || _a === void 0 ? void 0 : _a.type) === 'http://www.ft.com/ontology/content/Image') {
-                return parent.mainImage;
-            }
-            else if (((_b = parent.mainImage) === null || _b === void 0 ? void 0 : _b.type) === 'http://www.ft.com/ontology/content/ImageSet') {
-                return parent.mainImage.members[0];
-            }
-        },
-        altTitle(parent) {
-            var _a;
-            return (_a = parent.alternativeTitles) === null || _a === void 0 ? void 0 : _a.promotionalTitle;
-        },
-        altStandfirst(parent) {
-            var _a;
-            return (_a = parent.alternativeStandfirsts) === null || _a === void 0 ? void 0 : _a.promotionalStandfirst;
-        },
-        indicators(parent) {
-            return {
-                accessLevel: parent.accessLevel,
-                isOpinion: isOpinion(parent),
-                isColumn: isColumn(parent),
-                isPodcast: isPodcast(parent),
-                isEditorsChoice: isEditorsChoice(parent),
-                isExclusive: isExclusive(parent),
-                isScoop: isScoop(parent),
-            };
-        },
+            const bylineText = parent.byline();
+            if (!bylineText)
+                return null;
+            const authorUrlMapping = parent.getAuthorUrlMapping();
+            return new Byline(bylineText, authorUrlMapping).buildBylineTree();
+        },
+        url: (parent, args) => args.relative ? parent.relativeUrl() : parent.url(),
+        type: (parent) => parent.type(),
+        mainImage: (parent) => parent.mainImage(),
+        altTitle: (parent) => parent.alternativeTitle(),
+        altStandfirst: (parent) => parent.alternativeStandfirst(),
+        publishedDate: (parent) => parent.publishedDate(),
     },
 };
 //# sourceMappingURL=content.js.map

package/lib/content.js.map

@@ -1 +1 @@
-{"version":3,"file":"content.js","sourceRoot":"","sources":["../src/content.ts"],"names":[],"mappings":"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"}
+{"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,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBF;CACF,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAA6C;IACjE,OAAO,EAAE;QACP,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;CACF,CAAA"}

package/lib/datasources/capi.d.ts

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

package/lib/datasources/capi.js

@@ -1,5 +1,6 @@
-import { RESTDataSource } from 'apollo-datasource-rest';
-export class CapiDataSource extends RESTDataSource {
+import { CapiResponse } from '../model/CapiResponse.js';
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export class CapiDataSource extends InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
         this.baseURL = process.env.CAPI_URL || 'https://api-t.ft.com/';
@@ -12,12 +13,13 @@ export class CapiDataSource extends RESTDataSource {
             : 600; // 10 minutes
     }
     willSendRequest(request) {
+        super.willSendRequest(request);
         request.headers.set('x-api-key', this.capiKey);
     }
     async getContent(uuid) {
         return this.get(`internalcontent/${uuid}`, undefined, {
             cacheOptions: { ttl: this.articleCacheTTL },
-        });
+        }).then((response) => new CapiResponse(response, this.context));
     }
     async getPerson(uuid) {
         return this.get(`people/${uuid}`, undefined, {

package/lib/datasources/capi.js.map

@@ -1 +1 @@
-{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,wBAAwB,CAAA;AAEvE,MAAM,OAAO,cAAe,SAAQ,cAAc;IAAlD;;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;IAiBvB,CAAC;IAfC,eAAe,CAAC,OAAuB;QACrC,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,CAAA;IACJ,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;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"}

package/lib/datasources/instrumented.d.ts

@@ -0,0 +1,7 @@
+import { Request, RequestOptions, Response, RESTDataSource } from 'apollo-datasource-rest';
+import { QueryContext } from '../index.js';
+export declare class InstrumentedRESTDataSource extends RESTDataSource<QueryContext> {
+    startTime?: bigint;
+    willSendRequest(request: RequestOptions): void;
+    didReceiveResponse<TResult>(response: Response, request: Request): Promise<TResult>;
+}

package/lib/datasources/instrumented.js

@@ -0,0 +1,18 @@
+import { RESTDataSource, } from 'apollo-datasource-rest';
+export class InstrumentedRESTDataSource extends RESTDataSource {
+    willSendRequest(request) {
+        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);
+    }
+    async didReceiveResponse(response, request) {
+        var _a, _b;
+        // this.startTime will definitely have been set by willSendRequest, but no way of encoding that in types
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const duration = (process.hrtime.bigint() - this.startTime) / BigInt(1e6);
+        (_a = this.context.metrics) === null || _a === void 0 ? void 0 : _a.count(`graphql.datasource.${this.constructor.name}.response.${response.status}.count`, 1);
+        (_b = this.context.metrics) === null || _b === void 0 ? void 0 : _b.count(`graphql.datasource.${this.constructor.name}.response.${response.status}.time`, Number(duration));
+        return super.didReceiveResponse(response, request);
+    }
+}
+//# sourceMappingURL=instrumented.js.map

package/lib/datasources/instrumented.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,GACf,MAAM,wBAAwB,CAAA;AAG/B,MAAM,OAAO,0BAA2B,SAAQ,cAA4B;IAG1E,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;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"}

package/lib/datasources/origami-image.d.ts

@@ -1,5 +1,5 @@
-import { RESTDataSource } from 'apollo-datasource-rest';
-export declare class OrigamiImageDataSource extends RESTDataSource {
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export declare class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     getImageMetadata(url: string): Promise<{
         width: number;

package/lib/datasources/origami-image.js

@@ -1,5 +1,5 @@
-import { RESTDataSource } from 'apollo-datasource-rest';
-export class OrigamiImageDataSource extends RESTDataSource {
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
         this.baseURL = 'https://www.ft.com/__origami/service/image/v2';

package/lib/datasources/origami-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEvD,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IAA1D;;QACE,YAAO,GAAG,+CAA+C,CAAA;IAM3D,CAAC;IALC,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,OAAO,IAAI,CAAC,GAAG,CAAC,oBAAoB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC5E,CAAC;CACF"}
+{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAE9D,MAAM,OAAO,sBAAuB,SAAQ,0BAA0B;IAAtE;;QACE,YAAO,GAAG,+CAA+C,CAAA;IAM3D,CAAC;IALC,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,OAAO,IAAI,CAAC,GAAG,CAAC,oBAAoB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC5E,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 { QueryContext } from '../index.js';
 export declare class URLManagementDataSource extends DataSource {
-    context: unknown;
+    context: QueryContext;
     cache: KeyValueCache;
     memoizedResults: Map<string, Promise<string>>;
     static clientInitialised: boolean;
-    constructor();
-    initialize({ context, cache, }: DataSourceConfig<unknown>): void;
+    initialize({ context, cache, }: DataSourceConfig<QueryContext>): void;
     get(fromURL: string, ttl?: number): Promise<string>;
 }

package/lib/datasources/url-management.js

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

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;AAEhG,OAAO,OAAO,MAAM,cAAc,CAAA;AAElC,MAAM,YAAY,GAAG,aAAa,CAAA;AAClC,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,CAAA,CAAC,WAAW;AAElD,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAMrD;QACE,KAAK,EAAE,CAAA;QAJT,oBAAe,GAAG,IAAI,GAAG,EAA2B,CAAA;QAMlD,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE;YAC9C,2BAA2B,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YAC7C,uBAAuB,CAAC,iBAAiB,GAAG,IAAI,CAAA;SACjD;IACH,CAAC;IAEQ,UAAU,CAAC,EAClB,OAAO,EACP,KAAK,GAAG,IAAI,gBAAgB,EAAE,GACJ;QAC1B,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;;AA5CM,yCAAiB,GAAG,KAAK,CAAA"}
+{"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"}

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

@@ -10,14 +10,21 @@ const nUrlManagementApiReadClient = await import('@financial-times/n-url-managem
 import { InMemoryLRUCache } from 'apollo-server-caching';
 import { jest } from '@jest/globals';
 const getMock = nUrlManagementApiReadClient.get;
+const context = {};
 describe('URL management data source', () => {
     beforeEach(() => {
         jest.resetAllMocks();
     });
     it('only initialises the client library once', async () => {
-        new URLManagementDataSource();
+        new URLManagementDataSource().initialize({
+            context,
+            cache: new InMemoryLRUCache(),
+        });
         expect(nUrlManagementApiReadClient.init).toHaveBeenCalledTimes(1);
-        new URLManagementDataSource();
+        new URLManagementDataSource().initialize({
+            context,
+            cache: new InMemoryLRUCache(),
+        });
         expect(nUrlManagementApiReadClient.init).toHaveBeenCalledTimes(1);
     });
     it('gets a vanity URL from the dynamodb database', async () => {
@@ -25,7 +32,7 @@ describe('URL management data source', () => {
             toURL: 'vanity.url',
         });
         const dataSource = new URLManagementDataSource();
-        dataSource.initialize({ context: null, cache: new InMemoryLRUCache() });
+        dataSource.initialize({ context, cache: new InMemoryLRUCache() });
         const vanity = await dataSource.get('original.url');
         expect(vanity).toEqual('vanity.url');
         expect(nUrlManagementApiReadClient.get).toHaveBeenCalled();
@@ -34,7 +41,7 @@ describe('URL management data source', () => {
         getMock.mockImplementation((fromUrl) => Promise.resolve({ toURL: `${fromUrl}.vanity` }));
         const dataSource = new URLManagementDataSource();
         const cache = new InMemoryLRUCache();
-        dataSource.initialize({ context: null, cache });
+        dataSource.initialize({ 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
@@ -51,7 +58,7 @@ describe('URL management data source', () => {
         getMock.mockImplementation((fromUrl) => Promise.resolve({ toURL: `${fromUrl}.vanity` }));
         const dataSource = new URLManagementDataSource();
         const cache = new InMemoryLRUCache();
-        dataSource.initialize({ context: null, cache });
+        dataSource.initialize({ 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":"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"}
+{"version":3,"file":"url-management.test.js","sourceRoot":"","sources":["../../src/datasources/url-management.test.ts"],"names":[],"mappings":"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"}

package/lib/fixtures/capiObject.d.ts

@@ -0,0 +1,2 @@
+import { InternalContent } from '../types/internal-content.js';
+export declare const baseCapiObject: InternalContent;