@bright.global/arboretum-sdk 0.0.9 → 0.1.0-rc.1

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

@@ -108,9 +108,9 @@ var arboretumConfigOptions = function (config) {
 };
 export var createArboretumClient = function (config) { return __awaiter(void 0, void 0, void 0, function () {
     var clientApi, cmaPreviewClientApi, includeEntryStatus, options, sitemapDataCtx, dataE, _a, c, sitemap, pagesByTagIdRecord, ctx_1;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 clientApi = createContentfulClient(config);
                 cmaPreviewClientApi = config.type === "cma-client"
@@ -119,11 +119,11 @@ export var createArboretumClient = function (config) { return __awaiter(void 0,
                 includeEntryStatus = config.type === "cma-client" ? !!((_b = config.options) === null || _b === void 0 ? void 0 : _b.includeEntryStatus) : false;
                 return [4 /*yield*/, arboretumConfigOptions(config)];
             case 1:
-                options = _j.sent();
+                options = _k.sent();
                 sitemapDataCtx = {
                     preview: config.preview,
                     clientApi: clientApi,
-                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus }),
+                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus, sitemapRepresentation: (_c = config.options) === null || _c === void 0 ? void 0 : _c.sitemapRepresentation }),
                     localeTagIdPrefix: localeTagIdPrefix,
                     pageHomeTagId: options.homePageTagId || pageHomeTagId,
                     contentfulClientType: config.type === "cda-client" && config.contentful.client.withAllLocales
@@ -132,25 +132,25 @@ export var createArboretumClient = function (config) { return __awaiter(void 0,
                     pageTagIdPrefix: pageTagIdPrefix,
                     cmaPreviewClientApi: cmaPreviewClientApi,
                 };
-                if (!((_c = config.options) === null || _c === void 0 ? void 0 : _c.data)) return [3 /*break*/, 2];
-                _a = right({ data: (_d = config.options) === null || _d === void 0 ? void 0 : _d.data.data, warnings: undefined });
+                if (!((_d = config.options) === null || _d === void 0 ? void 0 : _d.data)) return [3 /*break*/, 2];
+                _a = right({ data: (_e = config.options) === null || _e === void 0 ? void 0 : _e.data.data, warnings: undefined });
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, sitemapData(sitemapDataCtx)];
             case 3:
-                _a = _j.sent();
-                _j.label = 4;
+                _a = _k.sent();
+                _k.label = 4;
             case 4:
                 dataE = _a;
                 if (dataE._tag === "Right") {
                     c = __assign(__assign({}, sitemapDataCtx), { data: dataE.right.data });
-                    sitemap = ((_e = config.options) === null || _e === void 0 ? void 0 : _e.data)
+                    sitemap = ((_f = config.options) === null || _f === void 0 ? void 0 : _f.data)
                         ? config.options.data.sitemap
-                        : ((_f = config.options) === null || _f === void 0 ? void 0 : _f.eagerly)
+                        : ((_g = config.options) === null || _g === void 0 ? void 0 : _g.eagerly)
                             ? buildSitemapEagerly(c, dataE.right.data.locales)
                             : new Map();
-                    pagesByTagIdRecord = ((_g = config.options) === null || _g === void 0 ? void 0 : _g.data)
+                    pagesByTagIdRecord = ((_h = config.options) === null || _h === void 0 ? void 0 : _h.data)
                         ? config.options.data.pagesByTagId
-                        : ((_h = config.options) === null || _h === void 0 ? void 0 : _h.eagerly)
+                        : ((_j = config.options) === null || _j === void 0 ? void 0 : _j.eagerly)
                             ? buildPagesByTagEagerly(__assign(__assign({}, c), { sitemap: sitemap }), dataE.right.data.locales)
                             : new Map();
                     ctx_1 = __assign(__assign({}, c), { data: dataE.right.data, sitemap: sitemap, pagesByTagId: pagesByTagIdRecord, lastUpdatedAt: new Date().toISOString(), regenerationInProgress: false });

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,36 +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,
-            ].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]
                     : [])];
         });
