@newskit-render/feed 1.8.5 → 1.8.6-alpha.1

package/dist/cjs/sitemap/resolvers/genericSitemapResolver.js

@@ -37,40 +37,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.genericSitemap = void 0;
-var api_1 = require("@newskit-render/api");
 var createSitemap_1 = require("../../helpers/createSitemap");
 var utils_1 = require("../../helpers/utils");
 var queryArticleList_1 = require("../../helpers/queryArticleList");
 var queryPages_1 = require("../../helpers/queryPages");
 var queries_1 = require("../queries");
+var client_1 = require("../../helpers/client");
 var genericSitemap = function (_a) {
     var res = _a.res, query = _a.query, publisher = _a.publisher, domain = _a.domain, publicationName = _a.publicationName, firstArticleDate = _a.firstArticleDate, customStaticPageCollection = _a.customStaticPageCollection, dataType = _a.dataType, _b = _a.priority, priority = _b === void 0 ? '0.7' : _b, _c = _a.changefreq, changefreq = _c === void 0 ? 'monthly' : _c;
     return __awaiter(void 0, void 0, void 0, function () {
         var apolloClient, pages, result_1, startDay, endDay, dates, articleListCollection, result_2, startDate, todayDate, dateCollection, result;
         return __generator(this, function (_d) {
             switch (_d.label) {
-                case 0: return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.nkapi)];
+                case 0:
+                    apolloClient = (0, client_1.getApolloRestClient)(publisher);
+                    if (!(dataType === 'pageList' || dataType === 'competitionList')) return [3 /*break*/, 2];
+                    return [4 /*yield*/, (0, queryPages_1.queryPages)(apolloClient, dataType)];
                 case 1:
-                    apolloClient = _d.sent();
-                    if (!(dataType === 'pages' || dataType === 'competitions')) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, queryPages_1.queryPages)(publisher, apolloClient, dataType)];
-                case 2:
                     pages = _d.sent();
-                    result_1 = (0, createSitemap_1.createPagesSitemap)(pages, domain, changefreq, priority, dataType, publisher, customStaticPageCollection);
+                    result_1 = (0, createSitemap_1.createPagesSitemap)(pages, domain, publicationName, changefreq, priority, dataType, customStaticPageCollection);
                     (0, utils_1.setResponse)(res, result_1);
                     return [2 /*return*/];
-                case 3:
-                    if (!(query && query.yyyy && query.mm && query.dd)) return [3 /*break*/, 5];
+                case 2:
+                    if (!(query && query.yyyy && query.mm && query.dd)) return [3 /*break*/, 4];
                     startDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 00:01:00");
-                    endDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 23:59:59:00");
+                    endDay = "".concat(query.yyyy, "-").concat(query.mm, "-").concat(query.dd, " 23:59:59");
                     dates = { from: startDay, to: endDay };
-                    return [4 /*yield*/, (0, queryArticleList_1.queryArticleList)(publisher, dates, apolloClient, queries_1.GET_ARTICLE_LIST)];
-                case 4:
+                    return [4 /*yield*/, (0, queryArticleList_1.queryArticleList)(dates, apolloClient, queries_1.GET_ARTICLE_LIST)];
+                case 3:
                     articleListCollection = _d.sent();
                     result_2 = (0, createSitemap_1.createArticleSitemap)(articleListCollection, domain, publicationName, false, changefreq, priority);
                     (0, utils_1.setResponse)(res, result_2);
                     return [2 /*return*/];
-                case 5:
+                case 4:
                     startDate = firstArticleDate
                         ? new Date(firstArticleDate)
                         : new Date(new Date().setDate(new Date().getDate() - 30));

package/dist/cjs/sitemap/resolvers/genericSitemapResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"genericSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/genericSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,6DAIoC;AACpC,6CAA8D;AAC9D,mEAAiE;AACjE,uDAAqD;AAKrD,sCAAuE;AAEhE,IAAM,cAAc,GAAG,UAAO,EAWd;QAVrB,GAAG,SAAA,EACH,KAAK,WAAA,EACL,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,0BAA0B,gCAAA,EAC1B,QAAQ,cAAA,EACR,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;wBAED,qBAAM,IAAA,wBAAkB,EAAC,iBAAW,CAAC,KAAK,CAAC,EAAA;;oBAA1D,YAAY,GAAG,SAA2C;yBAE5D,CAAA,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,cAAc,CAAA,EAAnD,wBAAmD;oBACvC,qBAAM,IAAA,uBAAU,EAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAA;;oBAA3D,KAAK,GAAG,SAAmD;oBAC3D,WAAS,IAAA,kCAAkB,EAC/B,KAAK,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,0BAA0B,CAC3B,CAAA;oBACD,IAAA,mBAAW,EAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;yBAGJ,CAAA,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAA,EAA3C,wBAA2C;oBACvC,QAAQ,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBAC3D,MAAM,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,iBAAc,CAAA;oBAC5D,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;oBAEd,qBAAM,IAAA,mCAAgB,EAClD,SAAS,EACT,KAAK,EACL,YAAY,EACZ,0BAAsB,CACvB,EAAA;;oBALK,qBAAqB,GAAG,SAK7B;oBACK,WAAS,IAAA,oCAAoB,EACjC,qBAAqB,EACrB,MAAM,EACN,eAAe,EACf,KAAK,EACL,UAAU,EACV,QAAQ,CACT,CAAA;oBAED,IAAA,mBAAW,EAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;oBAGF,SAAS,GAAG,gBAAgB;wBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC;wBAC5B,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;oBACrD,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;oBACtB,cAAc,GAAG,IAAA,mBAAW,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;oBAElD,MAAM,GAAG,IAAA,kCAAkB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAA;oBAEzD,IAAA,mBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;oBACxB,sBAAM;;;;CACP,CAAA;AA/DY,QAAA,cAAc,kBA+D1B"}
+{"version":3,"file":"genericSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/genericSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAIoC;AACpC,6CAA8D;AAC9D,mEAAiE;AACjE,uDAAqD;AAErD,sCAA6C;AAC7C,+CAA0D;AAEnD,IAAM,cAAc,GAAG,UAAO,EAWd;QAVrB,GAAG,SAAA,EACH,KAAK,WAAA,EACL,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,sBAAA,EAChB,0BAA0B,gCAAA,EAC1B,QAAQ,cAAA,EACR,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,YAAY,GAAG,IAAA,4BAAmB,EAAC,SAAS,CAAC,CAAA;yBAE/C,CAAA,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,iBAAiB,CAAA,EAAzD,wBAAyD;oBAC7C,qBAAM,IAAA,uBAAU,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;;oBAAhD,KAAK,GAAG,SAAwC;oBAChD,WAAS,IAAA,kCAAkB,EAC/B,KAAK,EACL,MAAM,EACN,eAAe,EACf,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,0BAA0B,CAC3B,CAAA;oBACD,IAAA,mBAAW,EAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;yBAGJ,CAAA,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAA,EAA3C,wBAA2C;oBACvC,QAAQ,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBAC3D,MAAM,GAAG,UAAG,KAAK,CAAC,IAAI,cAAI,KAAK,CAAC,EAAE,cAAI,KAAK,CAAC,EAAE,cAAW,CAAA;oBACzD,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;oBAEd,qBAAM,IAAA,mCAAgB,EAClD,KAAK,EACL,YAAY,EACZ,0BAAgB,CACjB,EAAA;;oBAJK,qBAAqB,GAAG,SAI7B;oBACK,WAAS,IAAA,oCAAoB,EACjC,qBAAqB,EACrB,MAAM,EACN,eAAe,EACf,KAAK,EACL,UAAU,EACV,QAAQ,CACT,CAAA;oBAED,IAAA,mBAAW,EAAC,GAAG,EAAE,QAAM,CAAC,CAAA;oBACxB,sBAAM;;oBAGF,SAAS,GAAG,gBAAgB;wBAChC,CAAC,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC;wBAC5B,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;oBACrD,SAAS,GAAG,IAAI,IAAI,EAAE,CAAA;oBACtB,cAAc,GAAG,IAAA,mBAAW,EAAC,SAAS,EAAE,SAAS,CAAC,CAAA;oBAElD,MAAM,GAAG,IAAA,kCAAkB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAA;oBAEzD,IAAA,mBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAA;oBACxB,sBAAM;;;;CACP,CAAA;AA9DY,QAAA,cAAc,kBA8D1B"}

package/dist/cjs/sitemap/resolvers/newsSitemapResolver.js

@@ -40,8 +40,8 @@ exports.newsSitemap = void 0;
 var createSitemap_1 = require("../../helpers/createSitemap");
 var utils_1 = require("../../helpers/utils");
 var queryArticleList_1 = require("../../helpers/queryArticleList");
-var api_1 = require("@newskit-render/api");
 var queries_1 = require("../queries");
+var client_1 = require("../../helpers/client");
 var newsSitemap = function (_a) {
     var res = _a.res, publisher = _a.publisher, domain = _a.domain, publicationName = _a.publicationName, _b = _a.priority, priority = _b === void 0 ? '0.7' : _b, _c = _a.changefreq, changefreq = _c === void 0 ? 'monthly' : _c;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -52,11 +52,9 @@ var newsSitemap = function (_a) {
                     dates = {
                         from: (0, utils_1.getTwoDaysAgoDate)(),
                     };
-                    return [4 /*yield*/, (0, api_1.createApolloClient)(api_1.ClientTypes.nkapi)];
+                    apolloClient = (0, client_1.getApolloRestClient)(publisher);
+                    return [4 /*yield*/, (0, queryArticleList_1.queryArticleList)(dates, apolloClient, queries_1.GET_ARTICLE_LIST)];
                 case 1:
-                    apolloClient = _d.sent();
-                    return [4 /*yield*/, (0, queryArticleList_1.queryArticleList)(publisher, dates, apolloClient, queries_1.GET_ARTICLE_LIST)];
-                case 2:
                     articleListData = _d.sent();
                     html = (0, createSitemap_1.createArticleSitemap)(articleListData, domain, publicationName, true, changefreq, priority);
                     (0, utils_1.setResponse)(res, html);

package/dist/cjs/sitemap/resolvers/newsSitemapResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"newsSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/newsSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAkE;AAClE,6CAAoE;AACpE,mEAAiE;AAEjE,2CAAqE;AACrE,sCAA6C;AAEtC,IAAM,WAAW,GAAG,UAAO,EAOlB;QANd,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,KAAK,GAAG;wBACZ,IAAI,EAAE,IAAA,yBAAiB,GAAE;qBAC1B,CAAA;oBAEoB,qBAAM,IAAA,wBAAkB,EAAC,iBAAW,CAAC,KAAK,CAAC,EAAA;;oBAA1D,YAAY,GAAG,SAA2C;oBACxC,qBAAM,IAAA,mCAAgB,EAC5C,SAAS,EACT,KAAK,EACL,YAAY,EACZ,0BAAgB,CACjB,EAAA;;oBALK,eAAe,GAAG,SAKvB;oBAEK,IAAI,GAAG,IAAA,oCAAoB,EAC/B,eAAe,EACf,MAAM,EACN,eAAe,EACf,IAAI,EACJ,UAAU,EACV,QAAQ,CACT,CAAA;oBACD,IAAA,mBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;;;;;CACvB,CAAA;AA7BY,QAAA,WAAW,eA6BvB"}
+{"version":3,"file":"newsSitemapResolver.js","sourceRoot":"","sources":["../../../../src/sitemap/resolvers/newsSitemapResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAAkE;AAClE,6CAAoE;AACpE,mEAAiE;AAEjE,sCAA6C;AAC7C,+CAA0D;AAEnD,IAAM,WAAW,GAAG,UAAO,EAOlB;QANd,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,kBAAsB,EAAtB,UAAU,mBAAG,SAAS,KAAA;;;;;;oBAEhB,KAAK,GAAG;wBACZ,IAAI,EAAE,IAAA,yBAAiB,GAAE;qBAC1B,CAAA;oBAEK,YAAY,GAAG,IAAA,4BAAmB,EAAC,SAAS,CAAC,CAAA;oBAC3B,qBAAM,IAAA,mCAAgB,EAC5C,KAAK,EACL,YAAY,EACZ,0BAAgB,CACjB,EAAA;;oBAJK,eAAe,GAAG,SAIvB;oBAEK,IAAI,GAAG,IAAA,oCAAoB,EAC/B,eAAe,EACf,MAAM,EACN,eAAe,EACf,IAAI,EACJ,UAAU,EACV,QAAQ,CACT,CAAA;oBACD,IAAA,mBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;;;;;CACvB,CAAA;AA5BY,QAAA,WAAW,eA4BvB"}

package/dist/esm/config/index.d.ts

@@ -0,0 +1 @@
+export declare const contentApiEnvUrl: string, contentApiXApiKey: string;

package/dist/esm/config/index.js

@@ -0,0 +1,6 @@
+var config = {
+    contentApiEnvUrl: process.env.CONTENT_API_ENV_URL,
+    contentApiXApiKey: process.env.CONTENT_API_X_API_KEY,
+};
+export var contentApiEnvUrl = config.contentApiEnvUrl, contentApiXApiKey = config.contentApiXApiKey;
+//# sourceMappingURL=index.js.map

package/dist/esm/config/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,IAAM,MAAM,GAAG;IACb,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAA6B;IAC3D,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAA+B;CAC/D,CAAA;AAED,MAAM,CAAS,IAAA,gBAAgB,GAAwB,MAAM,iBAA9B,EAAE,iBAAiB,GAAK,MAAM,kBAAX,CAAW"}

package/dist/esm/helpers/client.d.ts

@@ -0,0 +1,2 @@
+declare const getApolloRestClient: any;
+export { getApolloRestClient };

package/dist/esm/helpers/client.js

@@ -0,0 +1,32 @@
+var _a;
+import { Publisher } from '@newskit-render/api';
+import { ApolloClient } from '@apollo/client';
+import { RestLink } from 'apollo-link-rest';
+import { InvalidationPolicyCache } from '@nerdwallet/apollo-cache-policies';
+import { contentApiEnvUrl, contentApiXApiKey } from '../config';
+var publisherSlugs = (_a = {},
+    _a[Publisher.VIRGIN] = 'virgin-radio',
+    _a[Publisher.TALK_TV] = 'talk-tv',
+    _a);
+var getRestLink = function (publisher) {
+    return new RestLink({
+        uri: "".concat(contentApiEnvUrl, "/api/v1/").concat(publisherSlugs[publisher], "/"),
+        headers: {
+            'x-api-key': contentApiXApiKey,
+            'Content-Type': 'application/vnd.api+json',
+        },
+    });
+};
+var fiveMinutes = 5 * 60 * 1000;
+var getApolloRestClient = function (publisher) {
+    return new ApolloClient({
+        link: getRestLink(publisher),
+        cache: new InvalidationPolicyCache({
+            invalidationPolicies: {
+                timeToLive: fiveMinutes,
+            },
+        }),
+    });
+};
+export { getApolloRestClient };
+//# sourceMappingURL=client.js.map

package/dist/esm/helpers/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/helpers/client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE/D,IAAM,cAAc;IAClB,GAAC,SAAS,CAAC,MAAM,IAAG,cAAc;IAClC,GAAC,SAAS,CAAC,OAAO,IAAG,SAAS;OAC/B,CAAA;AAED,IAAM,WAAW,GAAG,UAAC,SAAoB;IACvC,OAAO,IAAI,QAAQ,CAAC;QAClB,GAAG,EAAE,UAAG,gBAAgB,qBAAW,cAAc,CAAC,SAAS,CAAC,MAAG;QAC/D,OAAO,EAAE;YACP,WAAW,EAAE,iBAAiB;YAC9B,cAAc,EAAE,0BAA0B;SAC3C;KACF,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,IAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjC,IAAM,mBAAmB,GAAQ,UAAC,SAAoB;IACpD,OAAO,IAAI,YAAY,CAAC;QACtB,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;QAC5B,KAAK,EAAE,IAAI,uBAAuB,CAAC;YACjC,oBAAoB,EAAE;gBACpB,UAAU,EAAE,WAAW;aACxB;SACF,CAAC;KACH,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/dist/esm/helpers/createSitemap/buildSiteMapImages.d.ts

@@ -1,2 +1,2 @@
-import { ArticleBody } from '../types';
-export declare const buildSiteMapImages: (body: ArticleBody[]) => string;
+import { Body } from '../../rss/types';
+export declare const buildSiteMapImages: (body: Body[]) => string;

package/dist/esm/helpers/createSitemap/buildSiteMapImages.js

@@ -1,9 +1,9 @@
 import escape from 'lodash.escape';
 export var buildSiteMapImages = function (body) {
-    var images = body.filter(function (block) { return block.url; });
+    var images = body.filter(function (block) { return block.attributes.url; });
     return images
         .map(function (_a) {
-        var url = _a.url, caption = _a.caption, credit = _a.credit;
+        var _b = _a.attributes, url = _b.url, caption = _b.caption, credit = _b.credit;
         return "\n<image:image>\n  <image:loc>".concat(escape(url), "</image:loc>\n  ").concat(caption ? "<image:caption>".concat(escape(caption), "</image:caption>") : "", "\n  ").concat(credit ? "<image:credit>".concat(escape(credit), "</image:credit>") : "", "\n</image:image>\n");
     })
         .join('');

package/dist/esm/helpers/createSitemap/buildSiteMapImages.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSiteMapImages.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapImages.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,IAAmB;IACpD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,UAAC,KAAK,IAAK,OAAC,KAAoB,CAAC,GAAG,EAAzB,CAAyB,CACrB,CAAA;IACjB,OAAO,MAAM;SACV,GAAG,CACF,UAAC,EAAoC;YAAlC,GAAG,SAAA,EAAE,OAAO,aAAA,EAAE,MAAM,YAAA;QAAmB,OAAA,wCAEjC,MAAM,CAAC,GAAG,CAAC,6BACtB,OAAO,CAAC,CAAC,CAAC,yBAAkB,MAAM,CAAC,OAAO,CAAC,qBAAkB,CAAC,CAAC,CAAC,EAAE,iBAClE,MAAM,CAAC,CAAC,CAAC,wBAAiB,MAAM,CAAC,MAAM,CAAC,oBAAiB,CAAC,CAAC,CAAC,EAAE,uBAEjE;IAN+C,CAM/C,CACI;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"buildSiteMapImages.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapImages.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,IAAY;IAC7C,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,UAAC,KAAK,IAAK,OAAC,KAAoB,CAAC,UAAU,CAAC,GAAG,EAApC,CAAoC,CAChC,CAAA;IACjB,OAAO,MAAM;SACV,GAAG,CACF,UAAC,EAAoD;YAAlD,kBAAoC,EAAtB,GAAG,SAAA,EAAE,OAAO,aAAA,EAAE,MAAM,YAAA;QAAqB,OAAA,wCAEjD,MAAM,CAAC,GAAG,CAAC,6BACtB,OAAO,CAAC,CAAC,CAAC,yBAAkB,MAAM,CAAC,OAAO,CAAC,qBAAkB,CAAC,CAAC,CAAC,EAAE,iBAClE,MAAM,CAAC,CAAC,CAAC,wBAAiB,MAAM,CAAC,MAAM,CAAC,oBAAiB,CAAC,CAAC,CAAC,EAAE,uBAEjE;IAN+D,CAM/D,CACI;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA"}

package/dist/esm/helpers/createSitemap/buildSiteMapVideos.d.ts

@@ -1,10 +1,2 @@
-import { Article, ArticleBody } from '../types';
-export declare const buildSiteMapVideos: ({ domain, body, headline, publishedDateTime, id: articleId, publisher, articleCategory, }: {
-    domain: string;
-    body: ArticleBody[];
-    headline: Article['headline'];
-    publishedDateTime: Article['publishedDateTime'];
-    id: Article['id'];
-    publisher: Article['publisher'];
-    articleCategory: string;
-}) => string;
+import { Article } from '../../rss/types';
+export declare const buildSiteMapVideos: (domain: any, publicationName: any, { id, attributes: { body, headline, datePublished }, relationships }: Article) => string;

package/dist/esm/helpers/createSitemap/buildSiteMapVideos.js

@@ -1,12 +1,15 @@
 import escape from 'lodash.escape';
-export var buildSiteMapVideos = function (_a) {
-    var domain = _a.domain, body = _a.body, headline = _a.headline, publishedDateTime = _a.publishedDateTime, articleId = _a.id, publisher = _a.publisher, articleCategory = _a.articleCategory;
-    var videos = body.filter(function (block) { return block.playerId; });
+export var buildSiteMapVideos = function (domain, publicationName, _a) {
+    var id = _a.id, _b = _a.attributes, body = _b.body, headline = _b.headline, datePublished = _b.datePublished, relationships = _a.relationships;
+    var categories = (relationships === null || relationships === void 0 ? void 0 : relationships.categories.data) || [];
+    var videos = body.filter(function (block) { return block.attributes.playerId; });
+    var articleId = id;
     return videos
         .map(function (_a) {
-        var accountId = _a.accountId, id = _a.id, playerId = _a.playerId;
+        var _b, _c, _d, _e;
+        var _f = _a.attributes, accountId = _f.accountId, id = _f.id, playerId = _f.playerId;
         var playerLoc = "https://".concat(domain, "/player/brightcove/?video_id=").concat(id, "&account_id=").concat(accountId, "&player_id=").concat(playerId, "&post_id=").concat(articleId);
-        return "\n<video:video>\n  <video:player_loc>".concat(escape(playerLoc), "</video:player_loc>\n  <video:thumbnail_loc>NA</video:thumbnail_loc>\n  <video:title>").concat(escape(headline), "</video:title>\n  <video:description>NA</video:description>\n  <video:publication_date>").concat(escape(publishedDateTime), "</video:publication_date>\n  <video:uploader>").concat(escape(publisher), "</video:uploader>\n  <video:requires_subscription>No</video:requires_subscription>\n  <video:category>").concat(escape(articleCategory), "</video:category>\n  <video:live>No</video:live>\n</video:video>\n");
+        return "\n<video:video>\n  <video:player_loc>".concat(escape(playerLoc), "</video:player_loc>\n  <video:thumbnail_loc>NA</video:thumbnail_loc>\n  <video:title>").concat(escape(headline), "</video:title>\n  <video:description>NA</video:description>\n  <video:publication_date>").concat(escape(new Date(datePublished).toISOString()), "</video:publication_date>\n  <video:uploader>").concat(escape(publicationName), "</video:uploader>\n  <video:requires_subscription>No</video:requires_subscription>\n  <video:category>").concat(escape(((_e = (_d = (_c = (_b = categories[0]) === null || _b === void 0 ? void 0 : _b.category) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.attributes) === null || _e === void 0 ? void 0 : _e.slug) || 'uncategorized'), "</video:category>\n  <video:live>No</video:live>\n</video:video>\n");
     })
         .join('');
 };

package/dist/esm/helpers/createSitemap/buildSiteMapVideos.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSiteMapVideos.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapVideos.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,EAgBlC;QAfC,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,QAAQ,cAAA,EACR,iBAAiB,uBAAA,EACb,SAAS,QAAA,EACb,SAAS,eAAA,EACT,eAAe,qBAAA;IAUf,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,UAAC,KAAK,IAAK,OAAC,KAA8B,CAAC,QAAQ,EAAxC,CAAwC,CAC1B,CAAA;IAE3B,OAAO,MAAM;SACV,GAAG,CAAC,UAAC,EAAiD;YAA/C,SAAS,eAAA,EAAE,EAAE,QAAA,EAAE,QAAQ,cAAA;QAC7B,IAAM,SAAS,GAAG,kBAAW,MAAM,0CAAgC,EAAE,yBAAe,SAAS,wBAAc,QAAQ,sBAAY,SAAS,CAAE,CAAA;QAC1I,OAAO,+CAES,MAAM,CAAC,SAAS,CAAC,kGAEtB,MAAM,CAAC,QAAQ,CAAC,oGAEL,MAAM,CAAC,iBAAiB,CAAC,0DACjC,MAAM,CAAC,SAAS,CAAC,mHAEjB,MAAM,CAAC,eAAe,CAAC,uEAG1C,CAAA;IACG,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"buildSiteMapVideos.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapVideos.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,MAAM,EACN,eAAe,EACf,EAA6E;QAA3E,EAAE,QAAA,EAAE,kBAA6C,EAA/B,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,aAAa,mBAAA,EAAI,aAAa,mBAAA;IAElE,IAAM,UAAU,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,CAAC,IAAI,KAAI,EAAE,CAAA;IACvD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,UAAC,KAAK,IAAK,OAAC,KAA8B,CAAC,UAAU,CAAC,QAAQ,EAAnD,CAAmD,CACrC,CAAA;IAC3B,IAAM,SAAS,GAAG,EAAE,CAAA;IACpB,OAAO,MAAM;SACV,GAAG,CACF,UAAC,EAAiE;;YAA/D,kBAAuC,EAAzB,SAAS,eAAA,EAAE,EAAE,QAAA,EAAE,QAAQ,cAAA;QACtC,IAAM,SAAS,GAAG,kBAAW,MAAM,0CAAgC,EAAE,yBAAe,SAAS,wBAAc,QAAQ,sBAAY,SAAS,CAAE,CAAA;QAC1I,OAAO,+CAEO,MAAM,CAAC,SAAS,CAAC,kGAEtB,MAAM,CAAC,QAAQ,CAAC,oGAEL,MAAM,CAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CACtC,0DACiB,MAAM,CAAC,eAAe,CAAC,mHAEvB,MAAM,CACtB,CAAA,MAAA,MAAA,MAAA,MAAA,UAAU,CAAC,CAAC,CAAC,0CAAE,QAAQ,0CAAE,IAAI,0CAAE,UAAU,0CAAE,IAAI,KAAI,eAAe,CACnE,uEAGF,CAAA;IACK,CAAC,CACF;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA"}

package/dist/esm/helpers/createSitemap/createArticleSitemap.d.ts

@@ -1,2 +1,3 @@
-import { ArticleList, ChangeFreq, Priority } from '../types';
+import { ChangeFreq, Priority } from '../types';
+import { ArticleList } from '../../rss/types';
 export declare const createArticleSitemap: (articlesList: ArticleList, domain: string, publicationName: string, isNewsSitemap: boolean, changefreq: ChangeFreq, priority: Priority) => string;

package/dist/esm/helpers/createSitemap/createArticleSitemap.js

@@ -1,30 +1,39 @@
 import { getSitemapHeaders } from './getSitemapHeaders';
 import { getCategorySlug } from './getCategorySlug';
-import { generateArticleSlug } from './generateArticleSlug';
 import { buildSiteMapImages } from './buildSiteMapImages';
 import { buildSiteMapVideos } from './buildSiteMapVideos';
 import escape from 'lodash.escape';
 export var createArticleSitemap = function (articlesList, domain, publicationName, isNewsSitemap, changefreq, priority) {
+    var generateArticleSlug = function (headline) {
+        return headline
+            .replace(/[^a-zA-Z0-9 ]/g, '')
+            .replace(/\s\s+/g, ' ')
+            .toLowerCase()
+            .replace(/ /g, '-')
+            .trim();
+    };
     var urlsetHeaders = getSitemapHeaders(isNewsSitemap);
-    return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <urlset \n    ".concat(urlsetHeaders, " \n    xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\"\n    xmlns:video=\"http://www.google.com/schemas/sitemap-video/1.1\"\n  >\n    ").concat(articlesList
+    return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <urlset \n    ".concat(urlsetHeaders, " \n    xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\"\n    xmlns:video=\"http://www.google.com/schemas/sitemap-video/1.1\"\n  >\n    ").concat(articlesList.data
         .map(function (_a) {
-        var id = _a.id, publishedDateTime = _a.publishedDateTime, updatedDateTime = _a.updatedDateTime, publisher = _a.publisher, headline = _a.headline, body = _a.body, categories = _a.categories;
+        var id = _a.id, _b = _a.attributes, body = _b.body, headline = _b.headline, slug = _b.slug, datePublished = _b.datePublished, dateUpdated = _b.dateUpdated, relationships = _a.relationships;
+        var categories = (relationships === null || relationships === void 0 ? void 0 : relationships.categories.data) || [];
         var articleCategory = getCategorySlug(categories);
-        var articleSlug = generateArticleSlug(headline);
         var imagesSitemap = buildSiteMapImages(body);
-        var videoSitemap = buildSiteMapVideos({
-            domain: domain,
-            body: body,
-            headline: headline,
-            publishedDateTime: publishedDateTime,
+        var videoSitemap = buildSiteMapVideos(domain, publicationName, {
             id: id,
-            publisher: publisher,
-            articleCategory: articleCategory,
+            attributes: {
+                body: body,
+                headline: headline,
+                slug: slug,
+                datePublished: datePublished,
+                dateUpdated: dateUpdated,
+            },
+            relationships: relationships,
         });
-        var loc = "https://".concat(domain, "/").concat(articleCategory, "/").concat(id, "/").concat(articleSlug);
+        var loc = "https://".concat(domain, "/").concat(articleCategory, "/").concat(id, "/").concat(slug || generateArticleSlug(headline));
         return "\n          <url>\n            <loc>".concat(escape(loc), "</loc> \n           ").concat(isNewsSitemap
-            ? "<news:news>\n             <news:publication>\n             <news:name>".concat(escape(publicationName), "</news:name>\n             <news:language>en</news:language>\n             </news:publication>\n             <news:publication_date>").concat(escape(publishedDateTime), "</news:publication_date>\n             <news:title>").concat(escape(headline), "</news:title>\n           </news:news>")
-            : '', " \n            <changefreq>").concat(escape(changefreq), "</changefreq>\n            <priority>").concat(escape(priority), "</priority>\n            <lastmod>").concat(escape(updatedDateTime), "</lastmod>\n            ").concat(imagesSitemap, "\n            ").concat(videoSitemap, "\n          </url>\n        ");
+            ? "<news:news>\n             <news:publication>\n             <news:name>".concat(escape(publicationName), "</news:name>\n             <news:language>en</news:language>\n             </news:publication>\n             <news:publication_date>").concat(escape(new Date(datePublished).toISOString()), "</news:publication_date>\n             <news:title>").concat(escape(headline), "</news:title>\n           </news:news>")
+            : '', " \n            <changefreq>").concat(escape(changefreq), "</changefreq>\n            <priority>").concat(escape(priority), "</priority>\n            <lastmod>").concat(escape(new Date(dateUpdated).toISOString()), "</lastmod>\n            ").concat(imagesSitemap, "\n            ").concat(videoSitemap, "\n          </url>\n        ");
     })
         .join(''), "\n  </urlset>\n");
 };

package/dist/esm/helpers/createSitemap/createArticleSitemap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createArticleSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createArticleSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAClC,YAAyB,EACzB,MAAc,EACd,eAAuB,EACvB,aAAsB,EACtB,UAAsB,EACtB,QAAkB;IAElB,IAAM,aAAa,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAA;IACtD,OAAO,sEAEH,aAAa,mKAIb,YAAY;SACX,GAAG,CACF,UAAC,EAQS;YAPR,EAAE,QAAA,EACF,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,SAAS,eAAA,EACT,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,UAAU,gBAAA;QAEV,IAAM,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;QACnD,IAAM,WAAW,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;QACjD,IAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,kBAAkB,CAAC;YACtC,MAAM,QAAA;YACN,IAAI,MAAA;YACJ,QAAQ,UAAA;YACR,iBAAiB,mBAAA;YACjB,EAAE,IAAA;YACF,SAAS,WAAA;YACT,eAAe,iBAAA;SAChB,CAAC,CAAA;QACF,IAAM,GAAG,GAAG,kBAAW,MAAM,cAAI,eAAe,cAAI,EAAE,cAAI,WAAW,CAAE,CAAA;QACvE,OAAO,8CAEE,MAAM,CAAC,GAAG,CAAC,iCAEjB,aAAa;YACX,CAAC,CAAC,gFAES,MAAM,CAAC,eAAe,CAAC,iJAGX,MAAM,CAC7B,iBAAiB,CAClB,gEACa,MAAM,CAAC,QAAQ,CAAC,2CACnB;YACT,CAAC,CAAC,EAAE,wCAEO,MAAM,CAAC,UAAU,CAAC,kDACpB,MAAM,CAAC,QAAQ,CAAC,+CACjB,MAAM,CAAC,eAAe,CAAC,qCAChC,aAAa,2BACb,YAAY,iCAEjB,CAAA;IACD,CAAC,CACF;SACA,IAAI,CAAC,EAAE,CAAC,oBAEd,CAAA;AACD,CAAC,CAAA"}
+{"version":3,"file":"createArticleSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createArticleSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAGzD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAClC,YAAyB,EACzB,MAAc,EACd,eAAuB,EACvB,aAAsB,EACtB,UAAsB,EACtB,QAAkB;IAElB,IAAM,mBAAmB,GAAG,UAAC,QAAgB;QAC3C,OAAA,QAAQ;aACL,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;aAC7B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;aACtB,WAAW,EAAE;aACb,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;aAClB,IAAI,EAAE;IALT,CAKS,CAAA;IAEX,IAAM,aAAa,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAA;IACtD,OAAO,sEAEH,aAAa,mKAIb,YAAY,CAAC,IAAI;SAChB,GAAG,CACF,UAAC,EAIS;YAHR,EAAE,QAAA,EACF,kBAAgE,EAAlD,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,IAAI,UAAA,EAAE,aAAa,mBAAA,EAAE,WAAW,iBAAA,EAC9D,aAAa,mBAAA;QAEb,IAAM,UAAU,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,CAAC,IAAI,KAAI,EAAE,CAAA;QACvD,IAAM,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;QACnD,IAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE;YAC/D,EAAE,IAAA;YACF,UAAU,EAAE;gBACV,IAAI,MAAA;gBACJ,QAAQ,UAAA;gBACR,IAAI,MAAA;gBACJ,aAAa,eAAA;gBACb,WAAW,aAAA;aACZ;YACD,aAAa,eAAA;SACH,CAAC,CAAA;QACb,IAAM,GAAG,GAAG,kBAAW,MAAM,cAAI,eAAe,cAAI,EAAE,cACpD,IAAI,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CACrC,CAAA;QACF,OAAO,8CAEE,MAAM,CAAC,GAAG,CAAC,iCAEjB,aAAa;YACX,CAAC,CAAC,gFAES,MAAM,CAAC,eAAe,CAAC,iJAGX,MAAM,CAC7B,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CACtC,gEACa,MAAM,CAAC,QAAQ,CAAC,2CACnB;YACT,CAAC,CAAC,EAAE,wCAEO,MAAM,CAAC,UAAU,CAAC,kDACpB,MAAM,CAAC,QAAQ,CAAC,+CACjB,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,qCACpD,aAAa,2BACb,YAAY,iCAEjB,CAAA;IACD,CAAC,CACF;SACA,IAAI,CAAC,EAAE,CAAC,oBAEd,CAAA;AACD,CAAC,CAAA"}

package/dist/esm/helpers/createSitemap/createPagesSitemap.d.ts

@@ -1,3 +1,2 @@
-import { CustomStaticPage, Page, ChangeFreq, Priority, DataType } from '../types';
-import { Publisher } from '@newskit-render/api';
-export declare const createPagesSitemap: (pages: Page[], domain: string, changefreq: ChangeFreq, priority: Priority, dataType: DataType, publisher: Publisher, customStaticPageCollection?: CustomStaticPage[]) => string;
+import { CustomStaticPage, PageList, ChangeFreq, Priority, DataType } from '../types';
+export declare const createPagesSitemap: (pages: PageList, domain: string, publicationName: string, changefreq: ChangeFreq, priority: Priority, dataType: DataType, customStaticPageCollection?: CustomStaticPage[]) => string;

package/dist/esm/helpers/createSitemap/createPagesSitemap.js

@@ -1,11 +1,11 @@
 import { buildSiteMapImages } from './buildSiteMapImages';
 import { buildSiteMapVideos } from './buildSiteMapVideos';
 import escape from 'lodash.escape';
-export var createPagesSitemap = function (pages, domain, changefreq, priority, dataType, publisher, customStaticPageCollection) {
-    var vid = dataType === 'pages'
+export var createPagesSitemap = function (pages, domain, publicationName, changefreq, priority, dataType, customStaticPageCollection) {
+    var vid = dataType === 'pageList'
         ? 'xmlns:video="http://www.google.com/schemas/sitemap-video/1.1"'
         : '';
-    return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <urlset \n    xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n    xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\"\n    ".concat(vid, "\n  >\n  ").concat(dataType === 'pages'
+    return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <urlset \n    xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n    xmlns:image=\"http://www.google.com/schemas/sitemap-image/1.1\"\n    ".concat(vid, "\n  >\n  ").concat(dataType === 'pageList'
         ? "\n    <url>\n      <loc>".concat(escape("https://".concat(domain)), "</loc> \n      <changefreq>").concat(escape(changefreq), "</changefreq>\n      <priority>").concat(escape(priority), "</priority>\n      <lastmod>").concat(escape(new Date().toISOString()), "</lastmod>\n    </url>  \n  ")
         : '', "\n  ").concat((customStaticPageCollection === null || customStaticPageCollection === void 0 ? void 0 : customStaticPageCollection.length)
         ? customStaticPageCollection
@@ -14,23 +14,22 @@ export var createPagesSitemap = function (pages, domain, changefreq, priority, d
             return "\n    <url>\n      <loc>".concat(escape("https://".concat(url || domain, "/").concat(slug)), "</loc>\n      <changefreq>").concat(escape(changefreq), "</changefreq>\n      <priority>").concat(escape(priority), "</priority>\n      <lastmod>").concat(escape(new Date().toISOString()), "</lastmod>\n    </url>\n    ");
         })
             .join('')
-        : '', "\n  ").concat(pages
+        : '', "\n  ").concat(pages.data
         .map(function (_a) {
-        var dateUpdated = _a.dateUpdated, slug = _a.slug, id = _a.id, body = _a.body, title = _a.title;
-        var url = dataType === 'competitions'
-            ? "https://".concat(domain, "/").concat(dataType, "/").concat(id, "/").concat(slug)
+        var id = _a.id, _b = _a.attributes, body = _b.body, headline = _b.headline, slug = _b.slug, dateUpdated = _b.dateUpdated;
+        var url = dataType === 'competitionList'
+            ? "https://".concat(domain, "/competitions/").concat(id, "/").concat(slug)
             : "https://".concat(domain, "/").concat(slug);
         var imagesSitemap = buildSiteMapImages(body);
-        var videoSitemap = buildSiteMapVideos({
-            domain: domain,
-            body: body,
-            headline: title,
-            publishedDateTime: dateUpdated,
+        var videoSitemap = buildSiteMapVideos(domain, publicationName, {
             id: id,
-            publisher: publisher,
-            articleCategory: dataType,
+            attributes: {
+                body: body,
+                headline: headline,
+                dateUpdated: dateUpdated,
+            },
         });
-        return "\n      <url>\n        <loc>".concat(escape(url), "</loc> \n        <changefreq>").concat(escape(changefreq), "</changefreq>\n        <priority>").concat(escape(priority), "</priority>\n        <lastmod>").concat(escape(dateUpdated), "</lastmod>\n        ").concat(imagesSitemap, "\n        ").concat(videoSitemap, "\n      </url>\n      ");
+        return "\n      <url>\n        <loc>".concat(escape(url), "</loc> \n        <changefreq>").concat(escape(changefreq), "</changefreq>\n        <priority>").concat(escape(priority), "</priority>\n        <lastmod>").concat(escape(escape(new Date(dateUpdated).toISOString())), "</lastmod>\n        ").concat(imagesSitemap, "\n        ").concat(videoSitemap, "\n      </url>\n      ");
     })
         .join(''), "\n  </urlset>\n  ");
 };

package/dist/esm/helpers/createSitemap/createPagesSitemap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPagesSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createPagesSitemap.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,KAAa,EACb,MAAc,EACd,UAAsB,EACtB,QAAkB,EAClB,QAAkB,EAClB,SAAoB,EACpB,0BAA+C;IAE/C,IAAM,GAAG,GACP,QAAQ,KAAK,OAAO;QAClB,CAAC,CAAC,+DAA+D;QACjE,CAAC,CAAC,EAAE,CAAA;IACR,OAAO,sMAIH,GAAG,sBAGL,QAAQ,KAAK,OAAO;QAClB,CAAC,CAAC,kCAEK,MAAM,CAAC,kBAAW,MAAM,CAAE,CAAC,wCACpB,MAAM,CAAC,UAAU,CAAC,4CACpB,MAAM,CAAC,QAAQ,CAAC,yCACjB,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,iCAE9C;QACG,CAAC,CAAC,EAAE,iBAGN,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM;QAChC,CAAC,CAAC,0BAA0B;aACvB,GAAG,CAAC,UAAC,EAAa;gBAAX,GAAG,SAAA,EAAE,IAAI,UAAA;YACf,OAAO,kCAEN,MAAM,CAAC,kBAAW,GAAG,IAAI,MAAM,cAAI,IAAI,CAAE,CAAC,uCACnC,MAAM,CAAC,UAAU,CAAC,4CACpB,MAAM,CAAC,QAAQ,CAAC,yCACjB,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,iCAE5C,CAAA;QACK,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC;QACb,CAAC,CAAC,EAAE,iBAEN,KAAK;SACJ,GAAG,CAAC,UAAC,EAA4C;YAA1C,WAAW,iBAAA,EAAE,IAAI,UAAA,EAAE,EAAE,QAAA,EAAE,IAAI,UAAA,EAAE,KAAK,WAAA;QACxC,IAAM,GAAG,GACP,QAAQ,KAAK,cAAc;YACzB,CAAC,CAAC,kBAAW,MAAM,cAAI,QAAQ,cAAI,EAAE,cAAI,IAAI,CAAE;YAC/C,CAAC,CAAC,kBAAW,MAAM,cAAI,IAAI,CAAE,CAAA;QACjC,IAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,kBAAkB,CAAC;YACtC,MAAM,QAAA;YACN,IAAI,MAAA;YACJ,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,WAAW;YAC9B,EAAE,IAAA;YACF,SAAS,WAAA;YACT,eAAe,EAAE,QAAQ;SAC1B,CAAC,CAAA;QACF,OAAO,sCAEE,MAAM,CAAC,GAAG,CAAC,0CACJ,MAAM,CAAC,UAAU,CAAC,8CACpB,MAAM,CAAC,QAAQ,CAAC,2CACjB,MAAM,CAAC,WAAW,CAAC,iCAC5B,aAAa,uBACb,YAAY,2BAEf,CAAA;IACH,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,sBAEV,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"createPagesSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createPagesSitemap.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,MAAM,MAAM,eAAe,CAAA;AAElC,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAChC,KAAe,EACf,MAAc,EACd,eAAuB,EACvB,UAAsB,EACtB,QAAkB,EAClB,QAAkB,EAClB,0BAA+C;IAE/C,IAAM,GAAG,GACP,QAAQ,KAAK,UAAU;QACrB,CAAC,CAAC,+DAA+D;QACjE,CAAC,CAAC,EAAE,CAAA;IACR,OAAO,sMAIH,GAAG,sBAGL,QAAQ,KAAK,UAAU;QACrB,CAAC,CAAC,kCAEK,MAAM,CAAC,kBAAW,MAAM,CAAE,CAAC,wCACpB,MAAM,CAAC,UAAU,CAAC,4CACpB,MAAM,CAAC,QAAQ,CAAC,yCACjB,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,iCAE9C;QACG,CAAC,CAAC,EAAE,iBAGN,CAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM;QAChC,CAAC,CAAC,0BAA0B;aACvB,GAAG,CAAC,UAAC,EAAa;gBAAX,GAAG,SAAA,EAAE,IAAI,UAAA;YACf,OAAO,kCAEN,MAAM,CAAC,kBAAW,GAAG,IAAI,MAAM,cAAI,IAAI,CAAE,CAAC,uCACnC,MAAM,CAAC,UAAU,CAAC,4CACpB,MAAM,CAAC,QAAQ,CAAC,yCACjB,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,iCAE5C,CAAA;QACK,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC;QACb,CAAC,CAAC,EAAE,iBAEN,KAAK,CAAC,IAAI;SACT,GAAG,CAAC,UAAC,EAA+D;YAA7D,EAAE,QAAA,EAAE,kBAAiD,EAAnC,IAAI,UAAA,EAAE,QAAQ,cAAA,EAAE,IAAI,UAAA,EAAE,WAAW,iBAAA;QACzD,IAAM,GAAG,GACP,QAAQ,KAAK,iBAAiB;YAC5B,CAAC,CAAC,kBAAW,MAAM,2BAAiB,EAAE,cAAI,IAAI,CAAE;YAChD,CAAC,CAAC,kBAAW,MAAM,cAAI,IAAI,CAAE,CAAA;QACjC,IAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE;YAC/D,EAAE,IAAA;YACF,UAAU,EAAE;gBACV,IAAI,MAAA;gBACJ,QAAQ,UAAA;gBACR,WAAW,aAAA;aACZ;SACS,CAAC,CAAA;QACb,OAAO,sCAEE,MAAM,CAAC,GAAG,CAAC,0CACJ,MAAM,CAAC,UAAU,CAAC,8CACpB,MAAM,CAAC,QAAQ,CAAC,2CACjB,MAAM,CACf,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,CAC5C,iCACC,aAAa,uBACb,YAAY,2BAEf,CAAA;IACH,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,sBAEV,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/helpers/createSitemap/getCategorySlug.d.ts

@@ -1,2 +1,2 @@
-import { Category } from '../types';
-export declare const getCategorySlug: (categories: Category[]) => string;
+import { ArticleCategory } from '../../rss/types';
+export declare const getCategorySlug: (categories: ArticleCategory[]) => string;

package/dist/esm/helpers/createSitemap/getCategorySlug.js

@@ -1,6 +1,7 @@
 export var getCategorySlug = function (categories) {
+    var _a, _b, _c, _d;
     if (!Array.isArray(categories) || categories.length === 0)
         return 'uncategorized';
-    return categories[0].slug || 'uncategorized';
+    return ((_d = (_c = (_b = (_a = categories[0]) === null || _a === void 0 ? void 0 : _a.category) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.attributes) === null || _d === void 0 ? void 0 : _d.slug) || 'uncategorized';
 };
 //# sourceMappingURL=getCategorySlug.js.map

package/dist/esm/helpers/createSitemap/getCategorySlug.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCategorySlug.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/getCategorySlug.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,eAAe,GAAG,UAAC,UAAsB;IACpD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QACvD,OAAO,eAAe,CAAA;IACxB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,eAAe,CAAA;AAC9C,CAAC,CAAA"}
+{"version":3,"file":"getCategorySlug.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/getCategorySlug.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,eAAe,GAAG,UAAC,UAA6B;;IAC3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QACvD,OAAO,eAAe,CAAA;IACxB,OAAO,CAAA,MAAA,MAAA,MAAA,MAAA,UAAU,CAAC,CAAC,CAAC,0CAAE,QAAQ,0CAAE,IAAI,0CAAE,UAAU,0CAAE,IAAI,KAAI,eAAe,CAAA;AAC3E,CAAC,CAAA"}

package/dist/esm/helpers/queryArticleList.d.ts

@@ -1,6 +1,7 @@
-import { ApolloHttpClient, Publisher } from '@newskit-render/api';
+import { ApolloHttpClient } from '@newskit-render/api';
 import { DocumentNode } from 'graphql';
-export declare const queryArticleList: <T>(publisher: Publisher, dates: {
+import { ArticleList } from 'rss/types';
+export declare const queryArticleList: (dates: {
     from: string;
     to?: string | undefined;
-}, apolloClient: ApolloHttpClient, articleQuery: DocumentNode) => Promise<T[]>;
+}, apolloClient: ApolloHttpClient, articleQuery: DocumentNode) => Promise<ArticleList>;

package/dist/esm/helpers/queryArticleList.js

@@ -34,51 +34,40 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-export var queryArticleList = function (publisher, dates, apolloClient, articleQuery) { return __awaiter(void 0, void 0, void 0, function () {
-    var cursor, countTotal, articleListData, from, to, data, data_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+export var queryArticleList = function (dates, apolloClient, articleQuery) { return __awaiter(void 0, void 0, void 0, function () {
+    var cursor, articleListData, hasMore, from, to, data, searchParams;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 cursor = '';
                 articleListData = [];
+                hasMore = false;
                 from = dates.from, to = dates.to;
-                return [4 /*yield*/, apolloClient.query({
-                        query: articleQuery,
-                        variables: {
-                            cursor: cursor,
-                            publisher: publisher,
-                            from: from,
-                            to: to,
-                        },
-                    })
-                    // Saving the cursor for the next query, if needed.
-                ];
-            case 1:
-                data = (_a.sent()).data;
-                // Saving the cursor for the next query, if needed.
-                cursor = data.articleList.pageCursors.next;
-                // Saving the number defining how many articles we expect to save in our collection
-                countTotal ? countTotal : (countTotal = data.articleList.meta.countTotal);
-                // Adding first bunch of article in the collection
-                articleListData = articleListData.concat(data.articleList.data);
-                _a.label = 2;
+                from = from || '';
+                to = to || '';
+                _c.label = 1;
+            case 1: return [4 /*yield*/, apolloClient.query({
+                    query: articleQuery,
+                    variables: {
+                        cursor: cursor,
+                        from: from,
+                        to: to,
+                    },
+                })];
             case 2:
-                if (!(articleListData.length < countTotal)) return [3 /*break*/, 4];
-                return [4 /*yield*/, apolloClient.query({
-                        query: articleQuery,
-                        variables: {
-                            cursor: cursor,
-                            publisher: publisher,
-                            from: from,
-                            to: to,
-                        },
-                    })];
+                data = (_c.sent()).data;
+                searchParams = new URLSearchParams((_a = data.articleList.links) === null || _a === void 0 ? void 0 : _a.next);
+                cursor = "&cursor=".concat(searchParams.get('cursor'));
+                articleListData = articleListData.concat(data.articleList.data);
+                hasMore = !!((_b = data.articleList.links) === null || _b === void 0 ? void 0 : _b.next);
+                _c.label = 3;
             case 3:
-                data_1 = (_a.sent()).data;
-                cursor = data_1.articleList.pageCursors.next;
-                articleListData = articleListData.concat(data_1.articleList.data);
-                return [3 /*break*/, 2];
-            case 4: return [2 /*return*/, articleListData];
+                if (hasMore) return [3 /*break*/, 1];
+                _c.label = 4;
+            case 4: return [2 /*return*/, {
+                    data: articleListData,
+                }];
         }
     });
 }); };

package/dist/esm/helpers/queryArticleList.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryArticleList.js","sourceRoot":"","sources":["../../../src/helpers/queryArticleList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAC9B,SAAoB,EACpB,KAAoC,EACpC,YAA8B,EAC9B,YAA0B;;;;;gBAEtB,MAAM,GAAG,EAAE,CAAA;gBAEX,eAAe,GAAQ,EAAE,CAAA;gBACrB,IAAI,GAAS,KAAK,KAAd,EAAE,EAAE,GAAK,KAAK,GAAV,CAAU;gBAGT,qBAAM,YAAY,CAAC,KAAK,CAAC;wBACxC,KAAK,EAAE,YAAY;wBACnB,SAAS,EAAE;4BACT,MAAM,EAAE,MAAM;4BACd,SAAS,EAAE,SAAS;4BACpB,IAAI,MAAA;4BACJ,EAAE,IAAA;yBACH;qBACF,CAAC;oBAEF,mDAAmD;kBAFjD;;gBARM,IAAI,GAAK,CAAA,SAQf,CAAA,KARU;gBAUZ,mDAAmD;gBACnD,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAA;gBAC1C,mFAAmF;gBACnF,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACzE,kDAAkD;gBAClD,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;;;qBAGxD,CAAA,eAAe,CAAC,MAAM,GAAG,UAAU,CAAA;gBACvB,qBAAM,YAAY,CAAC,KAAK,CAAC;wBACxC,KAAK,EAAE,YAAY;wBACnB,SAAS,EAAE;4BACT,MAAM,EAAE,MAAM;4BACd,SAAS,EAAE,SAAS;4BACpB,IAAI,MAAA;4BACJ,EAAE,IAAA;yBACH;qBACF,CAAC,EAAA;;gBARM,SAAS,CAAA,SAQf,CAAA,KARU;gBAUZ,MAAM,GAAG,MAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAA;gBAC1C,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,MAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;;oBAGjE,sBAAO,eAAe,EAAA;;;KACvB,CAAA"}
+{"version":3,"file":"queryArticleList.js","sourceRoot":"","sources":["../../../src/helpers/queryArticleList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAC9B,KAAoC,EACpC,YAA8B,EAC9B,YAA0B;;;;;;gBAEtB,MAAM,GAAG,EAAE,CAAA;gBACX,eAAe,GAAc,EAAE,CAAA;gBAC/B,OAAO,GAAG,KAAK,CAAA;gBACb,IAAI,GAAS,KAAK,KAAd,EAAE,EAAE,GAAK,KAAK,GAAV,CAAU;gBACxB,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;gBACjB,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;;oBAGM,qBAAM,YAAY,CAAC,KAAK,CAAC;oBACxC,KAAK,EAAE,YAAY;oBACnB,SAAS,EAAE;wBACT,MAAM,EAAE,MAAM;wBACd,IAAI,MAAA;wBACJ,EAAE,IAAA;qBACH;iBACF,CAAC,EAAA;;gBAPM,IAAI,GAAK,CAAA,SAOf,CAAA,KAPU;gBASN,YAAY,GAAG,IAAI,eAAe,CAAC,MAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAA;gBACtE,MAAM,GAAG,kBAAW,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAE,CAAA;gBAEhD,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAE/D,OAAO,GAAG,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,KAAK,0CAAE,IAAI,CAAA,CAAA;;;oBACjC,OAAO;;oBAEhB,sBAAO;oBACL,IAAI,EAAE,eAAe;iBACtB,EAAA;;;KACF,CAAA"}

package/dist/esm/helpers/queryPages.d.ts

@@ -1,3 +1,3 @@
-import { Page, DataType } from './types';
-import { ApolloHttpClient, Publisher } from '@newskit-render/api';
-export declare const queryPages: (publisher: Publisher, apolloClient: ApolloHttpClient, dataType?: DataType) => Promise<Page[]>;
+import { PageList, DataType } from './types';
+import { ApolloHttpClient } from '@newskit-render/api';
+export declare const queryPages: (apolloClient: ApolloHttpClient, dataType: DataType) => Promise<PageList>;

package/dist/esm/helpers/queryPages.js

@@ -34,39 +34,41 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { GET_PAGES, GET_COMPETITIONS } from '../sitemap/queries';
-export var queryPages = function (publisher, apolloClient, dataType) {
-    if (dataType === void 0) { dataType = 'pages'; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var dateQuery, pages, cursor, data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    dateQuery = {
-                        pages: GET_PAGES,
-                        competitions: GET_COMPETITIONS,
-                    };
-                    pages = [];
-                    cursor = '';
-                    _a.label = 1;
-                case 1: return [4 /*yield*/, apolloClient.query({
-                        query: dateQuery[dataType],
-                        variables: {
-                            cursor: cursor,
-                            publisher: publisher,
-                        },
-                    })];
-                case 2:
-                    data = (_a.sent()).data;
-                    cursor = data[dataType].pageCursors.next;
-                    pages = pages.concat(data[dataType].data);
-                    _a.label = 3;
-                case 3:
-                    if (cursor !== '') return [3 /*break*/, 1];
-                    _a.label = 4;
-                case 4: return [2 /*return*/, pages];
-            }
-        });
-    });
+import { GET_PAGE_LIST, GET_COMPETITION_LIST } from '../sitemap/queries';
+var dataQuery = {
+    pageList: GET_PAGE_LIST,
+    competitionList: GET_COMPETITION_LIST,
 };
+export var queryPages = function (apolloClient, dataType) { return __awaiter(void 0, void 0, void 0, function () {
+    var cursor, pagesData, hasMore, data, searchParams;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                cursor = '';
+                pagesData = [];
+                hasMore = false;
+                _c.label = 1;
+            case 1: return [4 /*yield*/, apolloClient.query({
+                    query: dataQuery[dataType],
+                    variables: {
+                        cursor: cursor,
+                    },
+                })];
+            case 2:
+                data = (_c.sent()).data;
+                searchParams = new URLSearchParams((_a = data[dataType].links) === null || _a === void 0 ? void 0 : _a.next);
+                cursor = "&cursor=".concat(searchParams.get('cursor'));
+                pagesData = pagesData.concat(data[dataType].data);
+                hasMore = !!((_b = data[dataType].links) === null || _b === void 0 ? void 0 : _b.next);
+                _c.label = 3;
+            case 3:
+                if (hasMore) return [3 /*break*/, 1];
+                _c.label = 4;
+            case 4: return [2 /*return*/, {
+                    data: pagesData,
+                }];
+        }
+    });
+}); };
 //# sourceMappingURL=queryPages.js.map