@websolutespa/bom-core 1.8.21 → 1.8.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 1.8.23
+
+### Patch Changes
+
+- 0c7f05f: Modified: IRoute isRoot noindex, routeService
+
+## 1.8.22
+
+### Patch Changes
+
+- Fixing: JsonService whereItem\_ unresolved relations
+
 ## 1.8.21
 
 ### Patch Changes

package/dist/index.d.ts

@@ -347,14 +347,16 @@ type IMarket = IEntity & {
 
 type IRoute = {
     category: IEquatable;
-    resolvedCategory: IEquatable;
     id: string;
     isDefault?: boolean;
+    isRoot?: boolean;
     locale: string;
     market: string;
     media?: IMedia;
+    noindex?: boolean;
     order?: number;
     page: IEquatable;
+    resolvedCategory: IEquatable;
     schema: string;
     template?: string;
     title: string;
@@ -1052,6 +1054,9 @@ declare function getOrigin(headers?: IncomingHttpHeaders | Headers): string;
 
 /**
  * Represents the route strategy options.
+ * - **Auto** dynamically add/remove prefixes based on number of markets & languages.
+ * - **Default** add prefixes based on !isDefault market or language flag.
+ * - **Manual** add prefixes based on !isHidden market or language flag.
  */
 declare enum RouteStrategy {
     Auto = "auto",

package/dist/index.js

@@ -1392,7 +1392,11 @@ function getValue(item, key) {
   const keys = key.split(".");
   const value = keys.reduce((p, c) => {
     if (isObject(p)) {
-      return p[c];
+      const v = p[c];
+      if (isUnresolvedRelation(v)) {
+        return v.value;
+      }
+      return v;
     } else {
       return void 0;
     }
@@ -1677,22 +1681,7 @@ var RouteStrategy = /* @__PURE__ */ ((RouteStrategy2) => {
   RouteStrategy2["Manual"] = "manual";
   return RouteStrategy2;
 })(RouteStrategy || {});
-var ROUTE_STRATEGY = process.env.ROUTE_STRATEGY || "auto" /* Auto */;
-function getPickedProps(item) {
-  const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
-    "category",
-    "isDefault",
-    "media",
-    "order",
-    "template",
-    "updatedAt",
-    "useSplat",
-    // 'createdAt',
-    "updatedAt",
-    "_status"
-  ].includes(k)));
-  return pickedProps;
-}
+var ROUTE_STRATEGY = process.env.ROUTE_STRATEGY || "manual" /* Manual */;
 function collectRoutes(store, categories, markets, locales, medias) {
   const routes = [];
   if (locales.length > 0 && markets.length > 0) {
@@ -1706,31 +1695,57 @@ function collectRoutes(store, categories, markets, locales, medias) {
         if (Boolean(item.isDefault) === false) {
           slugs.push({ slug: item.slug });
         }
-        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 (hasMarket(item, market)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
-            const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
-            const pickedProps = getPickedProps(item);
+            const {
+              _status,
+              category,
+              isDefault,
+              media,
+              order,
+              template,
+              updatedAt,
+              useSplat
+            } = item;
             const route = {
-              ...pickedProps,
-              resolvedCategory: visibleCategory.id,
-              id: isDefaultRootCategory ? "/" : id,
+              _status,
+              category,
+              // id: isDefaultRootCategory ? '/' : id,
+              id,
               locale: locale.id,
               market: market.id,
+              media,
               page: item.id,
+              resolvedCategory: visibleCategory.id,
               schema: key,
-              title
+              template,
+              title,
+              updatedAt
             };
+            if (isDefault) {
+              route.isDefault = true;
+            }
+            if (isRootCategory) {
+              route.isRoot = true;
+            }
+            const noindex = (item.meta?.robots || "").includes("noindex");
+            if (noindex) {
+              route.noindex = true;
+            }
+            if (order != null) {
+              route.order = order;
+            }
+            if (useSplat) {
+              route.useSplat = true;
+            }
             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;
+              const media2 = item.media && medias.find((x) => x.id === mediaId);
+              if (media2) {
+                route.media = media2;
               }
             }
             routes.push(route);

package/dist/index.mjs

@@ -1223,7 +1223,11 @@ function getValue(item, key) {
   const keys = key.split(".");
   const value = keys.reduce((p, c) => {
     if (isObject(p)) {
-      return p[c];
+      const v = p[c];
+      if (isUnresolvedRelation(v)) {
+        return v.value;
+      }
+      return v;
     } else {
       return void 0;
     }
@@ -1508,22 +1512,7 @@ var RouteStrategy = /* @__PURE__ */ ((RouteStrategy2) => {
   RouteStrategy2["Manual"] = "manual";
   return RouteStrategy2;
 })(RouteStrategy || {});
-var ROUTE_STRATEGY = process.env.ROUTE_STRATEGY || "auto" /* Auto */;
-function getPickedProps(item) {
-  const pickedProps = Object.fromEntries(Object.entries(item).filter(([k, v]) => [
-    "category",
-    "isDefault",
-    "media",
-    "order",
-    "template",
-    "updatedAt",
-    "useSplat",
-    // 'createdAt',
-    "updatedAt",
-    "_status"
-  ].includes(k)));
-  return pickedProps;
-}
+var ROUTE_STRATEGY = process.env.ROUTE_STRATEGY || "manual" /* Manual */;
 function collectRoutes(store, categories, markets, locales, medias) {
   const routes = [];
   if (locales.length > 0 && markets.length > 0) {
@@ -1537,31 +1526,57 @@ function collectRoutes(store, categories, markets, locales, medias) {
         if (Boolean(item.isDefault) === false) {
           slugs.push({ slug: item.slug });
         }
-        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 (hasMarket(item, market)) {
             const title = localize(item.title, locale.id);
             const id = getRouteHref(slugs, market, locale, markets2, locales2);
-            const isDefaultRootCategory = isRootCategory && market.id === defaultMarket2.id && locale.id === defaultMarketLocale;
-            const pickedProps = getPickedProps(item);
+            const {
+              _status,
+              category,
+              isDefault,
+              media,
+              order,
+              template,
+              updatedAt,
+              useSplat
+            } = item;
             const route = {
-              ...pickedProps,
-              resolvedCategory: visibleCategory.id,
-              id: isDefaultRootCategory ? "/" : id,
+              _status,
+              category,
+              // id: isDefaultRootCategory ? '/' : id,
+              id,
               locale: locale.id,
               market: market.id,
+              media,
               page: item.id,
+              resolvedCategory: visibleCategory.id,
               schema: key,
-              title
+              template,
+              title,
+              updatedAt
             };
+            if (isDefault) {
+              route.isDefault = true;
+            }
+            if (isRootCategory) {
+              route.isRoot = true;
+            }
+            const noindex = (item.meta?.robots || "").includes("noindex");
+            if (noindex) {
+              route.noindex = true;
+            }
+            if (order != null) {
+              route.order = order;
+            }
+            if (useSplat) {
+              route.useSplat = true;
+            }
             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;
+              const media2 = item.media && medias.find((x) => x.id === mediaId);
+              if (media2) {
+                route.media = media2;
               }
             }
             routes.push(route);

package/package.json

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