@@ -141,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" &&

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

@@ -1,28 +1,38 @@
-import { localizeField } from '../helpers/localize-contentful-field';
-export var pageEntryAdapter = function (data, slugField, titleField, childPagesField, locale, parent, entry) {
+import { localizeField } from "../helpers/localize-contentful-field";
+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 childPages = childPagesField
-        ? fieldValue(childPagesField.localized, entry.fields[childPagesField.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',
+            type: "page",
             parent: parent ? { sys: parent.sys } : undefined,
-            path: parent ? parent.path + '/' + slug : '/' + locale.code,
+            path: parent ? parent.path + "/" + slug : "/" + locale.code,
             slug: slug,
             title: title || undefined,
             sys: {
                 id: entry.sys.id,
                 cmaOnlyStatus: entry.sys.cmaOnlyStatus,
-                contentTypeId: entry.sys.contentType.sys.id
+                contentTypeId: contentTypeId,
             },
             metadata: entry.metadata,
-            childPages: (childPages === null || childPages === void 0 ? void 0 : childPages.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 } }] : []; })) || [],
+            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/to-arboretum-page-with-missing-data-adapter.js

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

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

@@ -34,10 +34,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { left, right } from '../../../utils/fp-utils';
-import { pageEntryAdapter } from '../adapters/page-entry-adapter';
-import { redirectEntryAdapter } from '../adapters/redirect-entry-adapter';
-import { isRoot } from './is-root';
+import { left, right } from "../../../utils/fp-utils";
+import { pageEntryAdapter } from "../adapters/page-entry-adapter";
+import { redirectEntryAdapter } from "../adapters/redirect-entry-adapter";
+import { isRoot } from "./is-root";
+import { localizeField } from "./localize-contentful-field";
 var getAllRedirects = function (data, options, locale, parent) {
     var redirectContentType = options.id
         ? data.contentTypes.get(options.id)
@@ -58,15 +59,49 @@ var getAllRedirects = function (data, options, locale, parent) {
         return redirect ? [redirect] : [];
     });
 };
-var buildLocalizedSitemapArrRecursively = function (data, options, locale, parent, pageEntry, acc) {
-    var pages = data.pages, contentTypes = data.contentTypes;
-    var pageContentType = contentTypes.get(pageEntry.sys.contentType.sys.id);
-    var pageContentTypeConfig = options.pageContentTypes[pageEntry.sys.contentType.sys.id];
-    var findPageField = function (fieldId) {
+var findPageFieldF = function (data, options, pageContentTypeId) {
+    return function (fieldId) {
+        var contentTypes = data.contentTypes;
+        var pageContentType = contentTypes.get(pageContentTypeId);
+        var pageContentTypeConfig = options.pageContentTypes[pageContentTypeId];
         return pageContentType && pageContentTypeConfig
             ? pageContentType.fields.get(fieldId)
             : undefined;
     };
+};
+var getChildrenRefsByParentId = function (data, locale, options) {
+    var pages = data.pages;
+    var acc = new Map();
+    pages.forEach(function (page) {
+        var _a;
+        var pageContentTypeConfig = options.pageContentTypes[page.sys.contentType.sys.id];
+        var findPageField = findPageFieldF(data, options, page.sys.contentType.sys.id);
+        var parentPageField = pageContentTypeConfig.parentPageFieldId
+            ? findPageField(pageContentTypeConfig.parentPageFieldId)
+            : undefined;
+        var fieldValue = localizeField(data, locale);
+        var parentPage = parentPageField
+            ? fieldValue(parentPageField.localized, page.fields[parentPageField.id])
+            : undefined;
+        var parentPageId = (_a = parentPage === null || parentPage === void 0 ? void 0 : parentPage.sys) === null || _a === void 0 ? void 0 : _a.id;
+        if (parentPageId) {
+            var pageRef = { sys: { id: page.sys.id } };
+            var maybePages = acc.get(parentPageId);
+            if (maybePages) {
+                maybePages.push(pageRef);
+            }
+            else {
+                acc.set(parentPageId, [pageRef]);
+            }
+        }
+    });
+    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)
@@ -74,8 +109,14 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
     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, childPagesField, locale, parent, pageEntry)
+        ? pageEntryAdapter(data, options, slugField, titleField, childrenRefs, locale, parent, pageEntry)
         : undefined;
     if (page) {
         var validChildPages_1 = page.childPages.filter(function (c) { return pages.get(c.sys.id) && !acc.get(c.sys.id); });
@@ -93,7 +134,7 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
             var id = _a.sys.id;
             var childPageEntry = pages.get(id);
             childPageEntry &&
-                buildLocalizedSitemapArrRecursively(data, options, locale, { sys: pageEntry.sys, path: page.path }, childPageEntry, acc);
+                buildLocalizedSitemapArrRecursively(data, options, locale, { sys: pageEntry.sys, path: page.path }, childrenRefsByPageId, childPageEntry, acc);
         });
         return acc;
     }
