@financial-times/cp-content-pipeline-client 0.6.17 → 0.6.19

package/lib/generated/index.js

@@ -3,14 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSdk = exports.ArticleDocument = exports.ContentFragmentDoc = exports.DesignFragmentDoc = exports.StructuredContentFragmentDoc = exports.ArticleReferencesFragmentDoc = exports.ScrollyImageFragmentDoc = exports.MainImageFragmentDoc = exports.RawImageFragmentDoc = exports.FlourishFragmentDoc = exports.VideoFragmentDoc = exports.TweetFragmentDoc = exports.LayoutImageFragmentDoc = exports.ImageSetFragmentDoc = exports.PictureFragmentDoc = exports.PictureFieldsFragmentDoc = exports.RecommendedFragmentDoc = exports.TeaserFragmentDoc = exports.TopperFragmentDoc = exports.ImageFragmentDoc = exports.ImageSourceFragmentDoc = exports.ConceptFragmentDoc = exports.IntroFragmentDoc = exports.StructuredTreeFragmentDoc = exports.MediaFragmentDoc = void 0;
+exports.getSdk = exports.ArticleFromJsonDocument = exports.ArticleDocument = exports.ArticleFieldsFragmentDoc = exports.MediaFragmentDoc = exports.ContentFragmentDoc = exports.DesignFragmentDoc = exports.StructuredContentFragmentDoc = exports.ArticleReferencesFragmentDoc = exports.ScrollyImageFragmentDoc = exports.MainImageFragmentDoc = exports.RawImageFragmentDoc = exports.FlourishFragmentDoc = exports.VideoFragmentDoc = exports.TweetFragmentDoc = exports.LayoutImageFragmentDoc = exports.ImageSetFragmentDoc = exports.PictureFragmentDoc = exports.PictureFieldsFragmentDoc = exports.RecommendedFragmentDoc = exports.TeaserFragmentDoc = exports.TopperFragmentDoc = exports.ImageFragmentDoc = exports.ImageSourceFragmentDoc = exports.ConceptFragmentDoc = exports.IntroFragmentDoc = exports.StructuredTreeFragmentDoc = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
-exports.MediaFragmentDoc = (0, graphql_tag_1.default) `
-    fragment Media on Media {
-  url
-  mediaType
-}
-    `;
 exports.StructuredTreeFragmentDoc = (0, graphql_tag_1.default) `
     fragment StructuredTree on StructuredContent {
   tree
@@ -62,6 +56,7 @@ exports.TopperFragmentDoc = (0, graphql_tag_1.default) `
   backgroundColour
   backgroundBox
   textShadow
+  followButtonVariant
   intro {
     ...Intro
   }
@@ -435,37 +430,58 @@ exports.ContentFragmentDoc = (0, graphql_tag_1.default) `
 ${exports.StructuredContentFragmentDoc}
 ${exports.ConceptFragmentDoc}
 ${exports.DesignFragmentDoc}`;
