@websolutespa/bom-core 1.8.6 → 1.8.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 1.8.8
+
+### Patch Changes
+
+- f343ad7: Modified: RouteService collectRoutes
+
+## 1.8.7
+
+### Patch Changes
+
+- Modified: routeService getPickedProps
+
 ## 1.8.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -94,13 +94,15 @@ type User = Record<string, unknown> & {
     id: string;
     email: string;
 };
-type UserRole = 'admin' | 'editor' | 'user' | string;
+type UserRole = ('admin' | 'editor' | 'guest' | 'user') & string;
 type UserWithRoles = User & {
     roles: UserRole[];
 };
 type IEndUser = UserWithRoles & {
     email: string;
     consentPreferences: IConsentPreference[];
+    createdAt: string;
+    updatedAt: string;
 };
 
 type IAction = Record<string, unknown> & {
@@ -110,7 +112,6 @@ type IAction = Record<string, unknown> & {
     consentsRevoked?: boolean;
     consentsRevokedDate?: string | Date;
     endUser: IEndUser;
-    loggedEndUser?: IEndUser;
     email?: string;
     password?: string;
     createdAt?: string;
@@ -542,12 +543,8 @@ type ILayout = {
     tree?: IRouteLink;
 };
 
-type IUndecoratedNav<T> = T & {
-    nav?: IUndecoratedMenuPage;
-};
-type IDecoratedNav<T> = T & {
-    nav?: IMenuPage;
-};
+type IUndecoratedNav = IUndecoratedMenuPage;
+type IDecoratedNav = IMenuPage;
 
 type Pagination = {
     hasNextPage: boolean;
@@ -1265,12 +1262,6 @@ declare function isRelation(item: unknown): item is IPageRelation;
  * @returns True if the item is an undecorated menu item, false otherwise.
  */
 declare function isUndecoratedMenuItem(item: unknown): item is IUndecoratedMenuItem;
-/**
- * Checks if the given item is an undecorated navigation.
- * @param item The item to check.
- * @returns True if the item is an undecorated navigation, false otherwise.
- */
-declare function isUndecoratedNav<T>(item: unknown): item is IUndecoratedNav<T>;
 /**
  * Checks if the given item is an undecorated menu category.
  * @param item The item to check.
@@ -1283,6 +1274,12 @@ declare function isUndecoratedMenuCategory(item: unknown): item is IUndecoratedM
  * @returns True if the item is an undecorated menu page, false otherwise.
  */
 declare function isUndecoratedMenuPage(item: unknown): item is IUndecoratedMenuPage;
+/**
+ * Checks if the given item is an undecorated navigation.
+ * @param item The item to check.
+ * @returns True if the item is an undecorated navigation, false otherwise.
+ */
+declare function isUndecoratedNav(item: unknown): item is IUndecoratedNav;
 
 /**
  * Generates a random UUID (Universally Unique Identifier) in version 4 format.

package/dist/index.js

@@ -188,15 +188,15 @@ function isRelation(item) {
 function isUndecoratedMenuItem(item) {
   return isObject(item) && (item.type === "category" && isEquatable(item.category) || item.type === "page" && isEquatable(item.page.value));
 }
-function isUndecoratedNav(item) {
-  return isObject(item) && isUndecoratedMenuPage(item.nav);
-}
 function isUndecoratedMenuCategory(item) {
   return isObject(item) && item.type === "category" && isNotNullString(item.category) && item.id === void 0 && item.href === void 0;
 }
 function isUndecoratedMenuPage(item) {
   return isObject(item) && item.type === "page" && isObject(item.page) && isNotNullString(item.page.relationTo) && isEquatable(item.page.value);
 }
+function isUndecoratedNav(item) {
+  return isUndecoratedMenuPage(item);
+}
 
 // src/utils/asEquatable.ts
 function asEquatable(value) {
@@ -725,7 +725,7 @@ async function httpDelete(url, options = {}) {
 
 // src/image/image.ts
 function getSecret() {
-  return process.env.IMAGE_SECRET || "The sun sets over the calm ocean";
+  return process.env.IMAGE_SECRET || "IMAGE_SECRET";
 }
 function textToArrayBuffer_(text) {
   const encoder = new TextEncoder();
@@ -1378,6 +1378,7 @@ function getPickedProps(item) {
   const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
     "category",
     "isDefault",
+    "media",
     "order",
     "template",
     "updatedAt",
@@ -1398,43 +1399,20 @@ function collectRoutes(store, categories, markets, locales, medias) {
         if (Boolean(item.isDefault) === false) {
           slugs.push({ slug: item.slug });
         }
-        if (rootCategory && item.category === rootCategory.id) {
-          const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
-          const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
-          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
-          const title = localize(item.title, defaultMarketLocale);
-          const pickedProps = getPickedProps(item);
-          const route = {
-            ...pickedProps,
-            resolvedCategory: rootCategory.id,
-            id: "/",
-            market: defaultMarket2.id,
-            locale: defaultMarketLocale,
-            page: item.id,
-            schema: key,
-            title
-          };
-          const mediaId = typeof item.media === "string" ? item.media : void 0;
-          if (Array.isArray(medias) && mediaId) {
-            const media = item.media && medias.find((x) => x.id === mediaId);
-            if (media) {
-              route.media = media;
-            }
-          }
-          routes.push(route);
-        }
+        const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
+        const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
+        const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
+        const isRootCategory = rootCategory && item.category === rootCategory.id && item.isDefault;
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
           if (!item.markets || item.markets.includes(market.id)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
-            if (!id) {
-              return;
-            }
+            const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
             const pickedProps = getPickedProps(item);
             const route = {
               ...pickedProps,
               resolvedCategory: visibleCategory.id,
-              id,
+              id: isDefaultRootCategory ? "/" : id,
               locale: locale.id,
               market: market.id,
               page: item.id,

package/dist/index.mjs

@@ -40,15 +40,15 @@ function isRelation(item) {
 function isUndecoratedMenuItem(item) {
   return isObject(item) && (item.type === "category" && isEquatable(item.category) || item.type === "page" && isEquatable(item.page.value));
 }
-function isUndecoratedNav(item) {
-  return isObject(item) && isUndecoratedMenuPage(item.nav);
-}
 function isUndecoratedMenuCategory(item) {
   return isObject(item) && item.type === "category" && isNotNullString(item.category) && item.id === void 0 && item.href === void 0;
 }
 function isUndecoratedMenuPage(item) {
   return isObject(item) && item.type === "page" && isObject(item.page) && isNotNullString(item.page.relationTo) && isEquatable(item.page.value);
 }
+function isUndecoratedNav(item) {
+  return isUndecoratedMenuPage(item);
+}
 
 // src/utils/asEquatable.ts
 function asEquatable(value) {
@@ -577,7 +577,7 @@ async function httpDelete(url, options = {}) {
 
 // src/image/image.ts
 function getSecret() {
-  return process.env.IMAGE_SECRET || "The sun sets over the calm ocean";
+  return process.env.IMAGE_SECRET || "IMAGE_SECRET";
 }
 function textToArrayBuffer_(text) {
   const encoder = new TextEncoder();
@@ -1230,6 +1230,7 @@ function getPickedProps(item) {
   const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
     "category",
     "isDefault",
+    "media",
     "order",
     "template",
     "updatedAt",
@@ -1250,43 +1251,20 @@ function collectRoutes(store, categories, markets, locales, medias) {
         if (Boolean(item.isDefault) === false) {
           slugs.push({ slug: item.slug });
         }
-        if (rootCategory && item.category === rootCategory.id) {
-          const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
-          const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
-          const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
-          const title = localize(item.title, defaultMarketLocale);
-          const pickedProps = getPickedProps(item);
-          const route = {
-            ...pickedProps,
-            resolvedCategory: rootCategory.id,
-            id: "/",
-            market: defaultMarket2.id,
-            locale: defaultMarketLocale,
-            page: item.id,
-            schema: key,
-            title
-          };
-          const mediaId = typeof item.media === "string" ? item.media : void 0;
-          if (Array.isArray(medias) && mediaId) {
-            const media = item.media && medias.find((x) => x.id === mediaId);
-            if (media) {
-              route.media = media;
-            }
-          }
-          routes.push(route);
-        }
+        const defaultLocale2 = locales.find((x) => x.isDefault) || locales[0];
+        const defaultMarket2 = markets.find((x) => x.isDefault) || markets[0];
+        const defaultMarketLocale = defaultMarket2 && defaultMarket2.defaultLanguage ? asEntityId(defaultMarket2.defaultLanguage) : defaultLocale2.id;
+        const isRootCategory = rootCategory && item.category === rootCategory.id && item.isDefault;
         eachMarketLocale(markets, locales, (market, locale, markets2, locales2) => {
           if (!item.markets || item.markets.includes(market.id)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
-            if (!id) {
-              return;
-            }
+            const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
             const pickedProps = getPickedProps(item);
             const route = {
               ...pickedProps,
               resolvedCategory: visibleCategory.id,
-              id,
+              id: isDefaultRootCategory ? "/" : id,
               locale: locale.id,
               market: market.id,
               page: item.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.8.6",
+  "version": "1.8.8",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",