@@ -107,7 +148,10 @@ 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 sitemap = buildLocalizedSitemapArrRecursively(data, options, locale, undefined, homePageEntry, new Map());
+        var childrenRefsByPageId = options.sitemapRepresentation === "child-to-parent"
+            ? getChildrenRefsByParentId(data, locale, options)
+            : undefined;
+        var sitemap = buildLocalizedSitemapArrRecursively(data, options, locale, undefined, childrenRefsByPageId, homePageEntry, new Map());
         return right({
             root: { sys: homePageEntry.sys },
             sitemap: sitemap,

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

@@ -111,9 +111,9 @@ var arboretumConfigOptions = function (config) {
 };
 var createArboretumClient = function (config) { return __awaiter(void 0, void 0, void 0, function () {
     var clientApi, cmaPreviewClientApi, includeEntryStatus, options, sitemapDataCtx, dataE, _a, c, sitemap, pagesByTagIdRecord, ctx_1;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 clientApi = (0, contentful_client_impl_1.createContentfulClient)(config);
                 cmaPreviewClientApi = config.type === "cma-client"
@@ -122,11 +122,11 @@ var createArboretumClient = function (config) { return __awaiter(void 0, void 0,
                 includeEntryStatus = config.type === "cma-client" ? !!((_b = config.options) === null || _b === void 0 ? void 0 : _b.includeEntryStatus) : false;
                 return [4 /*yield*/, arboretumConfigOptions(config)];
             case 1:
-                options = _j.sent();
+                options = _k.sent();
                 sitemapDataCtx = {
                     preview: config.preview,
                     clientApi: clientApi,
-                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus }),
+                    options: __assign(__assign({}, options), { includeEntryStatus: includeEntryStatus, sitemapRepresentation: (_c = config.options) === null || _c === void 0 ? void 0 : _c.sitemapRepresentation }),
                     localeTagIdPrefix: localeTagIdPrefix,
                     pageHomeTagId: options.homePageTagId || pageHomeTagId,
                     contentfulClientType: config.type === "cda-client" && config.contentful.client.withAllLocales
@@ -135,25 +135,25 @@ var createArboretumClient = function (config) { return __awaiter(void 0, void 0,
                     pageTagIdPrefix: pageTagIdPrefix,
                     cmaPreviewClientApi: cmaPreviewClientApi,
                 };
-                if (!((_c = config.options) === null || _c === void 0 ? void 0 : _c.data)) return [3 /*break*/, 2];
-                _a = (0, fp_utils_1.right)({ data: (_d = config.options) === null || _d === void 0 ? void 0 : _d.data.data, warnings: undefined });
+                if (!((_d = config.options) === null || _d === void 0 ? void 0 : _d.data)) return [3 /*break*/, 2];
+                _a = (0, fp_utils_1.right)({ data: (_e = config.options) === null || _e === void 0 ? void 0 : _e.data.data, warnings: undefined });
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, (0, sitemap_data_1.sitemapData)(sitemapDataCtx)];
             case 3:
-                _a = _j.sent();
-                _j.label = 4;
+                _a = _k.sent();
+                _k.label = 4;
             case 4:
                 dataE = _a;
                 if (dataE._tag === "Right") {
                     c = __assign(__assign({}, sitemapDataCtx), { data: dataE.right.data });
-                    sitemap = ((_e = config.options) === null || _e === void 0 ? void 0 : _e.data)
+                    sitemap = ((_f = config.options) === null || _f === void 0 ? void 0 : _f.data)
                         ? config.options.data.sitemap
-                        : ((_f = config.options) === null || _f === void 0 ? void 0 : _f.eagerly)
+                        : ((_g = config.options) === null || _g === void 0 ? void 0 : _g.eagerly)
                             ? (0, build_sitemap_eagerly_1.buildSitemapEagerly)(c, dataE.right.data.locales)
                             : new Map();
-                    pagesByTagIdRecord = ((_g = config.options) === null || _g === void 0 ? void 0 : _g.data)
+                    pagesByTagIdRecord = ((_h = config.options) === null || _h === void 0 ? void 0 : _h.data)
                         ? config.options.data.pagesByTagId
-                        : ((_h = config.options) === null || _h === void 0 ? void 0 : _h.eagerly)
+                        : ((_j = config.options) === null || _j === void 0 ? void 0 : _j.eagerly)
                             ? (0, build_pages_by_tag_eagerly_1.buildPagesByTagEagerly)(__assign(__assign({}, c), { sitemap: sitemap }), dataE.right.data.locales)
                             : new Map();
                     ctx_1 = __assign(__assign({}, c), { data: dataE.right.data, sitemap: sitemap, pagesByTagId: pagesByTagIdRecord, lastUpdatedAt: new Date().toISOString(), regenerationInProgress: false });

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

@@ -96,10 +96,27 @@ var getAllEntriesRecursively = function (_a, contentfulClientType, contentType,
                         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/impl/data/page-entries.js

@@ -79,36 +79,8 @@ var array_to_map_1 = require("../../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,
-            ].flatMap(function (id) { return (id ? ["fields.".concat(id)] : []); });
-            return [2 /*return*/, (0, get_all_entries_recursively_1.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*/, (0, get_all_entries_recursively_1.getAllEntriesRecursively)({ getEntries: getEntries }, contentfulClientType, pageContentTypeOpt.id, skip, acc, select, pageContentTypeOpt.childPagesFieldId
                     ? [pageContentTypeOpt.childPagesFieldId]
                     : [])];
         });
@@ -144,7 +116,14 @@ var pageEntries = function (ctx, apiClient, cmaPreviewClientApi) { return __awai
                 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" &&

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

@@ -2,30 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pageEntryAdapter = void 0;
 var localize_contentful_field_1 = require("../helpers/localize-contentful-field");
-var pageEntryAdapter = function (data, slugField, titleField, childPagesField, locale, parent, entry) {
+var pageEntryAdapter = function (data, options, slugField, titleField, childrenRefs, locale, parent, entry) {
     var _a;
     var fieldValue = (0, localize_contentful_field_1.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 childPages = childPagesField
-        ? fieldValue(childPagesField.localized, entry.fields[childPagesField.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',
+            type: "page",
             parent: parent ? { sys: parent.sys } : undefined,
-            path: parent ? parent.path + '/' + slug : '/' + locale.code,
+            path: parent ? parent.path + "/" + slug : "/" + locale.code,
             slug: slug,
             title: title || undefined,
             sys: {
                 id: entry.sys.id,
                 cmaOnlyStatus: entry.sys.cmaOnlyStatus,
-                contentTypeId: entry.sys.contentType.sys.id
+                contentTypeId: contentTypeId,
             },
             metadata: entry.metadata,
-            childPages: (childPages === null || childPages === void 0 ? void 0 : childPages.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 } }] : []; })) || [],
+            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/impl/sitemap/adapters/to-arboretum-page-with-missing-data-adapter.js

@@ -16,6 +16,7 @@ var toArboretumPageWithMissingData = function (localeCode) {
             : page.childPages.length,
         children: children,
         ancestors: ancestors,
+        additionalFields: page.additionalFields,
     }); };
 };
 exports.toArboretumPageWithMissingData = toArboretumPageWithMissingData;

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

@@ -41,6 +41,7 @@ var fp_utils_1 = require("../../../utils/fp-utils");
 var page_entry_adapter_1 = require("../adapters/page-entry-adapter");
 var redirect_entry_adapter_1 = require("../adapters/redirect-entry-adapter");
 var is_root_1 = require("./is-root");
+var localize_contentful_field_1 = require("./localize-contentful-field");
 var getAllRedirects = function (data, options, locale, parent) {
     var redirectContentType = options.id
         ? data.contentTypes.get(options.id)
@@ -61,15 +62,49 @@ var getAllRedirects = function (data, options, locale, parent) {
         return redirect ? [redirect] : [];
     });
 };
-var buildLocalizedSitemapArrRecursively = function (data, options, locale, parent, pageEntry, acc) {
-    var pages = data.pages, contentTypes = data.contentTypes;
-    var pageContentType = contentTypes.get(pageEntry.sys.contentType.sys.id);
-    var pageContentTypeConfig = options.pageContentTypes[pageEntry.sys.contentType.sys.id];
-    var findPageField = function (fieldId) {
+var findPageFieldF = function (data, options, pageContentTypeId) {
+    return function (fieldId) {
+        var contentTypes = data.contentTypes;
+        var pageContentType = contentTypes.get(pageContentTypeId);
+        var pageContentTypeConfig = options.pageContentTypes[pageContentTypeId];
         return pageContentType && pageContentTypeConfig
             ? pageContentType.fields.get(fieldId)
             : undefined;
     };
+};
+var getChildrenRefsByParentId = function (data, locale, options) {
+    var pages = data.pages;
+    var acc = new Map();
+    pages.forEach(function (page) {
+        var _a;
+        var pageContentTypeConfig = options.pageContentTypes[page.sys.contentType.sys.id];
+        var findPageField = findPageFieldF(data, options, page.sys.contentType.sys.id);
+        var parentPageField = pageContentTypeConfig.parentPageFieldId
+            ? findPageField(pageContentTypeConfig.parentPageFieldId)
+            : undefined;
+        var fieldValue = (0, localize_contentful_field_1.localizeField)(data, locale);
+        var parentPage = parentPageField
+            ? fieldValue(parentPageField.localized, page.fields[parentPageField.id])
+            : undefined;
+        var parentPageId = (_a = parentPage === null || parentPage === void 0 ? void 0 : parentPage.sys) === null || _a === void 0 ? void 0 : _a.id;
+        if (parentPageId) {
+            var pageRef = { sys: { id: page.sys.id } };
+            var maybePages = acc.get(parentPageId);
+            if (maybePages) {
+                maybePages.push(pageRef);
+            }
+            else {
+                acc.set(parentPageId, [pageRef]);
+            }
+        }
+    });
+    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)
@@ -77,8 +112,14 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
     var childPagesField = pageContentTypeConfig.childPagesFieldId
         ? findPageField(pageContentTypeConfig.childPagesFieldId)
         : undefined;
+    var fieldValue = (0, localize_contentful_field_1.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
-        ? (0, page_entry_adapter_1.pageEntryAdapter)(data, slugField, titleField, childPagesField, locale, parent, pageEntry)
+        ? (0, page_entry_adapter_1.pageEntryAdapter)(data, options, slugField, titleField, childrenRefs, locale, parent, pageEntry)
         : undefined;
     if (page) {
         var validChildPages_1 = page.childPages.filter(function (c) { return pages.get(c.sys.id) && !acc.get(c.sys.id); });
@@ -96,7 +137,7 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
             var id = _a.sys.id;
             var childPageEntry = pages.get(id);
             childPageEntry &&
-                buildLocalizedSitemapArrRecursively(data, options, locale, { sys: pageEntry.sys, path: page.path }, childPageEntry, acc);
+                buildLocalizedSitemapArrRecursively(data, options, locale, { sys: pageEntry.sys, path: page.path }, childrenRefsByPageId, childPageEntry, acc);
         });
         return acc;
     }
@@ -110,7 +151,10 @@ var buildLocalizedSitemap = function (data, options, pageHomeTagId, locale) {
     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 sitemap = buildLocalizedSitemapArrRecursively(data, options, locale, undefined, homePageEntry, new Map());
+        var childrenRefsByPageId = options.sitemapRepresentation === "child-to-parent"
+            ? getChildrenRefsByParentId(data, locale, options)
+            : undefined;
+        var sitemap = buildLocalizedSitemapArrRecursively(data, options, locale, undefined, childrenRefsByPageId, homePageEntry, new Map());
         return (0, fp_utils_1.right)({
             root: { sys: homePageEntry.sys },
             sitemap: sitemap,

package/dist/types/arboretum-client.d.ts

@@ -4,6 +4,7 @@ import { ContentTypeT, EntryT, LocaleT, StatusT, TagT } from "./clients/contentf
 export type ArboretumClientOptions = {
     data?: CachedDataT;
     eagerly?: boolean;
+    sitemapRepresentation?: "parent-to-children" | "child-to-parent";
     includeEntryStatus?: boolean;
 };
 export type ArboretumClientContentfulConfigOptionsT = {
@@ -12,6 +13,8 @@ export type ArboretumClientContentfulConfigOptionsT = {
             slugFieldId: string;
             titleFieldId?: string;
             childPagesFieldId?: string;
+            parentPageFieldId?: string;
+            select?: Array<string>;
         };
     };
     redirectContentType?: {
@@ -59,7 +62,7 @@ export type ArboretumClientConfigFromCdaT = {
         client: ContentfulClientApi;
         options: ArboretumClientContentfulConfigOptionsT;
     };
-    options?: Pick<ArboretumClientOptions, "data" | "eagerly">;
+    options?: Pick<ArboretumClientOptions, "data" | "eagerly" | "sitemapRepresentation">;
 };
 export type CreateClientParams = {
     space: string;
@@ -76,7 +79,7 @@ export type ArboretumClientConfigFromCdaParamsT = {
     contentful: Omit<CreateClientParams, "host"> & {
         options: ArboretumClientContentfulConfigOptionsT;
     };
-    options?: Pick<ArboretumClientOptions, "data" | "eagerly">;
+    options?: Pick<ArboretumClientOptions, "data" | "eagerly" | "sitemapRepresentation">;
 };
 export type ArboretumClientConfigT = ArboretumClientConfigFromCmaT | ArboretumClientConfigFromCdaT | ArboretumClientConfigFromCdaParamsT;
 type ArboretumPageBaseT = {
@@ -101,13 +104,16 @@ export type ArboretumPageT = ArboretumPageBaseT & {
     totalDirectChildrenCount: number;
     children?: Array<ArboretumPageNodeT>;
     ancestors?: Array<Omit<ArboretumPageT, "children" | "ancestors">>;
+    additionalFields?: {
+        [key: string]: any;
+    };
 };
 export type ArboretumPageNodeT = ArboretumPageT | ArboretumRedirectT | ArboretumAliasT;
 export type OptionsT = {
     withChildren?: boolean;
     withAncestors?: boolean;
 };
-export type ArboretumClientOptionsT = Pick<ArboretumClientContentfulConfigOptionsT, "pageContentTypes" | "redirectContentType"> & Pick<ArboretumClientOptions, "includeEntryStatus">;
+export type ArboretumClientOptionsT = Pick<ArboretumClientContentfulConfigOptionsT, "pageContentTypes" | "redirectContentType"> & Pick<ArboretumClientOptions, "includeEntryStatus" | "sitemapRepresentation">;
 export type ArboretumClientT = {
     homePage: (localeCode: string, options?: OptionsT) => Either<string, ArboretumPageT>;
     pageByPath: (path: string, options?: OptionsT) => Either<string, ArboretumPageNodeT>;

package/dist/types/impl/arboretum-client.impl.d.ts

@@ -32,6 +32,9 @@ export type PageT = {
             id: string;
         };
     }>;
+    additionalFields?: {
+        [key: string]: any;
+    };
 };
 export type RedirectT = {
     sys: {

package/dist/types/impl/sitemap/adapters/page-entry-adapter.d.ts

@@ -1,6 +1,6 @@
-import { PageT } from '../../arboretum-client.impl';
-import { ContentTypeT, EntryT, LocaleT } from '../../../clients/contentful-client/contentful-client';
-import { SitemapDataT } from '../../data/sitemap-data';
-export declare const pageEntryAdapter: (data: Pick<SitemapDataT, 'locales' | 'defaultLocaleCode'>, slugField: ContentTypeT['fields'][number], titleField: ContentTypeT['fields'][number] | undefined, childPagesField: ContentTypeT['fields'][number] | undefined, locale: LocaleT, parent: (NonNullable<PageT['parent']> & {
+import { ArboretumClientCtx, PageT } from "../../arboretum-client.impl";
+import { ContentTypeT, EntryT, LocaleT } from "../../../clients/contentful-client/contentful-client";
+import { SitemapDataT } from "../../data/sitemap-data";
+export declare const pageEntryAdapter: (data: Pick<SitemapDataT, "locales" | "defaultLocaleCode" | "pages" | "contentTypes">, options: Pick<ArboretumClientCtx["options"], "pageContentTypes">, slugField: ContentTypeT["fields"][number], titleField: ContentTypeT["fields"][number] | undefined, childrenRefs: PageT["childPages"], locale: LocaleT, parent: (NonNullable<PageT["parent"]> & {
     path: string;
 }) | undefined, entry: EntryT) => PageT | undefined;

package/dist/types/impl/sitemap/helpers/build-localized-sitemap.d.ts

@@ -1,5 +1,5 @@
-import { Either } from '../../../utils/fp-utils';
-import { ArboretumClientCtx, LocalizedSitemapT } from '../../arboretum-client.impl';
-import { LocaleT } from '../../../clients/contentful-client/contentful-client';
-export declare const buildLocalizedSitemap: (data: Pick<ArboretumClientCtx['data'], 'homePagesByTagId' | 'pages' | 'contentTypes' | 'defaultLocaleCode' | 'locales' | 'redirects'>, options: ArboretumClientCtx['options'], pageHomeTagId: ArboretumClientCtx['pageHomeTagId'], locale: LocaleT) => Either<string, LocalizedSitemapT>;
-export declare const localizedSitemapFromCacheOrBuildEff: (ctx: Pick<ArboretumClientCtx, 'options' | 'data' | 'pageHomeTagId' | 'sitemap'>, locale: LocaleT) => Either<string, LocalizedSitemapT>;
+import { Either } from "../../../utils/fp-utils";
+import { ArboretumClientCtx, LocalizedSitemapT } from "../../arboretum-client.impl";
+import { LocaleT } from "../../../clients/contentful-client/contentful-client";
+export declare const buildLocalizedSitemap: (data: Pick<ArboretumClientCtx["data"], "homePagesByTagId" | "pages" | "contentTypes" | "defaultLocaleCode" | "locales" | "redirects">, options: ArboretumClientCtx["options"], pageHomeTagId: ArboretumClientCtx["pageHomeTagId"], locale: LocaleT) => Either<string, LocalizedSitemapT>;
+export declare const localizedSitemapFromCacheOrBuildEff: (ctx: Pick<ArboretumClientCtx, "options" | "data" | "pageHomeTagId" | "sitemap">, locale: LocaleT) => Either<string, LocalizedSitemapT>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bright.global/arboretum-sdk",
-  "version": "0.0.9",
+  "version": "0.1.0-rc.1",
   "license": "MIT",
   "description": "The sitemap for contentful",
   "dependencies": {},