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

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

@@ -1 +1 @@
-{"version":3,"file":"queryPages.js","sourceRoot":"","sources":["../../../src/helpers/queryPages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAIhE,MAAM,CAAC,IAAM,UAAU,GAAG,UACxB,SAAoB,EACpB,YAA8B,EAC9B,QAA4B;IAA5B,yBAAA,EAAA,kBAA4B;;;;;;oBAEtB,SAAS,GAAG;wBAChB,KAAK,EAAE,SAAS;wBAChB,YAAY,EAAE,gBAAgB;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"}
+{"version":3,"file":"queryPages.js","sourceRoot":"","sources":["../../../src/helpers/queryPages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAIxE,IAAM,SAAS,GAAG;IAChB,QAAQ,EAAE,aAAa;IACvB,eAAe,EAAE,oBAAoB;CACtC,CAAA;AAED,MAAM,CAAC,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"}

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

@@ -2,6 +2,7 @@
 import { NextApiResponse } from 'next';
 import { ParsedUrlQuery } from 'querystring';
 import { Publisher } from '@newskit-render/api';
+import { Body } from '../rss/types';
 export type ImageBlock = {
     url: string;
     caption?: string;
@@ -14,51 +15,27 @@ export type VideoBrightcoveBlock = {
     playerId: string;
     type: string;
 };
-export type ArticleBody = ImageBlock | VideoBrightcoveBlock;
 export declare enum BlockTypes {
     ImageBlock = "ImageBlock",
     VideoBrightcoveBlock = "VideoBrightcoveBlock"
 }
-export type Category = {
-    id: string;
-    parentId?: string;
-    slug: string;
-    title: string;
-    type: string;
-};
-export type Article = {
-    id: string | number;
-    headline: string;
-    publishedDateTime: string;
-    updatedDateTime: string;
-    publisher: Publisher;
-    body: ArticleBody[];
-    categories: Category[];
-};
 export type ChangeFreq = 'never' | 'yearly' | 'monthly' | 'weekly' | 'daily' | 'hourly' | 'always';
 export type Priority = '1.0' | '0.9' | '0.8' | '0.7' | '0.6' | '0.5' | '0.4' | '0.3' | '0.2' | '0.1' | '0.0';
 export interface CustomStaticPage {
     slug: string;
     url?: string;
 }
+export interface PageList {
+    data: Page[];
+}
 export interface Page {
     id: string;
-    title: string;
-    datePublished?: string;
-    dateUpdated: string;
-    slug: string;
-    body: ArticleBody[];
-}
-export interface StaticPageQueryResponse {
-    data: {
-        page: {
-            id: string;
-            title: string;
-            datePublished: string;
-            dateUpdated: string;
-            slug: string;
-            body: ArticleBody[];
-        };
+    type: 'page' | 'competition';
+    attributes: {
+        body: Body[];
+        headline: string;
+        slug: string;
+        dateUpdated: string;
     };
 }
 export type SitemapConfig = {
@@ -70,10 +47,9 @@ export type SitemapConfig = {
     changefreq?: ChangeFreq;
     priority?: Priority;
 };
-export type DataType = 'articles' | 'pages' | 'competitions';
+export type DataType = 'articleList' | 'pageList' | 'competitionList';
 export type GenericSitemapConfig = SitemapConfig & {
     dataType?: DataType;
     firstArticleDate?: string;
     query?: ParsedUrlQuery;
 };
-export type ArticleList = Article[];

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/helpers/types.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,uCAAyB,CAAA;IACzB,2DAA6C,CAAA;AAC/C,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/helpers/types.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,uCAAyB,CAAA;IACzB,2DAA6C,CAAA;AAC/C,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}

package/dist/esm/rss/RSSFeedResolver.js

@@ -36,10 +36,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { setResponse } from '../helpers/utils';
 import { createRSSFeed } from './contentEncodedUtils/createRSSFeed';
-import { createApolloClient, ClientTypes } from '@newskit-render/api';
 import { queryArticleList } from '../helpers/queryArticleList';
-import { GET_ARTICLE_LIST as GET_ARTICLE_LIST_FULL } from './queries';
+import { GET_ARTICLE_LIST } from './queries';
 import { getFromDate } from './helpers/articleHelper';
+import { getApolloRestClient } from '../helpers/client';
 export var rssFeed = function (_a) {
     var res = _a.res, publisher = _a.publisher, domain = _a.domain, titeAttributes = _a.titeAttributes;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -48,11 +48,9 @@ export var rssFeed = function (_a) {
             switch (_b.label) {
                 case 0:
                     dates = { from: getFromDate(30) };
-                    return [4 /*yield*/, createApolloClient(ClientTypes.nkapi)];
+                    apolloClient = getApolloRestClient(publisher);
+                    return [4 /*yield*/, queryArticleList(dates, apolloClient, GET_ARTICLE_LIST)];
                 case 1:
-                    apolloClient = _b.sent();
-                    return [4 /*yield*/, queryArticleList(publisher, dates, apolloClient, GET_ARTICLE_LIST_FULL)];
-                case 2:
                     articleListCollection = _b.sent();
                     html = createRSSFeed(domain, titeAttributes, articleListCollection);
                     setResponse(res, html, 'application/rss+xml; charset=UTF-8');

package/dist/esm/rss/RSSFeedResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RSSFeedResolver.js","sourceRoot":"","sources":["../../../src/rss/RSSFeedResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,IAAI,qBAAqB,EAAE,MAAM,WAAW,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,MAAM,CAAC,IAAM,OAAO,GAAG,UAAO,EAKf;QAJb,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,cAAc,oBAAA;;;;;;oBAER,KAAK,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,CAAA;oBAElB,qBAAM,kBAAkB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAA;;oBAA1D,YAAY,GAAG,SAA2C;oBAClC,qBAAM,gBAAgB,CAClD,SAAS,EACT,KAAK,EACL,YAAY,EACZ,qBAAqB,CACtB,EAAA;;oBALK,qBAAqB,GAAG,SAK7B;oBAEK,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,qBAAqB,CAAC,CAAA;oBACzE,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,oCAAoC,CAAC,CAAA;;;;;CAC7D,CAAA"}
+{"version":3,"file":"RSSFeedResolver.js","sourceRoot":"","sources":["../../../src/rss/RSSFeedResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAEvD,MAAM,CAAC,IAAM,OAAO,GAAG,UAAO,EAKf;QAJb,GAAG,SAAA,EACH,SAAS,eAAA,EACT,MAAM,YAAA,EACN,cAAc,oBAAA;;;;;;oBAER,KAAK,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,CAAA;oBAEjC,YAAY,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAA;oBACrB,qBAAM,gBAAgB,CAClD,KAAK,EACL,YAAY,EACZ,gBAAgB,CACjB,EAAA;;oBAJK,qBAAqB,GAAG,SAI7B;oBAEK,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,qBAAqB,CAAC,CAAA;oBACzE,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,oCAAoC,CAAC,CAAA;;;;;CAC7D,CAAA"}

package/dist/esm/rss/__tests__/mocks.d.ts

@@ -1,239 +1,163 @@
-import { Body, TiteAttributes } from '../types';
+import { TiteAttributes, Article } from '../types';
 export declare const domainMock = "https://demo.com";
 export declare const lastBuildDateMock: string;
 export declare const updatedDateTimeMock = "Tue, 12 Apr 2022 11:17:09 GMT";
 export declare const titeAttributesMock: TiteAttributes;
 export declare const titeAttributesdefaultMock: TiteAttributes;
-export declare const articleListMock: ({
-    categories: {
-        slug: string;
-    }[];
-    bylines: {
-        name: string;
-    }[];
-    summary: null;
-    publisher: string;
-    publishedDateTime: string;
-    updatedDateTime: string;
-    headline: string;
-    id: string;
-    body: Body[];
-} | {
-    categories: {
-        slug: string;
-    }[];
-    bylines: {
-        name: string;
-    }[];
-    summary: {
-        children: {
-            text: string;
-        }[];
-    };
-    publisher: string;
-    publishedDateTime: string;
-    updatedDateTime: string;
-    headline: string;
-    id: string;
-    body: Body[];
-} | {
-    categories: {
-        name: string;
-    }[];
-    bylines: null;
-    summary: {
-        children: {
-            text: string;
-        }[];
-    };
-    publisher: string;
-    publishedDateTime: string;
-    updatedDateTime: string;
-    headline: string;
-    id: string;
-    body: Body[];
-})[];
+export declare const articleListMock: Article[];
 export declare const rssMock: string;
-export declare const articleListWithBodyMock: {
-    categories: {
-        slug: string;
-    }[];
-    bylines: {
-        name: string;
-    }[];
-    summary: null;
-    publisher: string;
-    publishedDateTime: string;
-    updatedDateTime: string;
-    headline: string;
-    id: string;
-    body: Body[];
-}[];
+export declare const articleListWithBodyMock: Article[];
 export declare const rssWithBodyMock: string;
 export declare const mockBodyBlocks: ({
     type: string;
-    paragraphs: ({
-        bold: boolean;
-        italic: boolean;
-        underline: boolean;
-        text: string;
+    children: ({
         type: string;
-        monospace: boolean;
-        url?: undefined;
+        attributes: {
+            bold: boolean;
+            italic: boolean;
+            underline: boolean;
+            text: string;
+            monospace: boolean;
+            url?: undefined;
+        };
     } | {
-        url: string;
-        text: string;
         type: string;
-        bold?: undefined;
-        italic?: undefined;
-        underline?: undefined;
-        monospace?: undefined;
+        attributes: {
+            url: string;
+            text: string;
+            bold?: undefined;
+            italic?: undefined;
+            underline?: undefined;
+            monospace?: undefined;
+        };
     })[];
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    url?: undefined;
-    id?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    level?: undefined;
-    children?: undefined;
-    items?: undefined;
+    attributes?: undefined;
 } | {
     type: string;
-    alt: string;
-    caption: string;
-    credit: string;
-    height: number;
-    width: number;
-    url: string;
-    paragraphs?: undefined;
-    id?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    level?: undefined;
+    attributes: {
+        alt: string;
+        caption: string;
+        credit: string;
+        height: number;
+        width: number;
+        url: string;
+        id?: undefined;
+        playerId?: undefined;
+        accountId?: undefined;
+        level?: undefined;
+    };
     children?: undefined;
-    items?: undefined;
 } | {
     type: string;
-    id: string;
-    paragraphs?: undefined;
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    url?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    level?: undefined;
+    attributes: {
+        id: string;
+        alt?: undefined;
+        caption?: undefined;
+        credit?: undefined;
+        height?: undefined;
+        width?: undefined;
+        url?: undefined;
+        playerId?: undefined;
+        accountId?: undefined;
+        level?: undefined;
+    };
     children?: undefined;
-    items?: undefined;
 } | {
     type: string;
-    url: string;
-    paragraphs?: undefined;
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    id?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    level?: undefined;
+    attributes: {
+        url: string;
+        alt?: undefined;
+        caption?: undefined;
+        credit?: undefined;
+        height?: undefined;
+        width?: undefined;
+        id?: undefined;
+        playerId?: undefined;
+        accountId?: undefined;
+        level?: undefined;
+    };
     children?: undefined;
-    items?: undefined;
 } | {
     type: string;
-    id: string;
-    playerId: string;
-    accountId: string;
-    paragraphs?: undefined;
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    url?: undefined;
-    level?: undefined;
+    attributes: {
+        id: string;
+        playerId: string;
+        accountId: string;
+        alt?: undefined;
+        caption?: undefined;
+        credit?: undefined;
+        height?: undefined;
+        width?: undefined;
+        url?: undefined;
+        level?: undefined;
+    };
     children?: undefined;
-    items?: undefined;
 } | {
     type: string;
-    level: number;
+    attributes: {
+        level: number;
+        alt?: undefined;
+        caption?: undefined;
+        credit?: undefined;
+        height?: undefined;
+        width?: undefined;
+        url?: undefined;
+        id?: undefined;
+        playerId?: undefined;
+        accountId?: undefined;
+    };
     children: {
         type: string;
-        text: string;
-        bold: boolean;
-        italic: boolean;
+        attributes: {
+            text: string;
+            bold: boolean;
+            italic: boolean;
+        };
     }[];
-    paragraphs?: undefined;
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    url?: undefined;
-    id?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    items?: undefined;
 } | {
     type: string;
-    items: {
+    children: {
         type: string;
-        text: string;
-        bold: boolean;
-        italic: boolean;
+        attributes: {
+            text: string;
+            bold: boolean;
+            italic: boolean;
+        };
     }[];
-    paragraphs?: undefined;
-    alt?: undefined;
-    caption?: undefined;
-    credit?: undefined;
-    height?: undefined;
-    width?: undefined;
-    url?: undefined;
-    id?: undefined;
-    playerId?: undefined;
-    accountId?: undefined;
-    level?: undefined;
-    children?: undefined;
+    attributes?: undefined;
 })[];
 export declare const expectedBodyBlocks: string[];
 export declare const mockList: ({
     type: string;
-    text: string;
-    bold: boolean;
-    italic: boolean;
-    url?: undefined;
-    items?: undefined;
+    attributes: {
+        text: string;
+        bold: boolean;
+        italic: boolean;
+        url?: undefined;
+    };
+    children?: undefined;
 } | {
-    url: string;
-    text: string;
     type: string;
-    bold?: undefined;
-    italic?: undefined;
-    items?: undefined;
+    attributes: {
+        text: string;
+        url: string;
+        bold?: undefined;
+        italic?: undefined;
+    };
+    children?: undefined;
 } | {
     type: string;
-    items: {
-        type: string;
-        text: string;
-        bold: boolean;
-        italic: boolean;
-    }[];
-    text?: undefined;
-    bold?: undefined;
-    italic?: undefined;
-    url?: undefined;
+    attributes?: undefined;
+    children?: undefined;
 } | {
     type: string;
-    text?: undefined;
-    bold?: undefined;
-    italic?: undefined;
-    url?: undefined;
-    items?: undefined;
+    children: {
+        type: string;
+        attributes: {
+            text: string;
+            bold: boolean;
+            italic: boolean;
+        };
+    }[];
+    attributes?: undefined;
 })[];