@bright.global/arboretum-sdk 0.1.0-rc.0 → 0.1.0-rc.10

package/dist/clients/contentful-client/impl/constants.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_RETRY_LIMIT = exports.DEFAULT_RETRY_ON_ERROR = exports.DEFAULT_TIMEOUT = exports.DEFAULT_HOST = exports.DEFAULT_ENVIRONMENT = void 0;
+exports.EU_PREVIEW_HOST = exports.PREVIEW_HOST = exports.EU_PUBLISHED_HOST = exports.PUBLISHED_HOST = exports.DEFAULT_RETRY_LIMIT = exports.DEFAULT_RETRY_ON_ERROR = exports.DEFAULT_TIMEOUT = exports.DEFAULT_ENVIRONMENT = void 0;
 exports.DEFAULT_ENVIRONMENT = "master";
-exports.DEFAULT_HOST = "cdn.contentful.com";
 exports.DEFAULT_TIMEOUT = 30000;
 exports.DEFAULT_RETRY_ON_ERROR = true;
 exports.DEFAULT_RETRY_LIMIT = 5;
+exports.PUBLISHED_HOST = "cdn.contentful.com";
+exports.EU_PUBLISHED_HOST = "cdn.eu.contentful.com";
+exports.PREVIEW_HOST = "preview.contentful.com";
+exports.EU_PREVIEW_HOST = "preview.eu.contentful.com";

package/dist/clients/contentful-client/impl/contentful-client-impl.js

@@ -12,10 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCdaRestApiContentfulClient = exports.createContentfulClient = void 0;
-var get_locales_1 = require("./methods/get-locales");
+var constants_1 = require("./constants");
 var get_content_types_1 = require("./methods/get-content-types");
-var get_tags_1 = require("./methods/get-tags");
 var get_entries_1 = require("./methods/get-entries");
