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

package/README.md

@@ -68,14 +68,13 @@ see `rssFeed` funtion
 
 #### genericSitemap
 
-`genericSitemap` - this function will handle the logic for 4 different views that correspond to the sitemap endpoints you should already have set up (see Create sitemap pages section). 
+`genericSitemap` - this function will handle the logic for 4 different views that correspond to the sitemap endpoints you should already have set up (see Create sitemap pages section).
 
 - `sitemap.xml` will show a `sitemapindex` of sitemaps by date.
 - `sitemap.xml?query=1` will show all articles created on that day, example `sitemap.xml?yyyy=2022&mm=10&dd=14`.
 - `pages-sitemap.xml` will show all pages including homepage - custom pages not available in the api can be added.
 - `competitions-sitemap.xml` will show all competitions.
 
-
 `genericSitemap` is passes a `context` object, depending on the view, it will include the following parameters:
 
 `dataType` can be `articles`, `pages` or `competitions`. Should be set to show `pages` or `competitions` view. Not setting this will result in default of `articles` used by `sitemap.xml` and `sitemap.xml?query=1`.
@@ -147,7 +146,7 @@ const defaultCustomStaticPagesCollection: CustomStaticPage[] = [
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   genericSitemap({
     res,
-    dataType: 'pages',
+    dataType: 'pageList',
     publisher: process.env.PUBLISHER as Publisher,
     domain: new URL(getHost(req) as string).host,
     publicationName: process.env.SITEMAP_PUBLICATION_NAME,
@@ -170,7 +169,7 @@ import { getHost } from '@newskit-render/shared-components'
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   genericSitemap({
     res,
-    dataType: 'competitions',
+    dataType: 'competitionList',
     publisher: process.env.PUBLISHER as Publisher,
     domain: new URL(getHost(req) as string).host,
     publicationName: process.env.SITEMAP_PUBLICATION_NAME,
@@ -251,6 +250,7 @@ Sitemap: ${new URL(getHost(req) as string)}competitions-sitemap.xml`
   res.end()
 }
 ```
+
 update the `next.config.js` file to add rewrites:
 
 ```

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

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

package/dist/cjs/config/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.contentApiXApiKey = exports.contentApiEnvUrl = void 0;
+var config = {
+    contentApiEnvUrl: process.env.CONTENT_API_ENV_URL,
+    contentApiXApiKey: process.env.CONTENT_API_X_API_KEY,
+};
+exports.contentApiEnvUrl = config.contentApiEnvUrl, exports.contentApiXApiKey = config.contentApiXApiKey;
+//# sourceMappingURL=index.js.map

package/dist/cjs/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;AAEc,QAAA,gBAAgB,GAAwB,MAAM,mBAA5B,QAAA,iBAAiB,GAAK,MAAM,mBAAA"}

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

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

package/dist/cjs/helpers/client.js

@@ -0,0 +1,35 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getApolloRestClient = void 0;
+var api_1 = require("@newskit-render/api");
+var client_1 = require("@apollo/client");
+var apollo_link_rest_1 = require("apollo-link-rest");
+var apollo_cache_policies_1 = require("@nerdwallet/apollo-cache-policies");
+var config_1 = require("../config");
+var publisherSlugs = (_a = {},
+    _a[api_1.Publisher.VIRGIN] = 'virgin-radio',
+    _a[api_1.Publisher.TALK_TV] = 'talk-tv',
+    _a);
+var getRestLink = function (publisher) {
+    return new apollo_link_rest_1.RestLink({
+        uri: "".concat(config_1.contentApiEnvUrl, "/api/v1/").concat(publisherSlugs[publisher], "/"),
+        headers: {
+            'x-api-key': config_1.contentApiXApiKey,
+            'Content-Type': 'application/vnd.api+json',
+        },
+    });
+};
+var fiveMinutes = 5 * 60 * 1000;
+var getApolloRestClient = function (publisher) {
+    return new client_1.ApolloClient({
+        link: getRestLink(publisher),
+        cache: new apollo_cache_policies_1.InvalidationPolicyCache({
+            invalidationPolicies: {
+                timeToLive: fiveMinutes,
+            },
+        }),
+    });
+};
+exports.getApolloRestClient = getApolloRestClient;
+//# sourceMappingURL=client.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/helpers/client.ts"],"names":[],"mappings":";;;;AAAA,2CAA+C;AAC/C,yCAA6C;AAC7C,qDAA2C;AAC3C,2EAA2E;AAC3E,oCAA+D;AAE/D,IAAM,cAAc;IAClB,GAAC,eAAS,CAAC,MAAM,IAAG,cAAc;IAClC,GAAC,eAAS,CAAC,OAAO,IAAG,SAAS;OAC/B,CAAA;AAED,IAAM,WAAW,GAAG,UAAC,SAAoB;IACvC,OAAO,IAAI,2BAAQ,CAAC;QAClB,GAAG,EAAE,UAAG,yBAAgB,qBAAW,cAAc,CAAC,SAAS,CAAC,MAAG;QAC/D,OAAO,EAAE;YACP,WAAW,EAAE,0BAAiB;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,qBAAY,CAAC;QACtB,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;QAC5B,KAAK,EAAE,IAAI,+CAAuB,CAAC;YACjC,oBAAoB,EAAE;gBACpB,UAAU,EAAE,WAAW;aACxB;SACF,CAAC;KACH,CAAC,CAAA;AACJ,CAAC,CAAA;AAEQ,kDAAmB"}

package/dist/cjs/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/cjs/helpers/createSitemap/buildSiteMapImages.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSiteMapImages = void 0;
 var lodash_escape_1 = __importDefault(require("lodash.escape"));
 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((0, lodash_escape_1.default)(url), "</image:loc>\n  ").concat(caption ? "<image:caption>".concat((0, lodash_escape_1.default)(caption), "</image:caption>") : "", "\n  ").concat(credit ? "<image:credit>".concat((0, lodash_escape_1.default)(credit), "</image:credit>") : "", "\n</image:image>\n");
     })
         .join('');

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

@@ -1 +1 @@
-{"version":3,"file":"buildSiteMapImages.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapImages.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,GAAG,CAAC,6BACtB,OAAO,CAAC,CAAC,CAAC,yBAAkB,IAAA,uBAAM,EAAC,OAAO,CAAC,qBAAkB,CAAC,CAAC,CAAC,EAAE,iBAClE,MAAM,CAAC,CAAC,CAAC,wBAAiB,IAAA,uBAAM,EAAC,MAAM,CAAC,oBAAiB,CAAC,CAAC,CAAC,EAAE,uBAEjE;IAN+C,CAM/C,CACI;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA;AAfY,QAAA,kBAAkB,sBAe9B"}
+{"version":3,"file":"buildSiteMapImages.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapImages.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,GAAG,CAAC,6BACtB,OAAO,CAAC,CAAC,CAAC,yBAAkB,IAAA,uBAAM,EAAC,OAAO,CAAC,qBAAkB,CAAC,CAAC,CAAC,EAAE,iBAClE,MAAM,CAAC,CAAC,CAAC,wBAAiB,IAAA,uBAAM,EAAC,MAAM,CAAC,oBAAiB,CAAC,CAAC,CAAC,EAAE,uBAEjE;IAN+D,CAM/D,CACI;SACA,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA;AAfY,QAAA,kBAAkB,sBAe9B"}

package/dist/cjs/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/cjs/helpers/createSitemap/buildSiteMapVideos.js

@@ -5,14 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSiteMapVideos = void 0;
 var lodash_escape_1 = __importDefault(require("lodash.escape"));
-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; });
+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((0, lodash_escape_1.default)(playerLoc), "</video:player_loc>\n  <video:thumbnail_loc>NA</video:thumbnail_loc>\n  <video:title>").concat((0, lodash_escape_1.default)(headline), "</video:title>\n  <video:description>NA</video:description>\n  <video:publication_date>").concat((0, lodash_escape_1.default)(publishedDateTime), "</video:publication_date>\n  <video:uploader>").concat((0, lodash_escape_1.default)(publisher), "</video:uploader>\n  <video:requires_subscription>No</video:requires_subscription>\n  <video:category>").concat((0, lodash_escape_1.default)(articleCategory), "</video:category>\n  <video:live>No</video:live>\n</video:video>\n");
+        return "\n<video:video>\n  <video:player_loc>".concat((0, lodash_escape_1.default)(playerLoc), "</video:player_loc>\n  <video:thumbnail_loc>NA</video:thumbnail_loc>\n  <video:title>").concat((0, lodash_escape_1.default)(headline), "</video:title>\n  <video:description>NA</video:description>\n  <video:publication_date>").concat((0, lodash_escape_1.default)(new Date(datePublished).toISOString()), "</video:publication_date>\n  <video:uploader>").concat((0, lodash_escape_1.default)(publicationName), "</video:uploader>\n  <video:requires_subscription>No</video:requires_subscription>\n  <video:category>").concat((0, lodash_escape_1.default)(((_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/cjs/helpers/createSitemap/buildSiteMapVideos.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSiteMapVideos.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapVideos.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,SAAS,CAAC,kGAEtB,IAAA,uBAAM,EAAC,QAAQ,CAAC,oGAEL,IAAA,uBAAM,EAAC,iBAAiB,CAAC,0DACjC,IAAA,uBAAM,EAAC,SAAS,CAAC,mHAEjB,IAAA,uBAAM,EAAC,eAAe,CAAC,uEAG1C,CAAA;IACG,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC,CAAA;AAvCY,QAAA,kBAAkB,sBAuC9B"}
+{"version":3,"file":"buildSiteMapVideos.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/buildSiteMapVideos.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,SAAS,CAAC,kGAEtB,IAAA,uBAAM,EAAC,QAAQ,CAAC,oGAEL,IAAA,uBAAM,EAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CACtC,0DACiB,IAAA,uBAAM,EAAC,eAAe,CAAC,mHAEvB,IAAA,uBAAM,EACtB,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;AAlCY,QAAA,kBAAkB,sBAkC9B"}

package/dist/cjs/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/cjs/helpers/createSitemap/createArticleSitemap.js

@@ -6,31 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createArticleSitemap = void 0;
 var getSitemapHeaders_1 = require("./getSitemapHeaders");
 var getCategorySlug_1 = require("./getCategorySlug");
-var generateArticleSlug_1 = require("./generateArticleSlug");
 var buildSiteMapImages_1 = require("./buildSiteMapImages");
 var buildSiteMapVideos_1 = require("./buildSiteMapVideos");
 var lodash_escape_1 = __importDefault(require("lodash.escape"));
 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 = (0, getSitemapHeaders_1.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 = (0, getCategorySlug_1.getCategorySlug)(categories);
-        var articleSlug = (0, generateArticleSlug_1.generateArticleSlug)(headline);
         var imagesSitemap = (0, buildSiteMapImages_1.buildSiteMapImages)(body);
-        var videoSitemap = (0, buildSiteMapVideos_1.buildSiteMapVideos)({
-            domain: domain,
-            body: body,
-            headline: headline,
-            publishedDateTime: publishedDateTime,
+        var videoSitemap = (0, buildSiteMapVideos_1.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((0, lodash_escape_1.default)(loc), "</loc> \n           ").concat(isNewsSitemap
-            ? "<news:news>\n             <news:publication>\n             <news:name>".concat((0, lodash_escape_1.default)(publicationName), "</news:name>\n             <news:language>en</news:language>\n             </news:publication>\n             <news:publication_date>").concat((0, lodash_escape_1.default)(publishedDateTime), "</news:publication_date>\n             <news:title>").concat((0, lodash_escape_1.default)(headline), "</news:title>\n           </news:news>")
-            : '', " \n            <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n            <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n            <lastmod>").concat((0, lodash_escape_1.default)(updatedDateTime), "</lastmod>\n            ").concat(imagesSitemap, "\n            ").concat(videoSitemap, "\n          </url>\n        ");
+            ? "<news:news>\n             <news:publication>\n             <news:name>".concat((0, lodash_escape_1.default)(publicationName), "</news:name>\n             <news:language>en</news:language>\n             </news:publication>\n             <news:publication_date>").concat((0, lodash_escape_1.default)(new Date(datePublished).toISOString()), "</news:publication_date>\n             <news:title>").concat((0, lodash_escape_1.default)(headline), "</news:title>\n           </news:news>")
+            : '', " \n            <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n            <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n            <lastmod>").concat((0, lodash_escape_1.default)(new Date(dateUpdated).toISOString()), "</lastmod>\n            ").concat(imagesSitemap, "\n            ").concat(videoSitemap, "\n          </url>\n        ");
     })
         .join(''), "\n  </urlset>\n");
 };

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

@@ -1 +1 @@
-{"version":3,"file":"createArticleSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createArticleSitemap.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAuD;AACvD,qDAAmD;AACnD,6DAA2D;AAC3D,2DAAyD;AACzD,2DAAyD;AAEzD,gEAAkC;AAE3B,IAAM,oBAAoB,GAAG,UAClC,YAAyB,EACzB,MAAc,EACd,eAAuB,EACvB,aAAsB,EACtB,UAAsB,EACtB,QAAkB;IAElB,IAAM,aAAa,GAAG,IAAA,qCAAiB,EAAC,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,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAA;QACnD,IAAM,WAAW,GAAG,IAAA,yCAAmB,EAAC,QAAQ,CAAC,CAAA;QACjD,IAAM,aAAa,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,IAAA,uCAAkB,EAAC;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,IAAA,uBAAM,EAAC,GAAG,CAAC,iCAEjB,aAAa;YACX,CAAC,CAAC,gFAES,IAAA,uBAAM,EAAC,eAAe,CAAC,iJAGX,IAAA,uBAAM,EAC7B,iBAAiB,CAClB,gEACa,IAAA,uBAAM,EAAC,QAAQ,CAAC,2CACnB;YACT,CAAC,CAAC,EAAE,wCAEO,IAAA,uBAAM,EAAC,UAAU,CAAC,kDACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,+CACjB,IAAA,uBAAM,EAAC,eAAe,CAAC,qCAChC,aAAa,2BACb,YAAY,iCAEjB,CAAA;IACD,CAAC,CACF;SACA,IAAI,CAAC,EAAE,CAAC,oBAEd,CAAA;AACD,CAAC,CAAA;AApEY,QAAA,oBAAoB,wBAoEhC"}
+{"version":3,"file":"createArticleSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createArticleSitemap.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAuD;AACvD,qDAAmD;AACnD,2DAAyD;AACzD,2DAAyD;AAGzD,gEAAkC;AAE3B,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,IAAA,qCAAiB,EAAC,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,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAA;QACnD,IAAM,aAAa,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,IAAA,uCAAkB,EAAC,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,IAAA,uBAAM,EAAC,GAAG,CAAC,iCAEjB,aAAa;YACX,CAAC,CAAC,gFAES,IAAA,uBAAM,EAAC,eAAe,CAAC,iJAGX,IAAA,uBAAM,EAC7B,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CACtC,gEACa,IAAA,uBAAM,EAAC,QAAQ,CAAC,2CACnB;YACT,CAAC,CAAC,EAAE,wCAEO,IAAA,uBAAM,EAAC,UAAU,CAAC,kDACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,+CACjB,IAAA,uBAAM,EAAC,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;AA5EY,QAAA,oBAAoB,wBA4EhC"}

package/dist/cjs/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/cjs/helpers/createSitemap/createPagesSitemap.js

@@ -7,11 +7,11 @@ exports.createPagesSitemap = void 0;
 var buildSiteMapImages_1 = require("./buildSiteMapImages");
 var buildSiteMapVideos_1 = require("./buildSiteMapVideos");
 var lodash_escape_1 = __importDefault(require("lodash.escape"));
-var createPagesSitemap = function (pages, domain, changefreq, priority, dataType, publisher, customStaticPageCollection) {
-    var vid = dataType === 'pages'
+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((0, lodash_escape_1.default)("https://".concat(domain)), "</loc> \n      <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n      <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n      <lastmod>").concat((0, lodash_escape_1.default)(new Date().toISOString()), "</lastmod>\n    </url>  \n  ")
         : '', "\n  ").concat((customStaticPageCollection === null || customStaticPageCollection === void 0 ? void 0 : customStaticPageCollection.length)
         ? customStaticPageCollection
@@ -20,23 +20,22 @@ var createPagesSitemap = function (pages, domain, changefreq, priority, dataType
             return "\n    <url>\n      <loc>".concat((0, lodash_escape_1.default)("https://".concat(url || domain, "/").concat(slug)), "</loc>\n      <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n      <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n      <lastmod>").concat((0, lodash_escape_1.default)(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 = (0, buildSiteMapImages_1.buildSiteMapImages)(body);
-        var videoSitemap = (0, buildSiteMapVideos_1.buildSiteMapVideos)({
-            domain: domain,
-            body: body,
-            headline: title,
-            publishedDateTime: dateUpdated,
+        var videoSitemap = (0, buildSiteMapVideos_1.buildSiteMapVideos)(domain, publicationName, {
             id: id,
-            publisher: publisher,
-            articleCategory: dataType,
+            attributes: {
+                body: body,
+                headline: headline,
+                dateUpdated: dateUpdated,
+            },
         });
-        return "\n      <url>\n        <loc>".concat((0, lodash_escape_1.default)(url), "</loc> \n        <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n        <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n        <lastmod>").concat((0, lodash_escape_1.default)(dateUpdated), "</lastmod>\n        ").concat(imagesSitemap, "\n        ").concat(videoSitemap, "\n      </url>\n      ");
+        return "\n      <url>\n        <loc>".concat((0, lodash_escape_1.default)(url), "</loc> \n        <changefreq>").concat((0, lodash_escape_1.default)(changefreq), "</changefreq>\n        <priority>").concat((0, lodash_escape_1.default)(priority), "</priority>\n        <lastmod>").concat((0, lodash_escape_1.default)((0, lodash_escape_1.default)(new Date(dateUpdated).toISOString())), "</lastmod>\n        ").concat(imagesSitemap, "\n        ").concat(videoSitemap, "\n      </url>\n      ");
     })
         .join(''), "\n  </urlset>\n  ");
 };

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

@@ -1 +1 @@
-{"version":3,"file":"createPagesSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createPagesSitemap.ts"],"names":[],"mappings":";;;;;;AAQA,2DAAyD;AACzD,2DAAyD;AACzD,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,kBAAW,MAAM,CAAE,CAAC,wCACpB,IAAA,uBAAM,EAAC,UAAU,CAAC,4CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,yCACjB,IAAA,uBAAM,EAAC,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,IAAA,uBAAM,EAAC,kBAAW,GAAG,IAAI,MAAM,cAAI,IAAI,CAAE,CAAC,uCACnC,IAAA,uBAAM,EAAC,UAAU,CAAC,4CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,yCACjB,IAAA,uBAAM,EAAC,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,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,IAAA,uCAAkB,EAAC;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,IAAA,uBAAM,EAAC,GAAG,CAAC,0CACJ,IAAA,uBAAM,EAAC,UAAU,CAAC,8CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,2CACjB,IAAA,uBAAM,EAAC,WAAW,CAAC,iCAC5B,aAAa,uBACb,YAAY,2BAEf,CAAA;IACH,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,sBAEV,CAAA;AACH,CAAC,CAAA;AA7EY,QAAA,kBAAkB,sBA6E9B"}
+{"version":3,"file":"createPagesSitemap.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/createPagesSitemap.ts"],"names":[],"mappings":";;;;;;AASA,2DAAyD;AACzD,2DAAyD;AACzD,gEAAkC;AAE3B,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,IAAA,uBAAM,EAAC,kBAAW,MAAM,CAAE,CAAC,wCACpB,IAAA,uBAAM,EAAC,UAAU,CAAC,4CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,yCACjB,IAAA,uBAAM,EAAC,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,IAAA,uBAAM,EAAC,kBAAW,GAAG,IAAI,MAAM,cAAI,IAAI,CAAE,CAAC,uCACnC,IAAA,uBAAM,EAAC,UAAU,CAAC,4CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,yCACjB,IAAA,uBAAM,EAAC,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,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAA;QAC9C,IAAM,YAAY,GAAG,IAAA,uCAAkB,EAAC,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,IAAA,uBAAM,EAAC,GAAG,CAAC,0CACJ,IAAA,uBAAM,EAAC,UAAU,CAAC,8CACpB,IAAA,uBAAM,EAAC,QAAQ,CAAC,2CACjB,IAAA,uBAAM,EACf,IAAA,uBAAM,EAAC,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;AA9EY,QAAA,kBAAkB,sBA8E9B"}

package/dist/cjs/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/cjs/helpers/createSitemap/getCategorySlug.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCategorySlug = void 0;
 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';
 };
 exports.getCategorySlug = getCategorySlug;
 //# sourceMappingURL=getCategorySlug.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getCategorySlug.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/getCategorySlug.ts"],"names":[],"mappings":";;;AAEO,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;AAJY,QAAA,eAAe,mBAI3B"}
+{"version":3,"file":"getCategorySlug.js","sourceRoot":"","sources":["../../../../src/helpers/createSitemap/getCategorySlug.ts"],"names":[],"mappings":";;;AAEO,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;AAJY,QAAA,eAAe,mBAI3B"}

package/dist/cjs/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/cjs/helpers/queryArticleList.js

@@ -37,51 +37,40 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryArticleList = void 0;
-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) {
+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/cjs/helpers/queryArticleList.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryArticleList.js","sourceRoot":"","sources":["../../../src/helpers/queryArticleList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGO,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;AA9CY,QAAA,gBAAgB,oBA8C5B"}
+{"version":3,"file":"queryArticleList.js","sourceRoot":"","sources":["../../../src/helpers/queryArticleList.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIO,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;AAjCY,QAAA,gBAAgB,oBAiC5B"}

package/dist/cjs/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/cjs/helpers/queryPages.js

@@ -38,39 +38,41 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryPages = void 0;
 var queries_1 = require("../sitemap/queries");
-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: queries_1.GET_PAGES,
-                        competitions: queries_1.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];
-            }
-        });
-    });
+var dataQuery = {
+    pageList: queries_1.GET_PAGE_LIST,
+    competitionList: queries_1.GET_COMPETITION_LIST,
 };
+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,
+                }];
+        }
+    });
+}); };
 exports.queryPages = queryPages;
 //# sourceMappingURL=queryPages.js.map

package/dist/cjs/helpers/queryPages.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryPages.js","sourceRoot":"","sources":["../../../src/helpers/queryPages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAgE;AAIzD,IAAM,UAAU,GAAG,UACxB,SAAoB,EACpB,YAA8B,EAC9B,QAA4B;IAA5B,yBAAA,EAAA,kBAA4B;;;;;;oBAEtB,SAAS,GAAG;wBAChB,KAAK,EAAE,mBAAS;wBAChB,YAAY,EAAE,0BAAgB;qBAC/B,CAAA;oBACG,KAAK,GAAG,EAAE,CAAA;oBACV,MAAM,GAAG,EAAE,CAAA;;wBAEI,qBAAM,YAAY,CAAC,KAAK,CAAC;wBACxC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC;wBAC1B,SAAS,EAAE;4BACT,MAAM,QAAA;4BACN,SAAS,WAAA;yBACV;qBACF,CAAC,EAAA;;oBANM,IAAI,GAAK,CAAA,SAMf,CAAA,KANU;oBAOZ,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,IAAI,CAAA;oBAExC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;;;wBAClC,MAAM,KAAK,EAAE;;wBACtB,sBAAO,KAAK,EAAA;;;;CACb,CAAA;AAxBY,QAAA,UAAU,cAwBtB"}
+{"version":3,"file":"queryPages.js","sourceRoot":"","sources":["../../../src/helpers/queryPages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwE;AAIxE,IAAM,SAAS,GAAG;IAChB,QAAQ,EAAE,uBAAa;IACvB,eAAe,EAAE,8BAAoB;CACtC,CAAA;AAEM,IAAM,UAAU,GAAG,UACxB,YAA8B,EAC9B,QAAkB;;;;;;gBAEd,MAAM,GAAG,EAAE,CAAA;gBACX,SAAS,GAAW,EAAE,CAAA;gBACtB,OAAO,GAAG,KAAK,CAAA;;oBAGA,qBAAM,YAAY,CAAC,KAAK,CAAC;oBACxC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC;oBAC1B,SAAS,EAAE;wBACT,MAAM,QAAA;qBACP;iBACF,CAAC,EAAA;;gBALM,IAAI,GAAK,CAAA,SAKf,CAAA,KALU;gBAON,YAAY,GAAG,IAAI,eAAe,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAA;gBACpE,MAAM,GAAG,kBAAW,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAE,CAAA;gBAEhD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;gBAEjD,OAAO,GAAG,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAA,CAAA;;;oBAC/B,OAAO;;oBAChB,sBAAO;oBACL,IAAI,EAAE,SAAS;iBAChB,EAAA;;;KACF,CAAA;AA1BY,QAAA,UAAU,cA0BtB"}