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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 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)
 
 

package/lib/datasources/capi.d.ts

@@ -1,7 +1,8 @@
-import { RESTDataSource, RequestOptions } from 'apollo-datasource-rest';
+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 RESTDataSource {
+export declare class CapiDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     capiKey: string;
     articleCacheTTL: number;

package/lib/datasources/capi.js

@@ -1,6 +1,6 @@
-import { RESTDataSource } from 'apollo-datasource-rest';
 import { CapiResponse } from '../model/CapiResponse.js';
-export class CapiDataSource extends RESTDataSource {
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export class CapiDataSource extends InstrumentedRESTDataSource {
     constructor() {
         super(...arguments);
         this.baseURL = process.env.CAPI_URL || 'https://api-t.ft.com/';
@@ -13,6 +13,7 @@ export class CapiDataSource extends RESTDataSource {
             : 600; // 10 minutes
     }
     willSendRequest(request) {
+        super.willSendRequest(request);
         request.headers.set('x-api-key', this.capiKey);
     }
     async getContent(uuid) {

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;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,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,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;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/index.d.ts

@@ -1,7 +1,9 @@
 import type { IResolvers } from '@graphql-tools/utils';
 import { DocumentNode } from 'graphql';
 import { dataSources, DataSources } from './datasources/index.js';
+import type { Metrics } from 'next-metrics';
 export declare type QueryContext = {
+    metrics: Metrics;
     dataSources: DataSources;
     systemCode: string;
 };

package/lib/index.js

@@ -7,7 +7,7 @@ import { typeDef as Image, resolvers as imageResolvers } from './image.js';
 import { typeDef as Topper, resolvers as topperResolvers } from './topper.js';
 import { typeDef as RichText, resolvers as richTextResolvers, } from './richText.js';
 import { typeDef as Recommended, resolvers as recommendedResolvers, } from './teaser.js';
-import tags from './tags.js';
+import tags from './tags/index.js';
 const tagEntries = Object.entries(tags);
 const tagsWithReferences = tagEntries.filter(([_key, tag]) => tag.typeDef);
 const tagTypeDefs = tagsWithReferences.flatMap(([_key, tag]) => tag.typeDef);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,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,IAAI,MAAM,WAAW,CAAA;AAE5B,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACvC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC1E,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAC5C,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CAC7C,CAAA;AACD,MAAM,SAAS,GAAG,GAAG,CAAA,qBAAqB,kBAAkB;KACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;KACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;AAEhB,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAC9E,CAAA;AAED,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAOD,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,WAAW;IACX,YAAY;CACb,CAAA;AAED,OAAO,EAAE,WAAW,EAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,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,IAAI,MAAM,iBAAiB,CAAA;AAGlC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACvC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC1E,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAC5C,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CAC7C,CAAA;AACD,MAAM,SAAS,GAAG,GAAG,CAAA,qBAAqB,kBAAkB;KACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;KACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;AAEhB,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAC9E,CAAA;AAED,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAQD,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,WAAW;IACX,YAAY;CACb,CAAA;AAED,OAAO,EAAE,WAAW,EAAe,CAAA"}

package/lib/tags/ImageSet.d.ts

@@ -0,0 +1,2 @@
+import type { TagConstructor } from './index.js';
+export declare const ImageSet: TagConstructor;

package/lib/tags/ImageSet.js

@@ -0,0 +1,24 @@
+var _a;
+import { gql } from 'graphql-tag';
+import { uuidFromUrl } from '../helpers/metadata.js';
+export const ImageSet = (_a = class ImageSet {
+        constructor(node, contentApiData) {
+            var _a, _b, _c;
+            this.url = '';
+            if (typeof ((_a = node === null || node === void 0 ? void 0 : node.properties) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+                this.url = (_b = node.properties.url) !== null && _b !== void 0 ? _b : '';
+            }
+            this.imageSet = (_c = contentApiData === null || contentApiData === void 0 ? void 0 : contentApiData.embeds()) === null || _c === void 0 ? void 0 : _c.find((embed) => uuidFromUrl(embed.id) === uuidFromUrl(this.url));
+        }
+    },
+    _a.selector = 'ft-content[type="http://www.ft.com/ontology/content/ImageSet"]',
+    _a.resolve = {
+        picture: (parent) => parent.imageSet,
+    },
+    _a.typeDef = gql `
+    type ImageSet {
+      picture: Picture!
+    }
+  `,
+    _a);
+//# sourceMappingURL=ImageSet.js.map

package/lib/tags/ImageSet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageSet.js","sourceRoot":"","sources":["../../src/tags/ImageSet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAMpD,MAAM,CAAC,MAAM,QAAQ,SAAmB,MAAM,QAAQ;QAMpD,YAAY,IAAkB,EAAE,cAA6B;;YAF7D,QAAG,GAAG,EAAE,CAAA;YAGN,IAAI,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,0CAAE,GAAG,CAAA,KAAK,QAAQ,EAAE;gBAC7C,IAAI,CAAC,GAAG,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,GAAG,mCAAI,EAAE,CAAA;aACrC;YAED,IAAI,CAAC,QAAQ,GAAG,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAC1B,MAAM,EAAE,0CACR,IAAI,CACJ,CAAC,KAAmB,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CACzE,CAAA;QACL,CAAC;KAWF;IA1BQ,WAAQ,GACb,gEAAgE;IAgB3D,UAAO,GAAG;QACf,OAAO,EAAE,CAAC,MAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ;KAC/C;IAEM,UAAO,GAAG,GAAG,CAAA;;;;GAInB;OACF,CAAA"}

package/lib/tags/LayoutImage.d.ts

@@ -0,0 +1,2 @@
+import type { TagConstructor } from './index.js';
+export declare const LayoutImage: TagConstructor;

package/lib/tags/LayoutImage.js

@@ -0,0 +1,42 @@
+var _a;
+import { gql } from 'graphql-tag';
+import { uuidFromUrl } from '../helpers/metadata.js';
+export const LayoutImage = (_a = class LayoutImage {
+        constructor(node) {
+            var _a, _b, _c, _d;
+            this.src = (_a = node.properties) === null || _a === void 0 ? void 0 : _a.src;
+            this.id = uuidFromUrl(this.src) || '';
+            this.alt = (_b = node.properties) === null || _b === void 0 ? void 0 : _b.alt;
+            this.longDesc = (_c = node.properties) === null || _c === void 0 ? void 0 : _c.longDesc;
+            this.copyright = (_d = node.properties) === null || _d === void 0 ? void 0 : _d.dataCopyright;
+        }
+    },
+    _a.selector = 'img',
+    _a.resolve = {
+        picture(parent) {
+            return {
+                id: 'layout-imageset',
+                description: parent.alt,
+                type: 'http://www.ft.com/ontology/content/ImageSet',
+                members: [
+                    {
+                        id: parent.id,
+                        description: parent.alt,
+                        title: parent.longDesc,
+                        binaryUrl: parent.src,
+                        copyright: {
+                            notice: parent.copyright,
+                        },
+                        type: 'http://www.ft.com/ontology/content/Image',
+                    },
+                ],
+            };
+        },
+    },
+    _a.typeDef = gql `
+    type LayoutImage {
+      picture: Picture!
+    }
+  `,
+    _a);
+//# sourceMappingURL=LayoutImage.js.map

package/lib/tags/LayoutImage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LayoutImage.js","sourceRoot":"","sources":["../../src/tags/LayoutImage.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAKpD,MAAM,CAAC,MAAM,WAAW,SAAmB,MAAM,WAAW;QAS1D,YAAY,IAAkB;;YAC5B,IAAI,CAAC,GAAG,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,GAAa,CAAA;YACzC,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;YACrC,IAAI,CAAC,GAAG,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,GAAa,CAAA;YACzC,IAAI,CAAC,QAAQ,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,QAAkB,CAAA;YACnD,IAAI,CAAC,SAAS,GAAG,MAAA,IAAI,CAAC,UAAU,0CAAE,aAAuB,CAAA;QAC3D,CAAC;KA6BF;IA3CQ,WAAQ,GAAG,KAAK;IAgBhB,UAAO,GAAG;QACf,OAAO,CAAC,MAAmB;YACzB,OAAO;gBACL,EAAE,EAAE,iBAAiB;gBACrB,WAAW,EAAE,MAAM,CAAC,GAAG;gBACvB,IAAI,EAAE,6CAA6C;gBACnD,OAAO,EAAE;oBACP;wBACE,EAAE,EAAE,MAAM,CAAC,EAAE;wBACb,WAAW,EAAE,MAAM,CAAC,GAAG;wBACvB,KAAK,EAAE,MAAM,CAAC,QAAQ;wBACtB,SAAS,EAAE,MAAM,CAAC,GAAG;wBACrB,SAAS,EAAE;4BACT,MAAM,EAAE,MAAM,CAAC,SAAS;yBACzB;wBACD,IAAI,EAAE,0CAA0C;qBACjD;iBACF;aACF,CAAA;QACH,CAAC;KACF;IAEM,UAAO,GAAG,GAAG,CAAA;;;;GAInB;OACF,CAAA"}

package/lib/tags/Link.d.ts

@@ -0,0 +1,2 @@
+import type { TagConstructor } from './index.js';
+export declare const Link: TagConstructor;

package/lib/tags/Link.js

@@ -0,0 +1,21 @@
+var _a;
+import { gql } from 'graphql-tag';
+export const Link = (_a = class Link {
+        constructor(node) {
+            var _a, _b;
+            if (typeof ((_a = node === null || node === void 0 ? void 0 : node.properties) === null || _a === void 0 ? void 0 : _a.href) === 'string') {
+                this.href = (_b = node.properties.href) !== null && _b !== void 0 ? _b : '';
+            }
+            else {
+                this.href = '';
+            }
+        }
+    },
+    _a.selector = 'a',
+    _a.typeDef = gql `
+    type Link {
+      href: String
+    }
+  `,
+    _a);
+//# sourceMappingURL=Link.js.map

package/lib/tags/Link.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../src/tags/Link.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,IAAI,SAAmB,MAAM,IAAI;QAK5C,YAAY,IAAkB;;YAC5B,IAAI,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,0CAAE,IAAI,CAAA,KAAK,QAAQ,EAAE;gBAC9C,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,mCAAI,EAAE,CAAA;aACvC;iBAAM;gBACL,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;aACf;QACH,CAAC;KAOF;IAfQ,WAAQ,GAAG,GAAG;IAUd,UAAO,GAAG,GAAG,CAAA;;;;GAInB;OACF,CAAA"}

package/lib/tags/PullQuote.d.ts

@@ -0,0 +1,2 @@
+import type { TagConstructor } from './index.js';
+export declare const PullQuote: TagConstructor;

package/lib/tags/PullQuote.js

@@ -0,0 +1,25 @@
+var _a;
+import { select } from 'hast-util-select';
+import { toText } from 'hast-util-to-text';
+import { gql } from 'graphql-tag';
+export const PullQuote = (_a = class PullQuote {
+        constructor(node) {
+            const textNode = select('PullQuoteText', node);
+            const sourceNode = select('PullQuoteSource', node);
+            this.text = textNode && toText(textNode);
+            this.source = sourceNode && toText(sourceNode);
+        }
+    },
+    _a.selector = 'pull-quote',
+    _a.resolve = {
+        text: (parent) => parent.text,
+        source: (parent) => parent.source || null,
+    },
+    _a.typeDef = gql `
+    type PullQuote {
+      text: String
+      source: String
+    }
+  `,
+    _a);
+//# sourceMappingURL=PullQuote.js.map

package/lib/tags/PullQuote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PullQuote.js","sourceRoot":"","sources":["../../src/tags/PullQuote.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,SAAS,SAAmB,MAAM,SAAS;QAMtD,YAAY,IAAkB;YAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;YAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;YAElD,IAAI,CAAC,IAAI,GAAG,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAA;YACxC,IAAI,CAAC,MAAM,GAAG,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,CAAA;QAChD,CAAC;KAaF;IArBQ,WAAQ,GAAG,YAAY;IAUvB,UAAO,GAAG;QACf,IAAI,EAAE,CAAC,MAAiB,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI;QACxC,MAAM,EAAE,CAAC,MAAiB,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI;KACrD;IAEM,UAAO,GAAG,GAAG,CAAA;;;;;GAKnB;OACF,CAAA"}

package/lib/tags/Recommended.d.ts

@@ -0,0 +1,2 @@
+import type { TagConstructor } from './index.js';
+export declare const Recommended: TagConstructor;

package/lib/tags/Recommended.js

@@ -0,0 +1,39 @@
+var _a;
+import { select } from 'hast-util-select';
+import { toText } from 'hast-util-to-text';
+import { gql } from 'graphql-tag';
+import { uuidFromUrl } from '../helpers/metadata.js';
+export const Recommended = (_a = class Recommended {
+        constructor(node) {
+            var _a;
+            const ftContent = select('ft-content', node);
+            const recommendedTitle = select('RecommendedTitle', node);
+            if (((_a = ftContent === null || ftContent === void 0 ? void 0 : ftContent.properties) === null || _a === void 0 ? void 0 : _a.url) !== undefined &&
+                typeof ftContent.properties.url === 'string') {
+                this.uuid = uuidFromUrl(ftContent.properties.url);
+            }
+            else {
+                this.uuid = '';
+            }
+            this.title = recommendedTitle ? toText(recommendedTitle) : 'Recommended';
+            this.teaserTitleOverride = ftContent ? toText(ftContent) : null;
+        }
+    },
+    _a.selector = 'recommended',
+    _a.resolve = {
+        teaser: async (parent, args, context) => {
+            let content = await context.dataSources.capi.getContent(parent.uuid);
+            if (parent.teaserTitleOverride) {
+                content = content.overrideTitle(parent.teaserTitleOverride);
+            }
+            return content;
+        },
+    },
+    _a.typeDef = gql `
+    type Recommended {
+      teaser: Teaser!
+      title: String!
+    }
+  `,
+    _a);
+//# sourceMappingURL=Recommended.js.map

package/lib/tags/Recommended.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Recommended.js","sourceRoot":"","sources":["../../src/tags/Recommended.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAIpD,MAAM,CAAC,MAAM,WAAW,SAAmB,MAAM,WAAW;QAO1D,YAAY,IAAkB;;YAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;YAC5C,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YACzD,IACE,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,0CAAE,GAAG,MAAK,SAAS;gBACxC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,KAAK,QAAQ,EAC5C;gBACA,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;aAClD;iBAAM;gBACL,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;aACf;YAED,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;YACxE,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACjE,CAAC;KAoBF;IApCQ,WAAQ,GAAG,aAAa;IAkBxB,UAAO,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,MAAmB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YACnD,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAEpE,IAAI,MAAM,CAAC,mBAAmB,EAAE;gBAC9B,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;aAC5D;YAED,OAAO,OAAO,CAAA;QAChB,CAAC;KACF;IAEM,UAAO,GAAG,GAAG,CAAA;;;;;GAKnB;OACF,CAAA"}

package/lib/{tags.d.ts → tags/index.d.ts}

@@ -1,11 +1,11 @@
 import type * as hast from 'hast';
 import type { IObjectTypeResolver } from '@graphql-tools/utils';
 import type { DocumentNode } from 'graphql';
-import { CapiResponse } from './model/CapiResponse.js';
+import type { CapiResponse } from '../model/CapiResponse.js';
 export declare type Tag = object;
-interface TagConstructor {
+export interface TagConstructor {
     new (node: hast.Element, contentApiData?: CapiResponse): Tag;
-    match(node: hast.Element): boolean;
+    selector: string;
     typeDef?: DocumentNode;
     resolve?: IObjectTypeResolver;
 }

package/lib/tags/index.js

@@ -0,0 +1,33 @@
+import { Link } from './Link.js';
+import { LayoutImage } from './LayoutImage.js';
+import { ImageSet } from './ImageSet.js';
+import { PullQuote } from './PullQuote.js';
+import { Recommended } from './Recommended.js';
+function createTagWithoutReference(name, selector) {
+    var _a;
+    const tag = (_a = class {
+        },
+        _a.selector = selector,
+        _a);
+    Object.defineProperty(tag, 'name', { value: name });
+    return tag;
+}
+const mapping = {
+    Link,
+    Experimental: createTagWithoutReference('Experimental', 'experimental'),
+    ImageSet,
+    Recommended,
+    RecommendedTitle: createTagWithoutReference('RecommendedTitle', 'recommended-title'),
+    Paragraph: createTagWithoutReference('Paragraph', 'p'),
+    UnorderedList: createTagWithoutReference('UnorderedList', 'ul'),
+    ListItem: createTagWithoutReference('ListItem', 'li'),
+    Layout: createTagWithoutReference('Layout', '.n-content-layout, .layout'),
+    LayoutContainer: createTagWithoutReference('LayoutContainer', '.n-content-layout__container, .layout-container'),
+    LayoutSlot: createTagWithoutReference('LayoutSlot', '.n-content-layout__slot, .layout-slot'),
+    LayoutImage,
+    PullQuote,
+    PullQuoteText: createTagWithoutReference('PullQuoteText', 'pull-quote-text'),
+    PullQuoteSource: createTagWithoutReference('PullQuoteText', 'pull-quote-source'),
+};
+export default mapping;
+//# sourceMappingURL=index.js.map

package/lib/tags/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tags/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAW9C,SAAS,yBAAyB,CAChC,IAAY,EACZ,QAAgB;;IAEhB,MAAM,GAAG,SAAG;SAEX;QADQ,WAAQ,GAAG,QAAQ;WAC3B,CAAA;IAED,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAEnD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,OAAO,GAAmC;IAC9C,IAAI;IACJ,YAAY,EAAE,yBAAyB,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,QAAQ;IACR,WAAW;IACX,gBAAgB,EAAE,yBAAyB,CACzC,kBAAkB,EAClB,mBAAmB,CACpB;IACD,SAAS,EAAE,yBAAyB,CAAC,WAAW,EAAE,GAAG,CAAC;IACtD,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,IAAI,CAAC;IAC/D,QAAQ,EAAE,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC;IACrD,MAAM,EAAE,yBAAyB,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACzE,eAAe,EAAE,yBAAyB,CACxC,iBAAiB,EACjB,iDAAiD,CAClD;IACD,UAAU,EAAE,yBAAyB,CACnC,YAAY,EACZ,uCAAuC,CACxC;IACD,WAAW;IACX,SAAS;IACT,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAC5E,eAAe,EAAE,yBAAyB,CACxC,eAAe,EACf,mBAAmB,CACpB;CACF,CAAA;AAED,eAAe,OAAO,CAAA"}

package/lib/unified-plugins/extract-references.js

@@ -1,5 +1,5 @@
 import { visit } from 'unist-util-visit';
-import tags from '../tags.js';
+import tags from '../tags/index.js';
 function isHastElement(element) {
     return element.type === 'element';
 }

package/lib/unified-plugins/extract-references.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-references.js","sourceRoot":"","sources":["../../src/unified-plugins/extract-references.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAKxC,OAAO,IAAa,MAAM,YAAY,CAAA;AAEtC,SAAS,aAAa,CAAC,OAAa;IAClC,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAA;AACnC,CAAC;AAED,SAAS,iBAAiB,CAAC,EACzB,cAAc,GAGf;IACC,OAAO;QACL,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,CAAC,IAAa,EAAE,EAAE;YACvB,MAAM,UAAU,GAAU,EAAE,CAAA;YAE5B,IAAI,EAAE,GAAG,CAAC,CAAA;YACV,KAAK,CACH,IAAI,EACJ,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;oBACvB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;oBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;oBACzB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;iBACrD;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;oBACvB,IAAI,IAAI,CAAC,UAAU,EAAE;wBACnB,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,EAAE,EAAE,CAAA;qBACvC;yBAAM;wBACL,IAAI,CAAC,UAAU,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,CAAA;qBAC5C;oBAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAA;iBAC/C;YACH,CAAC,CACF,CAAA;YACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC9B,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"extract-references.js","sourceRoot":"","sources":["../../src/unified-plugins/extract-references.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAKxC,OAAO,IAAa,MAAM,kBAAkB,CAAA;AAE5C,SAAS,aAAa,CAAC,OAAa;IAClC,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAA;AACnC,CAAC;AAED,SAAS,iBAAiB,CAAC,EACzB,cAAc,GAGf;IACC,OAAO;QACL,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,CAAC,IAAa,EAAE,EAAE;YACvB,MAAM,UAAU,GAAU,EAAE,CAAA;YAE5B,IAAI,EAAE,GAAG,CAAC,CAAA;YACV,KAAK,CACH,IAAI,EACJ,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;oBACvB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;oBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;oBACzB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;iBACrD;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;oBACvB,IAAI,IAAI,CAAC,UAAU,EAAE;wBACnB,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,EAAE,EAAE,CAAA;qBACvC;yBAAM;wBACL,IAAI,CAAC,UAAU,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,CAAA;qBAC5C;oBAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAA;iBAC/C;YACH,CAAC,CACF,CAAA;YACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC9B,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED,eAAe,iBAAiB,CAAA"}

package/lib/unified-plugins/map-to-abstract-types.js

@@ -1,10 +1,11 @@
 import { visit } from 'unist-util-visit';
-import tags from '../tags.js';
+import { matches } from 'hast-util-select';
+import tags from '../tags/index.js';
 const mapToAbstractTypes = function () {
     return (tree) => {
         visit(tree, (node) => {
             if (isHastElement(node)) {
-                const mappedTag = Object.keys(tags).find((tag) => tags[tag].match(node));
+                const mappedTag = Object.keys(tags).find((tag) => matches(tags[tag].selector, node));
                 node.tagName = mappedTag || node.tagName;
             }
         });

package/lib/unified-plugins/map-to-abstract-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-to-abstract-types.js","sourceRoot":"","sources":["../../src/unified-plugins/map-to-abstract-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAGxC,OAAO,IAAI,MAAM,YAAY,CAAA;AAE7B,MAAM,kBAAkB,GAAiC;IACvD,OAAO,CAAC,IAAa,EAAE,EAAE;QACvB,KAAK,CAAC,IAAI,EAAE,CAAC,IAAS,EAAE,EAAE;YACxB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;gBACvB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;gBACxE,IAAI,CAAC,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,OAAO,CAAA;aACzC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,kBAAkB,CAAA;AAEjC,SAAS,aAAa,CAAC,OAAuB;IAC5C,OAAQ,OAAmB,CAAC,OAAO,KAAK,SAAS,CAAA;AACnD,CAAC"}
+{"version":3,"file":"map-to-abstract-types.js","sourceRoot":"","sources":["../../src/unified-plugins/map-to-abstract-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,IAAI,MAAM,kBAAkB,CAAA;AAEnC,MAAM,kBAAkB,GAAiC;IACvD,OAAO,CAAC,IAAa,EAAE,EAAE;QACvB,KAAK,CAAC,IAAI,EAAE,CAAC,IAAS,EAAE,EAAE;YACxB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;gBACvB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC/C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAClC,CAAA;gBACD,IAAI,CAAC,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,OAAO,CAAA;aACzC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,kBAAkB,CAAA;AAEjC,SAAS,aAAa,CAAC,OAAuB;IAC5C,OAAQ,OAAmB,CAAC,OAAO,KAAK,SAAS,CAAA;AACnD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "main": "lib/index.js",
   "type": "module",
@@ -40,6 +40,7 @@
   "devDependencies": {
     "@dotcom-tool-kit/npm": "^2.0.9",
     "@types/graphql": "^14.5.0",
-    "@types/hast": "^2.3.4"
+    "@types/hast": "^2.3.4",
+    "@types/next-metrics": "0.0.0"
   }
 }

package/src/datasources/capi.ts

@@ -1,8 +1,9 @@
-import { RESTDataSource, RequestOptions } from 'apollo-datasource-rest'
+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 class CapiDataSource extends RESTDataSource {
+export class CapiDataSource extends InstrumentedRESTDataSource {
   baseURL = process.env.CAPI_URL || 'https://api-t.ft.com/'
   capiKey = process.env.CAPI_API_KEY || ''
   articleCacheTTL = process.env.ARTICLE_CACHE_TTL
@@ -13,6 +14,7 @@ export class CapiDataSource extends RESTDataSource {
     : 600 // 10 minutes
 
   willSendRequest(request: RequestOptions) {
+    super.willSendRequest(request)
     request.headers.set('x-api-key', this.capiKey)
   }