@bright.global/arboretum-sdk 0.1.0-rc.2 → 0.1.0-rc.3

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));
                     }

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

@@ -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));
                     }

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

@@ -86,6 +86,7 @@ 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";
 var pageTagIdPrefix = "page";
 var pageHomeTagId = "".concat(pageTagIdPrefix, "Home");
 var localeTagIdPrefix = "locale";
@@ -168,6 +169,7 @@ 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),
                             },
                             warnings: dataE.right.warnings,
                         }];

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, options, 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

package/dist/es6/impl/sitemap/methods/orphaned-pages.js

@@ -0,0 +1,97 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { left, right } from "../../../utils/fp-utils";
+import { buildPage, localizedSitemapFromCacheOrBuildEff, } from "../helpers/build-localized-sitemap";
+import { toArboretumPage } from "../adapters/to-arboretum-page-adapter";
+var singleOrAllLocalesE = function (locales) {
+    return function (localeCode) {
+        if (localeCode) {
+            var locale = locales.get(localeCode);
+            return locale
+                ? right([locale])
+                : left("Failed to find locale by code: ".concat(localeCode));
+        }
+        else {
+            return right(__spreadArray([], __read(locales.values()), false));
+        }
+    };
+};
+export var orphanedPages = function (ctx) {
+    return function (options) {
+        var localeCode = options === null || options === void 0 ? void 0 : options.localeCode;
+        var localesE = singleOrAllLocalesE(ctx.data.locales)(localeCode);
+        var skip = typeof (options === null || options === void 0 ? void 0 : options.skip) !== "undefined" ? options.skip : 0;
+        if (localesE._tag === "Right") {
+            var pages = localesE.right
+                .flatMap(function (locale) {
+                var localizedSitemapE = localizedSitemapFromCacheOrBuildEff(ctx, locale);
+                var pages = localizedSitemapE._tag === "Right"
+                    ? __spreadArray([], __read(ctx.data.pages.values()), false).flatMap(function (p) {
+                        var sitemapPage = localizedSitemapE.right.sitemap.get(p.sys.id);
+                        if (sitemapPage) {
+                            return [];
+                        }
+                        else {
+                            var page = buildPage(ctx.data, ctx.options, undefined, locale, undefined, p);
+                            var arboretumPage = page
+                                ? toArboretumPage(localizedSitemapE.right, locale.code, {})(page)
+                                : undefined;
+                            return arboretumPage
+                                ? [
+                                    __assign(__assign({}, arboretumPage), { path: undefined, totalDirectChildrenCount: undefined, ancestors: undefined, children: undefined }),
+                                ]
+                                : [];
+                        }
+                    })
+                    : [];
+                return pages;
+            })
+                .sort(function (p1, p2) {
+                if (p1.id < p2.id)
+                    return -1;
+                if (p1.id > p2.id)
+                    return 1;
+                return 0;
+            })
+                .slice(skip, options === null || options === void 0 ? void 0 : options.limit);
+            return right(pages);
+        }
+        else {
+            return localesE;
+        }
+    };
+};

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

@@ -89,6 +89,7 @@ var build_sitemap_eagerly_1 = require("./sitemap/helpers/build-sitemap-eagerly")
 var cached_data_1 = require("./sitemap/methods/cached-data");
 var build_pages_by_tag_eagerly_1 = require("./sitemap/helpers/build-pages-by-tag-eagerly");
 var home_page_1 = require("./sitemap/methods/home-page");
+var orphaned_pages_1 = require("./sitemap/methods/orphaned-pages");
 var pageTagIdPrefix = "page";
 var pageHomeTagId = "".concat(pageTagIdPrefix, "Home");
 var localeTagIdPrefix = "locale";
@@ -171,6 +172,7 @@ var createArboretumClient = function (config) { return __awaiter(void 0, void 0,
                                 search: (0, search_1.search)(ctx_1),
                                 status: (0, status_1.status)(ctx_1),
                                 cachedData: (0, cached_data_1.cachedData)(ctx_1),
+                                orphanedPages: (0, orphaned_pages_1.orphanedPages)(ctx_1),
                             },
                             warnings: dataE.right.warnings,
                         }];

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

@@ -36,7 +36,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localizedSitemapFromCacheOrBuildEff = exports.buildLocalizedSitemap = void 0;
+exports.localizedSitemapFromCacheOrBuildEff = exports.buildLocalizedSitemap = exports.buildPage = void 0;
 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");
@@ -72,6 +72,28 @@ var findPageFieldF = function (data, options, pageContentTypeId) {
             : undefined;
     };
 };
