@websolutespa/bom-mixer-models 1.7.6 → 1.7.7

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @websolutespa/bom-mixer-models
 
+## 1.7.7
+
+### Patch Changes
+
+- Modified: RouteService, MenuService to handle isHidden Category segments
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.7.8
+  - @websolutespa/bom-core@1.7.12
+
 ## 1.7.6
 
 ### Patch Changes

package/dist/index.js

@@ -141,7 +141,7 @@ async function getCategory(id, params = {}) {
 }
 async function getSegments(item, params = {}) {
   const categories = await getCategories(params);
-  return (0, import_bom_core.getCategorySegments)(item, categories);
+  return (0, import_bom_core.getCategorySegments)(categories, item);
 }
 
 // src/country/country.service.ts
@@ -265,9 +265,7 @@ async function getBreadcrumbFromSegments(segments, route) {
     }
   });
   const tree = segments.map((segment) => {
-    const route2 = routes.find(
-      (r) => r.category === segment.id && r.isDefault
-    );
+    const route2 = (0, import_bom_core2.findRouteOfCategory)(routes, segment.id);
     return {
       segment,
       route: route2
@@ -304,15 +302,13 @@ async function getRouteLinkTree(market, locale) {
   return void 0;
 }
 function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id && r.isDefault
-  );
+  const route = (0, import_bom_core2.findRouteOfCategory)(routes, category.id);
   if (!route) {
     return void 0;
   }
   const rootCategory = (0, import_bom_core2.getRootCategory)(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = x.category ? (0, import_bom_core2.asCategoryId)(x.category) : null;
+    const parentId = (0, import_bom_core2.asCategoryId)(x.category);
     return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
   });
   const routeLink = newRouteLink(category, route, locale);
@@ -1235,7 +1231,7 @@ async function getPageCategory(schema, page, market, locale) {
   const pages = await findManyPages(schema, {
     where: {
       category: {
-        equals: typeof page.category === "object" ? page.category.id : page.category
+        equals: (0, import_bom_core3.asCategoryId)(page.category)
       }
     },
     market,
@@ -1742,7 +1738,7 @@ var DefaultStructuredDataCollections = {
   article: ["news_detail"]
 };
 function resolveTemplate(value) {
-  return (0, import_bom_core7.asCategoryId)(value);
+  return (0, import_bom_core7.asEquatableString)(value);
 }
 function resolveMediaSrc(media) {
   return resolveHref(media.src || media.url);
@@ -1751,14 +1747,15 @@ function resolveStructuredData(page, websiteName = "WebsiteName", types = Defaul
   let schema = null;
   let pageType = page.schema || "";
   if (page.template) {
-    pageType = (0, import_bom_core7.asCategoryId)(page.template);
+    pageType = (0, import_bom_core7.asEquatableString)(page.template);
   }
   if (types.article.includes(pageType)) {
+    const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
     schema = {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [resolveMediaSrc(page.media)] : [],
+      image: mediaSrc ? [mediaSrc] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{

package/dist/index.mjs

@@ -40,7 +40,7 @@ async function getCategory(id, params = {}) {
 }
 async function getSegments(item, params = {}) {
   const categories = await getCategories(params);
-  return getCategorySegments(item, categories);
+  return getCategorySegments(categories, item);
 }
 
 // src/country/country.service.ts
@@ -83,7 +83,7 @@ async function getRegion(id, params = {}) {
 }
 
 // src/route/route.service.ts
-import { asCategoryId, defaultLocale, defaultMarket, getRootCategory, localize } from "@websolutespa/bom-core";
+import { asCategoryId, defaultLocale, defaultMarket, findRouteOfCategory, getRootCategory, localize } from "@websolutespa/bom-core";
 import { getStore as getStore5 } from "@websolutespa/bom-mixer-store";
 async function getRoutes(params = {}) {
   const store = await getStore5();
@@ -164,9 +164,7 @@ async function getBreadcrumbFromSegments(segments, route) {
     }
   });
   const tree = segments.map((segment) => {
-    const route2 = routes.find(
-      (r) => r.category === segment.id && r.isDefault
-    );
+    const route2 = findRouteOfCategory(routes, segment.id);
     return {
       segment,
       route: route2
@@ -203,15 +201,13 @@ async function getRouteLinkTree(market, locale) {
   return void 0;
 }
 function categoryToRouteLink(routes, categories, category, locale) {
-  const route = routes.find(
-    (r) => r.category === category.id && r.isDefault
-  );
+  const route = findRouteOfCategory(routes, category.id);
   if (!route) {
     return void 0;
   }
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter((x) => {
-    const parentId = x.category ? asCategoryId(x.category) : null;
+    const parentId = asCategoryId(x.category);
     return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
   });
   const routeLink = newRouteLink(category, route, locale);
@@ -1034,7 +1030,7 @@ async function getOrder(id, market, locale) {
 }
 
 // src/page/page.service.ts
-import { asServerProps, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2 } from "@websolutespa/bom-core";
+import { asCategoryId as asCategoryId2, asServerProps, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2 } from "@websolutespa/bom-core";
 import { RemoteServiceStrategy, getStore as getStore12 } from "@websolutespa/bom-mixer-store";
 async function findOnePage(schema, id, params) {
   const store = await getStore12();
@@ -1134,7 +1130,7 @@ async function getPageCategory(schema, page, market, locale) {
   const pages = await findManyPages(schema, {
     where: {
       category: {
-        equals: typeof page.category === "object" ? page.category.id : page.category
+        equals: asCategoryId2(page.category)
       }
     },
     market,
@@ -1636,12 +1632,12 @@ var getSiteMapXSLProps = async (context) => {
 };
 
 // src/structured_data/structured_data.ts
-import { asCategoryId as asCategoryId2 } from "@websolutespa/bom-core";
+import { asEquatableString } from "@websolutespa/bom-core";
 var DefaultStructuredDataCollections = {
   article: ["news_detail"]
 };
 function resolveTemplate(value) {
-  return asCategoryId2(value);
+  return asEquatableString(value);
 }
 function resolveMediaSrc(media) {
   return resolveHref(media.src || media.url);
@@ -1650,14 +1646,15 @@ function resolveStructuredData(page, websiteName = "WebsiteName", types = Defaul
   let schema = null;
   let pageType = page.schema || "";
   if (page.template) {
-    pageType = asCategoryId2(page.template);
+    pageType = asEquatableString(page.template);
   }
   if (types.article.includes(pageType)) {
+    const mediaSrc = page.media ? resolveMediaSrc(page.media) : void 0;
     schema = {
       "@context": "https://schema.org",
       "@type": "NewsArticle",
       headline: page.title,
-      image: page.media ? [resolveMediaSrc(page.media)] : [],
+      image: mediaSrc ? [mediaSrc] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

package/src/category/category.service.ts

@@ -16,5 +16,5 @@ export async function getCategory(id: IEquatable, params: QueryParams = {}): Pro
 
 export async function getSegments(item: ICategorized, params: QueryParams = {}): Promise<ICategory[]> {
   const categories: ICategory[] = await getCategories(params);
-  return getCategorySegments(item, categories);
+  return getCategorySegments(categories, item);
 }

package/src/page/page.service.ts

@@ -1,4 +1,4 @@
-import { ICategorized, ICategory, IEquatable, ILayout, IPage, IRoute, IRouteLink, PageProps, QueryParams, SchemaType, asServerProps, defaultLocale, defaultMarket } from '@websolutespa/bom-core';
+import { ICategorized, ICategory, IEquatable, ILayout, IPage, IRoute, IRouteLink, PageProps, QueryParams, SchemaType, asCategoryId, asServerProps, defaultLocale, defaultMarket } from '@websolutespa/bom-core';
 import { RemoteServiceStrategy, getStore } from '@websolutespa/bom-mixer-store';
 import { Redirect } from 'next';
 import { getSegments } from '../category/category.service';
@@ -42,6 +42,7 @@ export async function getPage<T extends ICategorized = ICategorized>(schema: str
     const currentRoute = routes.find((x: IRoute) => x.market === market && x.locale === locale);
     const alternates = routes.filter((x: IRoute) => x.market !== market || x.locale !== locale);
     const segments: ICategory[] = await getSegments(page);
+    // console.log('getPage.currentRoute', currentRoute?.category);
     // console.log('getPage.segments', segments.map(x => x.id));
     const breadcrumb: IRouteLink[] =
       currentRoute ?
@@ -123,7 +124,7 @@ export async function getPageCategory<T extends ICategorized>(schema: string, pa
   const pages = await findManyPages<T>(schema, {
     where: {
       category: {
-        equals: typeof page.category === 'object' ? page.category.id : page.category,
+        equals: asCategoryId(page.category),
       },
     }, market, locale,
   });

package/src/route/route.service.ts

@@ -1,4 +1,4 @@
-import { asCategoryId, defaultLocale, defaultMarket, getRootCategory, ICategory, IRoute, IRouteLink, localize, QueryParams } from '@websolutespa/bom-core';
+import { asCategoryId, defaultLocale, defaultMarket, findRouteOfCategory, getRootCategory, ICategory, IRoute, IRouteLink, localize, QueryParams } from '@websolutespa/bom-core';
 import { getStore } from '@websolutespa/bom-mixer-store';
 import { IModelStore } from '../store/store';
 
@@ -93,9 +93,7 @@ export async function getBreadcrumbFromSegments(segments: ICategory[], route: IR
     },
   });
   const tree: IRouteLink[] = segments.map(segment => {
-    const route = routes.find(r =>
-      r.category === segment.id && r.isDefault
-    );
+    const route = findRouteOfCategory(routes, segment.id);
     return {
       segment,
       route,
@@ -141,16 +139,13 @@ export async function getRouteLinkTree(market: string, locale: string): Promise<
 }
 
 export function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale: string): IRouteLink | undefined {
-  const route = routes.find(r =>
-    r.category === category.id &&
-    r.isDefault
-  );
+  const route = findRouteOfCategory(routes, category.id);
   if (!route) {
     return undefined;
   }
   const rootCategory = getRootCategory(categories);
   const childCategories = categories.filter(x => {
-    const parentId = x.category ? asCategoryId(x.category) : null;
+    const parentId = asCategoryId(x.category);
     return rootCategory && rootCategory.id === category.id ?
       (x.id !== rootCategory.id && (parentId === category.id || !parentId)) :
       parentId === category.id;

package/src/structured_data/structured_data.ts

@@ -1,4 +1,4 @@
-import { IMedia, IPage, asCategoryId } from '@websolutespa/bom-core';
+import { IMedia, IPage, asEquatableString } from '@websolutespa/bom-core';
 import { getPublicUrl, resolveHref } from '../page/page.service';
 
 export type StructuredDataPerson = {
@@ -84,7 +84,7 @@ const DefaultStructuredDataCollections: StructuredDataCollections = {
 };
 
 export function resolveTemplate(value: any): string | undefined {
-  return asCategoryId(value);
+  return asEquatableString(value);
 }
 
 export function resolveMediaSrc(media: IMedia): string | undefined {
@@ -99,14 +99,15 @@ export function resolveStructuredData(
   let schema: {} | null = null;
   let pageType = page.schema || '';
   if (page.template) {
-    pageType = asCategoryId(page.template);
+    pageType = asEquatableString(page.template);
   }
   if (types.article.includes(pageType)) {
+    const mediaSrc = page.media ? resolveMediaSrc(page.media) : undefined;
     schema = {
       '@context': 'https://schema.org',
       '@type': 'NewsArticle',
       headline: page.title,
-      image: page.media ? [resolveMediaSrc(page.media)] : [],
+      image: mediaSrc ? [mediaSrc] : [],
       datePublished: page.createdAt,
       dateModified: page.updatedAt,
       author: [{