-exports.ArticleDocument = (0, graphql_tag_1.default) `
-    query Article($uuid: String!, $useVanities: Boolean!) {
-  content(uuid: $uuid) {
-    ...Content
-    ... on LiveBlogPackage {
-      liveBlogPosts {
-        ...Content
-      }
-      realtime
+exports.MediaFragmentDoc = (0, graphql_tag_1.default) `
+    fragment Media on Media {
+  url
+  mediaType
+}
+    `;
+exports.ArticleFieldsFragmentDoc = (0, graphql_tag_1.default) `
+    fragment ArticleFields on Content {
+  ...Content
+  ... on LiveBlogPackage {
+    liveBlogPosts {
+      ...Content
     }
-    ... on ContentPackage {
-      contains {
-        ...Teaser
-        standfirst
-      }
+    realtime
+  }
+  ... on ContentPackage {
+    contains {
+      ...Teaser
+      standfirst
     }
-    ... on Audio {
-      media {
-        ...Media
-      }
+  }
+  ... on Audio {
+    media {
+      ...Media
     }
   }
 }
     ${exports.ContentFragmentDoc}
 ${exports.TeaserFragmentDoc}
 ${exports.MediaFragmentDoc}`;
+exports.ArticleDocument = (0, graphql_tag_1.default) `
+    query Article($uuid: String!, $useVanities: Boolean!) {
+  content(uuid: $uuid) {
+    ...ArticleFields
+  }
+}
+    ${exports.ArticleFieldsFragmentDoc}`;
+exports.ArticleFromJsonDocument = (0, graphql_tag_1.default) `
+    query ArticleFromJSON($content: JSON!, $useVanities: Boolean!) {
+  contentFromJSON(content: $content) {
+    ...ArticleFields
+  }
+}
+    ${exports.ArticleFieldsFragmentDoc}`;
 const defaultWrapper = (action, _operationName, _operationType) => action();
 function getSdk(client, withWrapper = defaultWrapper) {
     return {
         Article(variables, requestHeaders) {
             return withWrapper((wrappedRequestHeaders) => client.request(exports.ArticleDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), 'Article', 'query');
+        },
+        ArticleFromJSON(variables, requestHeaders) {
+            return withWrapper((wrappedRequestHeaders) => client.request(exports.ArticleFromJsonDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), 'ArticleFromJSON', 'query');
         }
     };
 }

package/lib/generated/index.js.map

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

package/lib/index.d.ts

@@ -4,5 +4,6 @@ type ClientOptions = {
     baseUrl?: string;
     timeout?: number;
 };
+export declare function apiUrl(apiMajorVersion: string, baseUrl?: string): string;
 export default function init(options: ClientOptions): Sdk;
 export * from './generated';

package/lib/index.js

@@ -17,8 +17,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiUrl = void 0;
 const generated_1 = require("./generated");
 const schema_version_1 = require("./schema-version");
+const client_version_1 = require("./client-version");
 const graphql_request_1 = require("graphql-request");
 const semver_1 = __importDefault(require("semver"));
 const DEFAULT_CLIENT_TIMEOUT = 60000; //one minute
@@ -35,22 +37,61 @@ function apiVersion(version) {
         ? `v${parsedVersion.major}`
         : `v${parsedVersion.major}.${parsedVersion.minor}`;
 }
+function apiUrl(apiMajorVersion, baseUrl) {
+    const baseUrlPathRegex = /\/__content(?<version>\/v(?:0\.)?\d+)?$/;
+    if (baseUrl) {
+        const pathMatches = baseUrl.match(baseUrlPathRegex);
+        if (pathMatches) {
+            if (pathMatches.groups?.version) {
+                return baseUrl;
+            }
+            return baseUrl + '/' + apiMajorVersion;
+        }
+        return baseUrl + '/__content/' + apiMajorVersion;
+    }
+    return `https://www.ft.com/__content/${apiMajorVersion}`;
+}
+exports.apiUrl = apiUrl;
+// Reliability Kit doesn't provide a base class for non-operational errors.
+// this class is more or less compatible with how log-errors serialises errors.
+// https://github.com/Financial-Times/dotcom-reliability-kit/issues/238
+class CustomError extends Error {
+    constructor({ message, cause, ...data }) {
+        super(message ?? 'An error occurred in cp-content-pipeline-client');
+        this.code = 'CP_CONTENT_PIPELINE_CLIENT_ERROR';
+        this.isOperational = false;
+        this.cause = cause;
+        this.data = data;
+    }
+}
 function init(options) {
     if (!options.systemCode) {
         throw new Error('A systemCode option is required. This should be the Biz Ops system code of the app sending requests to cp-content-pipeline');
     }
     const apiMajorVersion = apiVersion(schema_version_1.version);
-    const apiUrl = options.baseUrl ?? `https://www.ft.com/__content/${apiMajorVersion}`;
-    const client = new graphql_request_1.GraphQLClient(apiUrl, {
+    const client = new graphql_request_1.GraphQLClient(apiUrl(apiMajorVersion, options.baseUrl), {
         timeout: options.timeout ?? DEFAULT_CLIENT_TIMEOUT,
         headers: {
-            'user-agent': `cp-content-pipeline-client/${schema_version_1.version}; (+${options.systemCode})`,
+            'user-agent': `cp-content-pipeline-client/${client_version_1.version}; cp-content-pipeline-schema/${schema_version_1.version}; (+${options.systemCode})`,
             'system-code': options.systemCode,
             // Include the full schema version number as a header as it might be useful for debugging
             'schema-version': schema_version_1.version,
         },
     });
-    return (0, generated_1.getSdk)(client);
+    return (0, generated_1.getSdk)(client, (action, name, type) => action().catch((error) => {
+        if (error instanceof graphql_request_1.ClientError) {
+            const newError = new CustomError({
+                code: 'CP_CONTENT_PIPELINE_CLIENT_ERROR',
+                message: error.message,
+                schemaVersion: schema_version_1.version,
+                clientVersion: client_version_1.version,
+                variables: error.request.variables,
+                operation: { name, type },
+            });
+            throw newError;
+        }
+        throw error;
+    }));
 }
 exports.default = init;
 __exportStar(require("./generated"), exports);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,2CAAyC;AACzC,qDAA2D;AAC3D,qDAA+C;AAC/C,oDAA2B;AAQ3B,MAAM,sBAAsB,GAAG,KAAK,CAAA,CAAC,YAAY;AAEjD,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,aAAa,GAAG,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAE3C,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CACb,yGAAyG,CAC1G,CAAA;KACF;IAED;;;OAGG;IACH,OAAO,aAAa,CAAC,KAAK,GAAG,CAAC;QAC5B,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,EAAE;QAC3B,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,IAAI,aAAa,CAAC,KAAK,EAAE,CAAA;AACtD,CAAC;AAED,SAAwB,IAAI,CAAC,OAAsB;IACjD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,4HAA4H,CAC7H,CAAA;KACF;IAED,MAAM,eAAe,GAAG,UAAU,CAAC,wBAAa,CAAC,CAAA;IACjD,MAAM,MAAM,GACV,OAAO,CAAC,OAAO,IAAI,gCAAgC,eAAe,EAAE,CAAA;IAEtE,MAAM,MAAM,GAAG,IAAI,+BAAa,CAAC,MAAM,EAAE;QACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,sBAAsB;QAClD,OAAO,EAAE;YACP,YAAY,EAAE,8BAA8B,wBAAa,OAAO,OAAO,CAAC,UAAU,GAAG;YACrF,aAAa,EAAE,OAAO,CAAC,UAAU;YACjC,yFAAyF;YACzF,gBAAgB,EAAE,wBAAa;SAChC;KACF,CAAC,CAAA;IAEF,OAAO,IAAA,kBAAM,EAAC,MAAM,CAAC,CAAA;AACvB,CAAC;AAtBD,uBAsBC;AAED,8CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.test.d.ts

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

package/lib/index.test.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
+describe('baseUrl version logic', () => {
+    it('should use ft.com/__content with version suffix when no baseUrl', () => {
+        expect((0, _1.apiUrl)('v0.7')).toBe('https://www.ft.com/__content/v0.7');
+    });
+    it('should add version suffix to baseUrl without one', () => {
+        expect((0, _1.apiUrl)('v0.7', 'http://base-url.example.com')).toBe('http://base-url.example.com/__content/v0.7');
+    });
+    it('should add version suffix to baseUrl partial suffix', () => {
+        expect((0, _1.apiUrl)('v0.7', 'http://base-url.example.com/__content')).toBe('http://base-url.example.com/__content/v0.7');
+    });
+    it('should use version suffix from baseUrl with one', () => {
+        expect((0, _1.apiUrl)('v0.7', 'http://base-url.example.com/__content/v0.6')).toBe('http://base-url.example.com/__content/v0.6');
+    });
+});
+//# sourceMappingURL=index.test.js.map

package/lib/index.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":";;AAAA,wBAA0B;AAE1B,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,IAAA,SAAM,EAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;IAClE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,IAAA,SAAM,EAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC,CAAC,IAAI,CACxD,4CAA4C,CAC7C,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,CAAC,IAAA,SAAM,EAAC,MAAM,EAAE,uCAAuC,CAAC,CAAC,CAAC,IAAI,CAClE,4CAA4C,CAC7C,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CAAC,IAAA,SAAM,EAAC,MAAM,EAAE,4CAA4C,CAAC,CAAC,CAAC,IAAI,CACvE,4CAA4C,CAC7C,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/schema-version.d.ts

@@ -1 +1 @@
-export declare const version = "0.7.16";
+export declare const version = "0.7.18";

package/lib/schema-version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = '0.7.16';
+exports.version = '0.7.18';
 //# sourceMappingURL=schema-version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-client",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@dotcom-tool-kit/npm": "^3.1.0",
     "@financial-times/content-tree": "github:financial-times/content-tree#14370e3",
-    "@financial-times/cp-content-pipeline-schema": "^0.7.16",
+    "@financial-times/cp-content-pipeline-schema": "^0.7.18",
     "@graphql-tools/merge": "^8.3.6",
     "@types/lodash.mapvalues": "^4.6.7",
     "@types/semver": "^7.3.13",

package/queries/article.graphql

@@ -65,6 +65,7 @@ fragment Topper on Topper {
   backgroundColour
   backgroundBox
   textShadow
+  followButtonVariant
 
   intro {
     ...Intro
@@ -399,25 +400,35 @@ fragment Content on Content {
   url
 }
 
-query Article($uuid: String!, $useVanities: Boolean!) {
-  content(uuid: $uuid) {
-    ...Content
-    ... on LiveBlogPackage {
-      liveBlogPosts {
-        ...Content
-      }
-      realtime
+fragment ArticleFields on Content {
+  ...Content
+  ... on LiveBlogPackage {
+    liveBlogPosts {
+      ...Content
     }
-    ... on ContentPackage {
-      contains {
-        ...Teaser
-        standfirst
-      }
+    realtime
+  }
+  ... on ContentPackage {
+    contains {
+      ...Teaser
+      standfirst
     }
-    ... on Audio {
-      media {
-        ...Media
-      }
+  }
+  ... on Audio {
+    media {
+      ...Media
     }
   }
 }
+
+query Article($uuid: String!, $useVanities: Boolean!) {
+  content(uuid: $uuid) {
+    ...ArticleFields
+  }
+}
+
+query ArticleFromJSON($content: JSON!, $useVanities: Boolean!) {
+  contentFromJSON(content: $content) {
+    ...ArticleFields
+  }
+}

package/src/client-version.ts

@@ -0,0 +1,2 @@
+// Generated by genversion.
+export const version = '0.6.19'