+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 = (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 } }] : []; })) || []
+            : [];
+    return slugField
+        ? (0, page_entry_adapter_1.pageEntryAdapter)(data, options, slugField, titleField, childrenRefs, locale, parent, pageEntry)
+        : undefined;
+};
+exports.buildPage = buildPage;
 var getChildrenRefsByParentId = function (data, locale, options) {
     var pages = data.pages;
     var acc = new Map();
@@ -101,26 +123,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 = (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, options, slugField, titleField, childrenRefs, locale, parent, pageEntry)
-        : undefined;
+    var page = (0, exports.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 = (0, is_root_1.isRoot)(page) && options.redirectContentType

package/dist/impl/sitemap/methods/orphaned-pages.js

@@ -0,0 +1,101 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.orphanedPages = void 0;
+var fp_utils_1 = require("../../../utils/fp-utils");
+var build_localized_sitemap_1 = require("../helpers/build-localized-sitemap");
+var to_arboretum_page_adapter_1 = require("../adapters/to-arboretum-page-adapter");
+var singleOrAllLocalesE = function (locales) {
+    return function (localeCode) {
+        if (localeCode) {
+            var locale = locales.get(localeCode);
+            return locale
+                ? (0, fp_utils_1.right)([locale])
+                : (0, fp_utils_1.left)("Failed to find locale by code: ".concat(localeCode));
+        }
+        else {
+            return (0, fp_utils_1.right)(__spreadArray([], __read(locales.values()), false));
+        }
+    };
+};
+var orphanedPages = function (ctx) {
+    return function (options) {
+        var localeCode = options === null || options === void 0 ? void 0 : options.localeCode;
+        var localesE = singleOrAllLocalesE(ctx.data.locales)(localeCode);
+        var skip = typeof (options === null || options === void 0 ? void 0 : options.skip) !== "undefined" ? options.skip : 0;
+        if (localesE._tag === "Right") {
+            var pages = localesE.right
+                .flatMap(function (locale) {
+                var localizedSitemapE = (0, build_localized_sitemap_1.localizedSitemapFromCacheOrBuildEff)(ctx, locale);
+                var pages = localizedSitemapE._tag === "Right"
+                    ? __spreadArray([], __read(ctx.data.pages.values()), false).flatMap(function (p) {
+                        var sitemapPage = localizedSitemapE.right.sitemap.get(p.sys.id);
+                        if (sitemapPage) {
+                            return [];
+                        }
+                        else {
+                            var page = (0, build_localized_sitemap_1.buildPage)(ctx.data, ctx.options, undefined, locale, undefined, p);
+                            var arboretumPage = page
+                                ? (0, to_arboretum_page_adapter_1.toArboretumPage)(localizedSitemapE.right, locale.code, {})(page)
+                                : undefined;
+                            return arboretumPage
+                                ? [
+                                    __assign(__assign({}, arboretumPage), { path: undefined, totalDirectChildrenCount: undefined, ancestors: undefined, children: undefined }),
+                                ]
+                                : [];
+                        }
+                    })
+                    : [];
+                return pages;
+            })
+                .sort(function (p1, p2) {
+                if (p1.id < p2.id)
+                    return -1;
+                if (p1.id > p2.id)
+                    return 1;
+                return 0;
+            })
+                .slice(skip, options === null || options === void 0 ? void 0 : options.limit);
+            return (0, fp_utils_1.right)(pages);
+        }
+        else {
+            return localesE;
+        }
+    };
+};
+exports.orphanedPages = orphanedPages;

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

@@ -141,5 +141,10 @@ export type ArboretumClientT = {
         regenerationInProgress: boolean;
     };
     cachedData: () => CachedDataT;
+    orphanedPages: (options?: {
+        limit?: number;
+        skip?: number;
+        localeCode?: string;
+    }) => Either<string, Array<Omit<ArboretumPageT, "path" | "totalDirectChildrenCount" | "ancestors" | "children">>>;
 };
 export {};

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

@@ -1,5 +1,13 @@
 import { Either } from "../../../utils/fp-utils";
-import { ArboretumClientCtx, LocalizedSitemapT } from "../../arboretum-client.impl";
-import { LocaleT } from "../../../clients/contentful-client/contentful-client";
+import { ArboretumClientCtx, LocalizedSitemapT, PageT } from "../../arboretum-client.impl";
+import { EntryT, LocaleT } from "../../../clients/contentful-client/contentful-client";
+import { SitemapDataT } from "../../data/sitemap-data";
+export declare const buildPage: (data: Pick<SitemapDataT, "locales" | "defaultLocaleCode" | "pages" | "contentTypes">, options: ArboretumClientCtx["options"], childrenRefsByPageId: Map<string, Array<{
+    sys: {
+        id: string;
+    };
+}>> | undefined, locale: LocaleT, parent: (NonNullable<PageT["parent"]> & {
+    path: string;
+}) | undefined, pageEntry: EntryT) => PageT | undefined;
 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/dist/types/impl/sitemap/methods/orphaned-pages.d.ts

@@ -0,0 +1,3 @@
+import { ArboretumClientT } from "../../../arboretum-client";
+import { ArboretumClientCtx } from "../../arboretum-client.impl";
+export declare const orphanedPages: (ctx: Pick<ArboretumClientCtx, "data" | "sitemap" | "options" | "pageHomeTagId">) => ArboretumClientT["orphanedPages"];

package/package.json

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