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

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]
                     : [])];
         });
@@ -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" &&

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/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

@@ -116,7 +116,7 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
             ? ((_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)
+        ? 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); });

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,37 +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,
-                pageContentTypeOpt.parentPageFieldId,
-            ].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]
                     : [])];
         });
@@ -145,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,13 +2,25 @@
 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, childrenRefs, 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 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",
@@ -19,10 +31,11 @@ var pageEntryAdapter = function (data, slugField, titleField, childrenRefs, loca
             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/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

@@ -119,7 +119,7 @@ var buildLocalizedSitemapArrRecursively = function (data, options, locale, paren
             ? ((_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, childrenRefs, 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); });

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

@@ -14,6 +14,7 @@ export type ArboretumClientContentfulConfigOptionsT = {
             titleFieldId?: string;
             childPagesFieldId?: string;
             parentPageFieldId?: string;
+            select?: Array<string>;
         };
     };
     redirectContentType?: {
@@ -103,6 +104,9 @@ 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 = {

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 { 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">, slugField: ContentTypeT["fields"][number], titleField: ContentTypeT["fields"][number] | undefined, childrenRefs: PageT["childPages"], locale: LocaleT, parent: (NonNullable<PageT["parent"]> & {
+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/package.json

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