+var get_locales_1 = require("./methods/get-locales");
+var get_tags_1 = require("./methods/get-tags");
 var createContentfulClient = function (config) {
     var configType = config.type;
     switch (config.type) {
@@ -30,10 +31,14 @@ var createContentfulClient = function (config) {
             };
         }
         case "cda-client-params": {
-            var previewHostOrUndefined = config.preview
-                ? "preview.contentful.com"
-                : undefined;
-            return (0, exports.createCdaRestApiContentfulClient)(__assign(__assign({}, config.contentful), { host: previewHostOrUndefined }));
+            var host = config.preview
+                ? config.contentful.euDataResidency
+                    ? constants_1.EU_PREVIEW_HOST
+                    : constants_1.PREVIEW_HOST
+                : config.contentful.euDataResidency
+                    ? constants_1.EU_PUBLISHED_HOST
+                    : constants_1.PUBLISHED_HOST;
+            return (0, exports.createCdaRestApiContentfulClient)(__assign(__assign({}, config.contentful), { host: host }));
         }
         case "cma-client": {
             var client_1 = config.contentful.client;

package/dist/clients/contentful-client/impl/methods/contentful-fetch.js

@@ -72,7 +72,7 @@ var contentfulFetchWithRetires = function (p, retryLimit, retry) {
                     if (!(retry < retryLimit &&
                         (res.status === 429 || res.status === 500))) return [3 /*break*/, 3];
                     delay = getRetryDelay(retry);
-                    msg = "Waiting for ".concat(delay, "ms before retrying... (retry: ").concat(delay, "/").concat(retryLimit, ")");
+                    msg = "Waiting for ".concat(delay, "ms before retrying... (retry: ").concat(retry + 1, "/").concat(retryLimit, ")");
                     if (res.status === 500) {
                         console.log("[warning] Internal server error occurred. ".concat(msg));
                     }
@@ -97,8 +97,7 @@ var contentfulFetchWithRetires = function (p, retryLimit, retry) {
 };
 var contentfulFetch = function (config) {
     return function (endpoint, query) {
-        var space = config.space, accessToken = config.accessToken;
-        var host = config.host || constants_1.DEFAULT_HOST;
+        var space = config.space, accessToken = config.accessToken, host = config.host;
         var environment = config.environment || constants_1.DEFAULT_ENVIRONMENT;
         var params = new URLSearchParams();
         params.append("access_token", accessToken);

package/dist/es6/clients/contentful-client/impl/constants.js

@@ -1,5 +1,8 @@
 export var DEFAULT_ENVIRONMENT = "master";
-export var DEFAULT_HOST = "cdn.contentful.com";
 export var DEFAULT_TIMEOUT = 30000;
 export var DEFAULT_RETRY_ON_ERROR = true;
 export var DEFAULT_RETRY_LIMIT = 5;
+export var PUBLISHED_HOST = "cdn.contentful.com";
+export var EU_PUBLISHED_HOST = "cdn.eu.contentful.com";
+export var PREVIEW_HOST = "preview.contentful.com";
+export var EU_PREVIEW_HOST = "preview.eu.contentful.com";

package/dist/es6/clients/contentful-client/impl/contentful-client-impl.js

@@ -9,10 +9,11 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { getLocales } from "./methods/get-locales";
+import { EU_PREVIEW_HOST, EU_PUBLISHED_HOST, PREVIEW_HOST, PUBLISHED_HOST, } from "./constants";
 import { getContentTypes } from "./methods/get-content-types";
-import { getTags } from "./methods/get-tags";
 import { getEntries } from "./methods/get-entries";
+import { getLocales } from "./methods/get-locales";
+import { getTags } from "./methods/get-tags";
 export var createContentfulClient = function (config) {
     var configType = config.type;
     switch (config.type) {
@@ -27,10 +28,14 @@ export var createContentfulClient = function (config) {
             };
         }
         case "cda-client-params": {
-            var previewHostOrUndefined = config.preview
-                ? "preview.contentful.com"
-                : undefined;
-            return createCdaRestApiContentfulClient(__assign(__assign({}, config.contentful), { host: previewHostOrUndefined }));
+            var host = config.preview
+                ? config.contentful.euDataResidency
+                    ? EU_PREVIEW_HOST
+                    : PREVIEW_HOST
+                : config.contentful.euDataResidency
+                    ? EU_PUBLISHED_HOST
+                    : PUBLISHED_HOST;
+            return createCdaRestApiContentfulClient(__assign(__assign({}, config.contentful), { host: host }));
         }
         case "cma-client": {
             var client_1 = config.contentful.client;

package/dist/es6/clients/contentful-client/impl/methods/contentful-fetch.js

@@ -51,7 +51,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { getRandomNumber } from "../../../../utils/get-rendom-number";
-import { DEFAULT_ENVIRONMENT, DEFAULT_HOST, DEFAULT_RETRY_LIMIT, DEFAULT_RETRY_ON_ERROR, } from "../constants";
+import { DEFAULT_ENVIRONMENT, DEFAULT_RETRY_LIMIT, DEFAULT_RETRY_ON_ERROR, } from "../constants";
 var sleep = function (ms) { return new Promise(function (r) { return setTimeout(r, ms); }); };
 var getRetryDelay = function (retry) {
     return Math.ceil(Math.pow(getRandomNumber(1.2, 1.4), retry) * 1000);
@@ -69,7 +69,7 @@ var contentfulFetchWithRetires = function (p, retryLimit, retry) {
                     if (!(retry < retryLimit &&
                         (res.status === 429 || res.status === 500))) return [3 /*break*/, 3];
                     delay = getRetryDelay(retry);
-                    msg = "Waiting for ".concat(delay, "ms before retrying... (retry: ").concat(delay, "/").concat(retryLimit, ")");
+                    msg = "Waiting for ".concat(delay, "ms before retrying... (retry: ").concat(retry + 1, "/").concat(retryLimit, ")");
                     if (res.status === 500) {
                         console.log("[warning] Internal server error occurred. ".concat(msg));
                     }
@@ -94,8 +94,7 @@ var contentfulFetchWithRetires = function (p, retryLimit, retry) {
 };
 export var contentfulFetch = function (config) {
     return function (endpoint, query) {
-        var space = config.space, accessToken = config.accessToken;
-        var host = config.host || DEFAULT_HOST;
+        var space = config.space, accessToken = config.accessToken, host = config.host;
         var environment = config.environment || DEFAULT_ENVIRONMENT;
         var params = new URLSearchParams();
         params.append("access_token", accessToken);

package/dist/es6/impl/arboretum-client.impl.js

@@ -78,7 +78,6 @@ import { pagesByTagId } from "./sitemap/methods/pages-by-tag-id";
 import { pagesByIds } from "./sitemap/methods/pages-by-ids";
 import { pagesByPaths } from "./sitemap/methods/pages-by-paths";
 import { regenerate } from "./sitemap/methods/regenerate";
-import { search } from "./sitemap/methods/search";
 import { status } from "./sitemap/methods/status";
 import { right } from "../utils/fp-utils";
 import { pages } from "./sitemap/methods/pages";
@@ -86,6 +85,9 @@ import { buildSitemapEagerly } from "./sitemap/helpers/build-sitemap-eagerly";
 import { cachedData } from "./sitemap/methods/cached-data";
 import { buildPagesByTagEagerly } from "./sitemap/helpers/build-pages-by-tag-eagerly";
 import { homePage } from "./sitemap/methods/home-page";
+import { orphanedPages } from "./sitemap/methods/orphaned-pages";
+import { searchOrphanedPages } from "./sitemap/methods/search-orphaned-pages";
+import { search } from "./sitemap/methods/search";
 var pageTagIdPrefix = "page";
 var pageHomeTagId = "".concat(pageTagIdPrefix, "Home");
 var localeTagIdPrefix = "locale";
@@ -123,7 +125,7 @@ export var createArboretumClient = function (config) { return __awaiter(void 0,
                 sitemapDataCtx = {
                     preview: config.preview,
                     clientApi: clientApi,
-                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus, sitemapRepresentation: (_c = config.options) === null || _c === void 0 ? void 0 : _c.sitemapRepresentation }),
+                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus, pageRelations: (_c = config.options) === null || _c === void 0 ? void 0 : _c.pageRelations }),
                     localeTagIdPrefix: localeTagIdPrefix,
                     pageHomeTagId: options.homePageTagId || pageHomeTagId,
                     contentfulClientType: config.type === "cda-client" && config.contentful.client.withAllLocales
@@ -168,6 +170,8 @@ export var createArboretumClient = function (config) { return __awaiter(void 0,
                                 search: search(ctx_1),
                                 status: status(ctx_1),
                                 cachedData: cachedData(ctx_1),
+                                orphanedPages: orphanedPages(ctx_1),
+                                searchOrphanedPages: searchOrphanedPages(ctx_1),
                             },
                             warnings: dataE.right.warnings,
                         }];

package/dist/es6/impl/constants.js

@@ -0,0 +1,5 @@
+export var CONSTANTS = {
+    search: {
+        minSearchScore: 0.4,
+    },
+};

package/dist/es6/impl/data/helpers/get-all-entries-recursively.js

@@ -93,10 +93,27 @@ export var getAllEntriesRecursively = function (_a, contentfulClientType, conten
                         skip: skip,
                         content_type: contentType,
                         include: 0,
-                        select: select,
-                        locale: contentfulClientType === "cda-client-with-all-locales"
-                            ? undefined
-                            : "*",
+                        /* For some reason select param causes errors in CMA. I'm getting the following response:
+                      {
+                        "status": 400,
+                        "statusText": "Bad Request",
+                        "message": "The query you sent was invalid. Probably a filter or ordering specification is not applicable to the type of a field.",
+                        "details": {
+                          "errors": [
+                            {
+                              "name": "select",
+                              "details": "Select is only applicable when querying a collection of entities."
+                            }
+                          ]
+                        },
+                        "request": {
+                          "url": "/spaces/8h4rcnu50txt/environments/dacjan-test/public/entries",
+                          "method": "get",
+                          ...
+                        },
+                    }*/
+                        select: contentfulClientType !== "cma-client" ? select : undefined,
+                        locale: contentfulClientType === "cda-client-with-all-locales" ? undefined : "*",
                     })];
                 case 1:
                     items = (_b.sent()).items;

package/dist/es6/impl/data/page-entries.js

@@ -76,37 +76,8 @@ import { arrayToMap } from "../../utils/array-to-map";
 var getAllPageEntriesRecursively = function (_a, contentfulClientType, pageContentTypeOpt, skip, acc, select) {
     var getEntries = _a.getEntries;
     return __awaiter(void 0, void 0, void 0, function () {
-        var fieldsSelect;
         return __generator(this, function (_b) {
-            fieldsSelect = [
-                pageContentTypeOpt.slugFieldId,
-                pageContentTypeOpt.childPagesFieldId,
-                pageContentTypeOpt.titleFieldId,
-                pageContentTypeOpt.parentPageFieldId,
-            ].flatMap(function (id) { return (id ? ["fields.".concat(id)] : []); });
-            return [2 /*return*/, getAllEntriesRecursively({ getEntries: getEntries }, contentfulClientType, pageContentTypeOpt.id, skip, acc, 
-                /* For some reason select param causes errors in CMA. I'm getting the following response:
-              {
-                "status": 400,
-                "statusText": "Bad Request",
-                "message": "The query you sent was invalid. Probably a filter or ordering specification is not applicable to the type of a field.",
-                "details": {
-                  "errors": [
-                    {
-                      "name": "select",
-                      "details": "Select is only applicable when querying a collection of entities."
-                    }
-                  ]
-                },
-                "request": {
-                  "url": "/spaces/8h4rcnu50txt/environments/dacjan-test/public/entries",
-                  "method": "get",
-                  ...
-                },
-            }*/
-                select || contentfulClientType === "cma-client"
-                    ? undefined
-                    : __spreadArray(["sys", "metadata"], __read(fieldsSelect), false).join(","), pageContentTypeOpt.childPagesFieldId
+            return [2 /*return*/, getAllEntriesRecursively({ getEntries: getEntries }, contentfulClientType, pageContentTypeOpt.id, skip, acc, select, pageContentTypeOpt.childPagesFieldId
                     ? [pageContentTypeOpt.childPagesFieldId]
                     : [])];
         });
@@ -134,7 +105,7 @@ var cmaOnlyEntriesStatusMap = function (_a, contentfulClientType, options) {
     });
 };
 export var pageEntries = function (ctx, apiClient, cmaPreviewClientApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var options, pageContentTypes, pageEntriesPromise, statusRecordPromise, _a, pageEntries, cmaOnlyStatusRecord;
+    var options, pageContentTypes, pageEntriesPromise, statusRecordPromise, _a, pageEntries, cmaOnlyStatusRecord, homePages, allPages;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -142,7 +113,14 @@ export var pageEntries = function (ctx, apiClient, cmaPreviewClientApi) { return
                 pageContentTypes = Object.entries(options.pageContentTypes);
                 pageEntriesPromise = Promise.all(pageContentTypes.map(function (_a) {
                     var _b = __read(_a, 2), id = _b[0], fieldIds = _b[1];
-                    return getAllPageEntriesRecursively(apiClient, ctx.contentfulClientType, __assign({ id: id }, fieldIds), 0, []);
+                    var fieldsSelect = __spreadArray([
+                        fieldIds.slugFieldId,
+                        fieldIds.childPagesFieldId,
+                        fieldIds.titleFieldId,
+                        fieldIds.parentPageFieldId
+                    ], __read((fieldIds.select || [])), false).flatMap(function (id) { return (id ? ["fields.".concat(id)] : []); });
+                    var select = __spreadArray(["sys", "metadata"], __read(fieldsSelect), false).join(",");
+                    return getAllPageEntriesRecursively(apiClient, ctx.contentfulClientType, __assign({ id: id }, fieldIds), 0, [], select);
                 }));
                 statusRecordPromise = ctx.options.includeEntryStatus &&
                     ctx.contentfulClientType === "cma-client" &&
@@ -156,15 +134,21 @@ export var pageEntries = function (ctx, apiClient, cmaPreviewClientApi) { return
                     ])];
             case 1:
                 _a = __read.apply(void 0, [_b.sent(), 2]), pageEntries = _a[0], cmaOnlyStatusRecord = _a[1];
-                return [2 /*return*/, arrayToMap(function (e) { return e.sys.id; })(function (entry) {
-                        var cmaOnlyStatus = ctx.contentfulClientType === "cma-client"
-                            ? entryStatus(entry.sys) || cmaOnlyStatusRecord.get(entry.sys.id)
-                            : undefined;
-                        if (cmaOnlyStatus) {
-                            entry.sys = __assign(__assign({}, entry.sys), { cmaOnlyStatus: cmaOnlyStatus });
-                        }
-                        return entry;
-                    })(pageEntries.flat())];
+                homePages = [];
+                allPages = new Map(pageEntries.flat().map(function (entry) {
+                    var _a;
+                    if ((_a = entry.metadata) === null || _a === void 0 ? void 0 : _a.tags.find(function (t) { return t.sys.id.startsWith(ctx.pageHomeTagId); })) {
+                        homePages.push(entry);
+                    }
+                    var cmaOnlyStatus = ctx.contentfulClientType === "cma-client"
+                        ? entryStatus(entry.sys) || cmaOnlyStatusRecord.get(entry.sys.id)
+                        : undefined;
+                    if (cmaOnlyStatus) {
+                        entry.sys = __assign(__assign({}, entry.sys), { cmaOnlyStatus: cmaOnlyStatus });
+                    }
+                    return [entry.sys.id, entry];
+                }));
+                return [2 /*return*/, { allPages: allPages, homePages: homePages }];
         }
     });
 }); };

package/dist/es6/impl/data/page-entries.test.js

@@ -59,71 +59,73 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { mockedEntrySysId, multipleContentTypesMockedContentfulEntriesClientApi, } from './helpers/__mocks__/mocked-contentful-entries-client-api';
-import { pageEntries } from './page-entries';
+import { mockedEntrySysId, multipleContentTypesMockedContentfulEntriesClientApi, } from "./helpers/__mocks__/mocked-contentful-entries-client-api";
+import { pageEntries } from "./page-entries";
 var productTypesOptions = function (productTypesIds) {
     var seed = {};
     return productTypesIds.reduce(function (acc, ct) {
         acc[ct] = {
-            slugFieldId: 'slug',
+            slugFieldId: "slug",
         };
         return acc;
     }, seed);
 };
 describe(pageEntries, function () {
-    test('Handle case where there are no page entries', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("Handle case where there are no page entries", function () { return __awaiter(void 0, void 0, void 0, function () {
         var singleTestPageContentType, testPageContentTypes, entries1, entries2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    singleTestPageContentType = ['page1ContentType'];
+                    singleTestPageContentType = ["page1ContentType"];
                     testPageContentTypes = __spreadArray(__spreadArray([], __read(singleTestPageContentType), false), [
-                        'page2ContentType',
+                        "page2ContentType",
                     ], false);
                     return [4 /*yield*/, pageEntries({
-                            contentfulClientType: 'cda-client',
+                            contentfulClientType: "cda-client",
                             options: {
                                 pageContentTypes: productTypesOptions(singleTestPageContentType),
                             },
                             preview: false,
+                            pageHomeTagId: "homePage",
                         }, multipleContentTypesMockedContentfulEntriesClientApi(singleTestPageContentType.map(function (contentType) { return ({
                             contentType: contentType,
                             total: 0,
                         }); })))];
                 case 1:
                     entries1 = _a.sent();
-                    expect(entries1.size).toBe(0);
+                    expect(entries1.allPages.size).toBe(0);
                     return [4 /*yield*/, pageEntries({
-                            contentfulClientType: 'cda-client',
+                            contentfulClientType: "cda-client",
                             options: {
                                 pageContentTypes: productTypesOptions(testPageContentTypes),
                             },
                             preview: false,
+                            pageHomeTagId: "homePage",
                         }, multipleContentTypesMockedContentfulEntriesClientApi(testPageContentTypes.map(function (contentType) { return ({
                             contentType: contentType,
                             total: 0,
                         }); })))];
                 case 2:
                     entries2 = _a.sent();
-                    expect(entries2.size).toBe(0);
+                    expect(entries2.allPages.size).toBe(0);
                     return [2 /*return*/];
             }
         });
     }); });
     describe(pageEntries, function () {
-        test('Handle case where there are page entries', function () { return __awaiter(void 0, void 0, void 0, function () {
+        test("Handle case where there are page entries", function () { return __awaiter(void 0, void 0, void 0, function () {
             var singleTestPageContentType, testPageContentTypes, entries1, entries1Ids, expectedEntries1Ids, entries2, entries2Ids, expectedEntries2Ids;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         singleTestPageContentType = [
-                            { contentType: 'page1ContentType', total: 101 },
+                            { contentType: "page1ContentType", total: 101 },
                         ];
                         testPageContentTypes = __spreadArray(__spreadArray([], __read(singleTestPageContentType), false), [
-                            { contentType: 'page2ContentType', total: 1001 },
+                            { contentType: "page2ContentType", total: 1001 },
                         ], false);
                         return [4 /*yield*/, pageEntries({
-                                contentfulClientType: 'cda-client',
+                                contentfulClientType: "cda-client",
                                 options: {
                                     pageContentTypes: productTypesOptions(singleTestPageContentType.map(function (_a) {
                                         var contentType = _a.contentType;
@@ -131,10 +133,11 @@ describe(pageEntries, function () {
                                     })),
                                 },
                                 preview: false,
+                                pageHomeTagId: "homePage",
                             }, multipleContentTypesMockedContentfulEntriesClientApi(singleTestPageContentType))];
                     case 1:
                         entries1 = _a.sent();
-                        entries1Ids = __spreadArray([], __read(entries1.values()), false).map(function (e) { return e.sys.id; });
+                        entries1Ids = __spreadArray([], __read(entries1.allPages.values()), false).map(function (e) { return e.sys.id; });
                         expectedEntries1Ids = singleTestPageContentType.flatMap(function (_a) {
                             var total = _a.total, contentType = _a.contentType;
                             return __spreadArray([], __read(Array(total).keys()), false).map(function (_, idx) {
@@ -143,7 +146,7 @@ describe(pageEntries, function () {
                         });
                         expect(entries1Ids).toEqual(expectedEntries1Ids);
                         return [4 /*yield*/, pageEntries({
-                                contentfulClientType: 'cda-client',
+                                contentfulClientType: "cda-client",
                                 options: {
                                     pageContentTypes: productTypesOptions(testPageContentTypes.map(function (_a) {
                                         var contentType = _a.contentType;
@@ -151,10 +154,11 @@ describe(pageEntries, function () {
                                     })),
                                 },
                                 preview: false,
+                                pageHomeTagId: "homePage",
                             }, multipleContentTypesMockedContentfulEntriesClientApi(testPageContentTypes))];
                     case 2:
                         entries2 = _a.sent();
-                        entries2Ids = __spreadArray([], __read(entries2.values()), false).map(function (e) { return e.sys.id; });
+                        entries2Ids = __spreadArray([], __read(entries2.allPages.values()), false).map(function (e) { return e.sys.id; });
                         expectedEntries2Ids = testPageContentTypes.flatMap(function (_a) {
                             var total = _a.total, contentType = _a.contentType;
                             return __spreadArray([], __read(Array(total).keys()), false).map(function (_, idx) {

package/dist/es6/impl/data/sitemap-data.js

@@ -70,15 +70,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { pageEntries } from './page-entries';
-import { left, right } from '../../utils/fp-utils';
-import { contentTypes } from './content-types';
-import { locales } from './locales';
-import { homePages } from './home-page';
-import { redirectEntries } from './redirect-entries';
-import { homePagesByTagId } from './helpers/home-pages-by-tag-id';
+import { pageEntries } from "./page-entries";
+import { left, right } from "../../utils/fp-utils";
+import { contentTypes } from "./content-types";
+import { locales } from "./locales";
+import { redirectEntries } from "./redirect-entries";
+import { homePagesByTagId, } from "./helpers/home-pages-by-tag-id";
 export var sitemapData = function (ctx) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, pages, redirects, ct, l, hp, warnings, pagesByTagId;
+    var _a, pages, redirects, ct, l, warnings, pagesByTagId;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0: return [4 /*yield*/, Promise.all([
@@ -86,20 +85,19 @@ export var sitemapData = function (ctx) { return __awaiter(void 0, void 0, void
                     redirectEntries(ctx),
                     contentTypes(ctx),
                     locales(ctx),
-                    homePages(ctx, ctx.pageHomeTagId),
                 ])];
             case 1:
-                _a = __read.apply(void 0, [_b.sent(), 5]), pages = _a[0], redirects = _a[1], ct = _a[2], l = _a[3], hp = _a[4];
+                _a = __read.apply(void 0, [_b.sent(), 4]), pages = _a[0], redirects = _a[1], ct = _a[2], l = _a[3];
                 warnings = [];
                 ct.warnings && warnings.push.apply(warnings, __spreadArray([], __read(ct.warnings), false));
-                if (l._tag === 'Left') {
+                if (l._tag === "Left") {
                     return [2 /*return*/, left([l.left])];
                 }
                 else {
-                    pagesByTagId = homePagesByTagId(ctx, l.right, hp);
+                    pagesByTagId = homePagesByTagId(ctx, l.right, pages.homePages);
                     pagesByTagId.warnings && warnings.push.apply(warnings, __spreadArray([], __read(pagesByTagId.warnings), false));
                     return [2 /*return*/, right({
-                            data: __assign(__assign({}, l.right), { homePagesByTagId: pagesByTagId.homePagesByTagId, contentTypes: ct.contentTypes, pages: pages, redirects: redirects }),
+                            data: __assign(__assign({}, l.right), { homePagesByTagId: pagesByTagId.homePagesByTagId, contentTypes: ct.contentTypes, pages: pages.allPages, redirects: redirects }),
                             warnings: warnings.length > 0 ? warnings : undefined,
                         })];
                 }

package/dist/es6/impl/sitemap/adapters/page-entry-adapter.js

@@ -1,11 +1,23 @@
 import { localizeField } from "../helpers/localize-contentful-field";
-export var pageEntryAdapter = function (data, slugField, titleField, childrenRefs, locale, parent, entry) {
+export var pageEntryAdapter = function (data, options, slugField, titleField, childrenRefs, locale, parent, entry) {
     var _a;
     var fieldValue = localizeField(data, locale);
     var slug = (_a = fieldValue(slugField.localized, entry.fields[slugField.id])) === null || _a === void 0 ? void 0 : _a.toLowerCase();
     var title = titleField
         ? fieldValue(titleField.localized, entry.fields[titleField.id])
         : undefined;
+    var contentTypeId = entry.sys.contentType.sys.id;
+    var additionalFields = (options.pageContentTypes[contentTypeId].select || []).reduce(function (acc, fieldId) {
+        var contentType = data.contentTypes.get(contentTypeId);
+        if (contentType) {
+            var field = contentType.fields.get(fieldId);
+            var value = field
+                ? fieldValue(field.localized, entry.fields[field.id])
+                : undefined;
+            acc[fieldId] = value;
+        }
+        return acc;
+    }, {});
     return slug
         ? {
             type: "page",
@@ -16,10 +28,11 @@ export var pageEntryAdapter = function (data, slugField, titleField, childrenRef
             sys: {
                 id: entry.sys.id,
                 cmaOnlyStatus: entry.sys.cmaOnlyStatus,
-                contentTypeId: entry.sys.contentType.sys.id,
+                contentTypeId: contentTypeId,
             },
             metadata: entry.metadata,
             childPages: (childrenRefs === null || childrenRefs === void 0 ? void 0 : childrenRefs.flatMap(function (childPage) { var _a; return ((_a = childPage === null || childPage === void 0 ? void 0 : childPage.sys) === null || _a === void 0 ? void 0 : _a.id) ? [{ sys: { id: childPage === null || childPage === void 0 ? void 0 : childPage.sys.id } }] : []; })) || [],
+            additionalFields: additionalFields,
         }
         : undefined;
 };

package/dist/es6/impl/sitemap/adapters/redirect-entry-adapter.js

@@ -12,7 +12,7 @@ export var redirectEntryAdapter = function (data, pageField, pathField, typeFiel
     return pageSysId && path && (type === "redirect" || type === "alias")
         ? {
             page: { sys: { id: pageSysId } },
-            path: parent.path + path,
+            path: parent.path + (path.startsWith("/") ? path : "/".concat(path)),
             title: title || undefined,
             metadata: entry.metadata,
             type: type,

package/dist/es6/impl/sitemap/adapters/redirect-to-arboretum-page-adapter.js

@@ -7,5 +7,6 @@ export var redirectToArboretumPage = function (localeCode) {
         path: redirect.path,
         cmaOnlyStatus: redirect.sys.cmaOnlyStatus,
         title: redirect.title,
+        metadata: redirect.metadata
     }); };
 };

package/dist/es6/impl/sitemap/adapters/to-arboretum-page-with-missing-data-adapter.js

@@ -13,5 +13,7 @@ export var toArboretumPageWithMissingData = function (localeCode) {
             : page.childPages.length,
         children: children,
         ancestors: ancestors,
+        additionalFields: page.additionalFields,
+        metadata: page.metadata
     }); };
 };

package/dist/es6/impl/sitemap/helpers/build-localized-sitemap.js

@@ -69,6 +69,27 @@ var findPageFieldF = function (data, options, pageContentTypeId) {
             : undefined;
     };
 };
+export var buildPage = function (data, options, childrenRefsByPageId, locale, parent, pageEntry) {
+    var _a;
+    var pageContentTypeConfig = options.pageContentTypes[pageEntry.sys.contentType.sys.id];
+    var findPageField = findPageFieldF(data, options, pageEntry.sys.contentType.sys.id);
+    var slugField = findPageField(pageContentTypeConfig.slugFieldId);
+    var titleField = pageContentTypeConfig.titleFieldId
+        ? findPageField(pageContentTypeConfig.titleFieldId)
+        : undefined;
+    var childPagesField = pageContentTypeConfig.childPagesFieldId
+        ? findPageField(pageContentTypeConfig.childPagesFieldId)
+        : undefined;
+    var fieldValue = localizeField(data, locale);
+    var childrenRefs = childrenRefsByPageId
+        ? childrenRefsByPageId.get(pageEntry.sys.id) || []
+        : childPagesField
+            ? ((_a = fieldValue(childPagesField.localized, pageEntry.fields[childPagesField.id])) === null || _a === void 0 ? void 0 : _a.flatMap(function (childPage) { var _a; return ((_a = childPage === null || childPage === void 0 ? void 0 : childPage.sys) === null || _a === void 0 ? void 0 : _a.id) ? [{ sys: { id: childPage === null || childPage === void 0 ? void 0 : childPage.sys.id } }] : []; })) || []
+            : [];
+    return slugField
+        ? pageEntryAdapter(data, options, slugField, titleField, childrenRefs, locale, parent, pageEntry)
+        : undefined;
+};
 var getChildrenRefsByParentId = function (data, locale, options) {
     var pages = data.pages;
     var acc = new Map();
@@ -98,26 +119,8 @@ var getChildrenRefsByParentId = function (data, locale, options) {
     return acc;
 };
 var buildLocalizedSitemapArrRecursively = function (data, options, locale, parent, childrenRefsByPageId, pageEntry, acc) {
-    var _a;
     var pages = data.pages;
-    var pageContentTypeConfig = options.pageContentTypes[pageEntry.sys.contentType.sys.id];
-    var findPageField = findPageFieldF(data, options, pageEntry.sys.contentType.sys.id);
-    var slugField = findPageField(pageContentTypeConfig.slugFieldId);
-    var titleField = pageContentTypeConfig.titleFieldId
-        ? findPageField(pageContentTypeConfig.titleFieldId)
-        : undefined;
-    var childPagesField = pageContentTypeConfig.childPagesFieldId
-        ? findPageField(pageContentTypeConfig.childPagesFieldId)
-        : undefined;
-    var fieldValue = localizeField(data, locale);
-    var childrenRefs = childrenRefsByPageId
-        ? childrenRefsByPageId.get(pageEntry.sys.id) || []
-        : childPagesField
-            ? ((_a = fieldValue(childPagesField.localized, pageEntry.fields[childPagesField.id])) === null || _a === void 0 ? void 0 : _a.flatMap(function (childPage) { var _a; return ((_a = childPage === null || childPage === void 0 ? void 0 : childPage.sys) === null || _a === void 0 ? void 0 : _a.id) ? [{ sys: { id: childPage === null || childPage === void 0 ? void 0 : childPage.sys.id } }] : []; })) || []
-            : [];
-    var page = slugField
-        ? pageEntryAdapter(data, slugField, titleField, childrenRefs, locale, parent, pageEntry)
-        : undefined;
+    var page = buildPage(data, options, childrenRefsByPageId, locale, parent, pageEntry);
     if (page) {
         var validChildPages_1 = page.childPages.filter(function (c) { return pages.get(c.sys.id) && !acc.get(c.sys.id); });
         var redirectChildPages = isRoot(page) && options.redirectContentType
@@ -148,7 +151,7 @@ export var buildLocalizedSitemap = function (data, options, pageHomeTagId, local
     var homePageRef = (_d = (_c = (_b = (_a = homePagesByTagId === null || homePagesByTagId === void 0 ? void 0 : homePagesByTagId.get(locale.code)) === null || _a === void 0 ? void 0 : _a.get(pageHomeTagId)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.sys) === null || _d === void 0 ? void 0 : _d.id;
     var homePageEntry = homePageRef ? pages.get(homePageRef) : undefined;
     if (homePageEntry) {
-        var childrenRefsByPageId = options.sitemapRepresentation === "child-to-parent"
+        var childrenRefsByPageId = options.pageRelations === "child-to-parent"
             ? getChildrenRefsByParentId(data, locale, options)
             : undefined;
         var sitemap = buildLocalizedSitemapArrRecursively(data, options, locale, undefined, childrenRefsByPageId, homePageEntry, new Map());