@websolutespa/bom-mixer-store 1.8.3 → 1.8.4

package/CHANGELOG.md

@@ -1,10 +1,18 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.4
+
+### Patch Changes
+
+- Modified: decorateCategory_
+- Updated dependencies
+  - @websolutespa/bom-core@1.8.11
+
 ## 1.8.3
 
 ### Patch Changes
 
-- Removed: optimizeMany\_
+- Removed: optimizeMany_
 
 ## 1.8.2
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { FetchRequestOptions, ICategorized, IStore, QueryParams, ICategory, ISchema, IUndecoratedMenu, IMenu, IRoute, IEquatable, IEntity, JsonService, IMemoryStore, IQuerable, IPagedResult } from '@websolutespa/bom-core';
+import { FetchRequestOptions, IEquatable, ICategory, IStore, QueryParams, ICategorized, IRoute, ISchema, IUndecoratedMenu, IMenu, IEntity, JsonService, IMemoryStore, IQuerable, IPagedResult } from '@websolutespa/bom-core';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { NextRequest } from 'next/server';
 import * as _websolutespa_bom_mixer_store from '@websolutespa/bom-mixer-store';
@@ -18,12 +18,23 @@ declare function errorHandler(error: any, response: NextApiResponse): NextApiRes
 
 declare function fromCache<T = unknown>(callback: () => Promise<T>, key?: string): Promise<T>;
 
-declare function decorateCategory_<T extends ICategorized = ICategorized>(store: IStore, item: T, params?: QueryParams): Promise<T | (T & {
+declare function decorateCategory_<T extends {
+    category?: IEquatable | ICategory;
+} = {
+    category?: IEquatable | ICategory;
+}>(store: IStore, item: T, params?: QueryParams): Promise<T | (T & {
     category: ICategory;
 })>;
 declare function decorateCategories_<T extends ICategorized = ICategorized>(store: IStore, items: T[], params?: QueryParams): Promise<(T | (T & {
     category: ICategory;
 }))[]>;
+declare function collectCategory_<T extends {
+    category?: IEquatable | ICategory;
+} = {
+    category?: IEquatable | ICategory;
+}>(categories: ICategory[], routes: IRoute[], item: T, params: QueryParams | undefined, depth: number): Promise<T>;
+
+declare const DEFAULT_DEPTH = 3;
 
 declare function decorateHref_<T extends ISchema = ISchema>(store: IStore, item: T, params?: QueryParams): Promise<T | T & {
     href: string | null;
@@ -51,7 +62,6 @@ declare function decorateNavs_<T extends ISchema = ISchema>(store: IStore, items
 declare function optimizeOne_<T extends ICategorized = ICategorized>(item: T): Promise<T>;
 declare function optimizeMany_<T extends ICategorized = ICategorized>(items: T[]): Promise<T[]>;
 
-declare const SERVICE_DEFAULT_DEPTH = 3;
 declare function decorateRelation_<T extends ISchema = ISchema>(store: IStore, item: T, params?: QueryParams): Promise<T>;
 declare function decorateRelations_<T extends ISchema = ISchema>(store: IStore, items: T[], params?: QueryParams): Promise<T[]>;
 type IPageResolvedRelation = {
@@ -242,4 +252,4 @@ declare function getStore<T extends IStore>(): Promise<T>;
 
 declare function varsHandler(): _websolutespa_bom_mixer_store.IHandler<any>;
 
-export { ApiRequestOptions, BuildStrategy, COLLECTIONS, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, REMOTE_API_SESSION, RemoteMenuService, RemotePageService, RemoteService, RemoteServiceStrategy, SERVICE_DEFAULT_DEPTH, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_, decorateStaticRelation_, decorateStaticRelations_, errorHandler, findRoute, fromCache, getLocalApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteApiRequestOptions, getRemoteApiUrl, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, optimizeMany_, optimizeOne_, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy, varsHandler };
+export { ApiRequestOptions, BuildStrategy, COLLECTIONS, DEFAULT_DEPTH, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, REMOTE_API_SESSION, RemoteMenuService, RemotePageService, RemoteService, RemoteServiceStrategy, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectCategory_, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_, decorateStaticRelation_, decorateStaticRelations_, errorHandler, findRoute, fromCache, getLocalApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteApiRequestOptions, getRemoteApiUrl, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, optimizeMany_, optimizeOne_, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy, varsHandler };

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   BuildStrategy: () => BuildStrategy,
   COLLECTIONS: () => COLLECTIONS,
+  DEFAULT_DEPTH: () => DEFAULT_DEPTH,
   KNOWN_COLLECTIONS: () => KNOWN_COLLECTIONS,
   MAX_INT: () => MAX_INT,
   MOCK_COLLECTIONS: () => MOCK_COLLECTIONS,
@@ -44,12 +45,12 @@ __export(src_exports, {
   RemotePageService: () => RemotePageService,
   RemoteService: () => RemoteService,
   RemoteServiceStrategy: () => RemoteServiceStrategy,
-  SERVICE_DEFAULT_DEPTH: () => SERVICE_DEFAULT_DEPTH,
   STATIC_COLLECTIONS: () => STATIC_COLLECTIONS,
   StaticService: () => StaticService,
   StoreStrategy: () => StoreStrategy,
   apiHandler: () => apiHandler,
   buildStrategy: () => buildStrategy,
+  collectCategory_: () => collectCategory_,
   collectionDelete: () => collectionDelete,
   collectionGet: () => collectionGet,
   collectionPatch: () => collectionPatch,
@@ -192,47 +193,60 @@ async function fromCache(callback, key) {
 
 // src/decorators/category.ts
 var import_bom_core = require("@websolutespa/bom-core");
+
+// src/decorators/consts.ts
+var DEFAULT_DEPTH = 3;
+
+// src/decorators/category.ts
 async function decorateCategory_(store, item, params = {}) {
-  if (typeof item.category === "string") {
-    const categories = await store.category.findMany({
-      where: {
-        id: {
-          equals: item.category
-        }
-      }
-    });
-    if (categories.length > 0) {
-      const category = categories[0];
-      const routes = await store.route.findMany();
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return item;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+  return decoratedItem;
+}
+async function decorateCategories_(store, items, params = {}) {
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return items;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItems = [];
+  for (const item of items) {
+    const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+    decoratedItems.push(decoratedItem);
+  }
+  return decoratedItems;
+}
+async function collectCategory_(categories, routes, item, params = {}, depth) {
+  if (depth === 0) {
+    return item;
+  }
+  if ((0, import_bom_core.isUnresolvedCategory)(item.category)) {
+    const category = categories.find((x) => x.id === item.category);
+    if (category) {
       const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
-      return { ...item, category };
+      const decoratedCategory = await collectCategory_(categories, routes, category, params, depth - 1);
+      return { ...item, category: decoratedCategory };
     }
   }
   return item;
 }
-async function decorateCategories_(store, items, params = {}) {
-  const hasUndecoratedCategories = items.find((x) => typeof x.category === "string") !== void 0;
-  if (hasUndecoratedCategories) {
-    const categories = await store.category.findMany();
-    let routes = await store.route.findMany();
-    routes = routes.filter((x) => x.market === params.market && x.locale === params.locale);
-    return items.map((item) => {
-      const category = categories.find((x) => x.id === item.category);
-      if (category) {
-        const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id);
-        if (route) {
-          category.href = route.id;
-        }
-        return { ...item, category };
-      }
-      return item;
-    });
-  }
-  return items;
-}
 
 // src/decorators/href.ts
 async function decorateHref_(store, item, params = {}) {
@@ -591,9 +605,8 @@ async function optimizeMany_(items) {
 
 // src/decorators/relation.ts
 var import_bom_core5 = require("@websolutespa/bom-core");
-var SERVICE_DEFAULT_DEPTH = 3;
 async function decorateRelation_(store, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -729,7 +742,7 @@ var MockService = class extends import_bom_core7.JsonService {
     decoratedItem = await decorateRelation_(store, decoratedItem, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItem;
   }
@@ -740,7 +753,7 @@ var MockService = class extends import_bom_core7.JsonService {
     decoratedItems = await decorateRelations_(store, decoratedItems, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItems;
   }
@@ -779,7 +792,11 @@ var MockPageService = class extends MockService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
-    decoratedItem = await decorateCategory_(store, decoratedItem, params);
+    decoratedItem = await decorateCategory_(store, decoratedItem, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItem = await decorateLocalizable_(decoratedItem, params);
     decoratedItem = await decorateHref_(store, decoratedItem, params);
     decoratedItem = await decorateNav_(store, decoratedItem, params);
@@ -793,7 +810,11 @@ var MockPageService = class extends MockService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await decorateCategories_(store, decoratedItems, params);
+    decoratedItems = await decorateCategories_(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
     decoratedItems = await decorateRelations_(store, decoratedItems, {
@@ -1233,7 +1254,7 @@ var StaticService = class extends import_bom_core9.JsonService {
   }
 };
 async function decorateStaticRelation_(store, fields, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -2378,6 +2399,7 @@ function varsHandler() {
 0 && (module.exports = {
   BuildStrategy,
   COLLECTIONS,
+  DEFAULT_DEPTH,
   KNOWN_COLLECTIONS,
   MAX_INT,
   MOCK_COLLECTIONS,
@@ -2390,12 +2412,12 @@ function varsHandler() {
   RemotePageService,
   RemoteService,
   RemoteServiceStrategy,
-  SERVICE_DEFAULT_DEPTH,
   STATIC_COLLECTIONS,
   StaticService,
   StoreStrategy,
   apiHandler,
   buildStrategy,
+  collectCategory_,
   collectionDelete,
   collectionGet,
   collectionPatch,

package/dist/index.mjs

@@ -76,48 +76,61 @@ async function fromCache(callback, key) {
 }
 
 // src/decorators/category.ts
-import { findRouteOfCategory } from "@websolutespa/bom-core";
+import { findRouteOfCategory, isUnresolvedCategory } from "@websolutespa/bom-core";
+
+// src/decorators/consts.ts
+var DEFAULT_DEPTH = 3;
+
+// src/decorators/category.ts
 async function decorateCategory_(store, item, params = {}) {
-  if (typeof item.category === "string") {
-    const categories = await store.category.findMany({
-      where: {
-        id: {
-          equals: item.category
-        }
-      }
-    });
-    if (categories.length > 0) {
-      const category = categories[0];
-      const routes = await store.route.findMany();
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return item;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+  return decoratedItem;
+}
+async function decorateCategories_(store, items, params = {}) {
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return items;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItems = [];
+  for (const item of items) {
+    const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+    decoratedItems.push(decoratedItem);
+  }
+  return decoratedItems;
+}
+async function collectCategory_(categories, routes, item, params = {}, depth) {
+  if (depth === 0) {
+    return item;
+  }
+  if (isUnresolvedCategory(item.category)) {
+    const category = categories.find((x) => x.id === item.category);
+    if (category) {
       const route = findRouteOfCategory(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
-      return { ...item, category };
+      const decoratedCategory = await collectCategory_(categories, routes, category, params, depth - 1);
+      return { ...item, category: decoratedCategory };
     }
   }
   return item;
 }
-async function decorateCategories_(store, items, params = {}) {
-  const hasUndecoratedCategories = items.find((x) => typeof x.category === "string") !== void 0;
-  if (hasUndecoratedCategories) {
-    const categories = await store.category.findMany();
-    let routes = await store.route.findMany();
-    routes = routes.filter((x) => x.market === params.market && x.locale === params.locale);
-    return items.map((item) => {
-      const category = categories.find((x) => x.id === item.category);
-      if (category) {
-        const route = findRouteOfCategory(routes, category.id);
-        if (route) {
-          category.href = route.id;
-        }
-        return { ...item, category };
-      }
-      return item;
-    });
-  }
-  return items;
-}
 
 // src/decorators/href.ts
 async function decorateHref_(store, item, params = {}) {
@@ -486,9 +499,8 @@ async function optimizeMany_(items) {
 
 // src/decorators/relation.ts
 import { isArray as isArray2, isObject as isObject2, isUnresolvedRelation } from "@websolutespa/bom-core";
-var SERVICE_DEFAULT_DEPTH = 3;
 async function decorateRelation_(store, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -624,7 +636,7 @@ var MockService = class extends JsonService {
     decoratedItem = await decorateRelation_(store, decoratedItem, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItem;
   }
@@ -635,7 +647,7 @@ var MockService = class extends JsonService {
     decoratedItems = await decorateRelations_(store, decoratedItems, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItems;
   }
@@ -674,7 +686,11 @@ var MockPageService = class extends MockService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
-    decoratedItem = await decorateCategory_(store, decoratedItem, params);
+    decoratedItem = await decorateCategory_(store, decoratedItem, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItem = await decorateLocalizable_(decoratedItem, params);
     decoratedItem = await decorateHref_(store, decoratedItem, params);
     decoratedItem = await decorateNav_(store, decoratedItem, params);
@@ -688,7 +704,11 @@ var MockPageService = class extends MockService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await decorateCategories_(store, decoratedItems, params);
+    decoratedItems = await decorateCategories_(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
     decoratedItems = await decorateRelations_(store, decoratedItems, {
@@ -1128,7 +1148,7 @@ var StaticService = class extends JsonService2 {
   }
 };
 async function decorateStaticRelation_(store, fields, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -2272,6 +2292,7 @@ function varsHandler() {
 export {
   BuildStrategy,
   COLLECTIONS,
+  DEFAULT_DEPTH,
   KNOWN_COLLECTIONS,
   MAX_INT,
   MOCK_COLLECTIONS,
@@ -2284,12 +2305,12 @@ export {
   RemotePageService,
   RemoteService,
   RemoteServiceStrategy,
-  SERVICE_DEFAULT_DEPTH,
   STATIC_COLLECTIONS,
   StaticService,
   StoreStrategy,
   apiHandler,
   buildStrategy,
+  collectCategory_,
   collectionDelete,
   collectionGet,
   collectionPatch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-store",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",

package/src/decorators/category.ts

@@ -1,44 +1,62 @@
-import { ICategorized, ICategory, IRoute, IStore, QueryParams, findRouteOfCategory } from '@websolutespa/bom-core';
+import { ICategorized, ICategory, IEquatable, IRoute, IStore, QueryParams, findRouteOfCategory, isUnresolvedCategory } from '@websolutespa/bom-core';
+import { DEFAULT_DEPTH } from './consts';
 
-export async function decorateCategory_<T extends ICategorized = ICategorized>(store: IStore, item: T, params: QueryParams = {}): Promise<T | (T & { category: ICategory })> {
-  if (typeof item.category === 'string') {
-    const categories = await store.category.findMany<ICategory>({
-      where: {
-        id: {
-          equals: item.category,
-        },
-      },
-    });
-    if (categories.length > 0) {
-      const category = categories[0];
-      const routes = await store.route.findMany<IRoute>();
+export async function decorateCategory_<T extends { category?: IEquatable | ICategory } = { category?: IEquatable | ICategory }>(store: IStore, item: T, params: QueryParams = {}): Promise<T | (T & { category: ICategory })> {
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return item;
+  }
+  const categories = await store.category.findMany<ICategory>({
+    market: params.market,
+    locale: params.locale,
+    depth: 0,
+  });
+  const routes = await store.route.findMany<IRoute>();
+  const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+  return decoratedItem as T & { category: ICategory };
+}
+
+export async function decorateCategories_<T extends ICategorized = ICategorized>(store: IStore, items: T[], params: QueryParams = {}): Promise<(T | (T & { category: ICategory }))[]> {
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return items;
+  }
+  const categories = await store.category.findMany<ICategory>({
+    market: params.market,
+    locale: params.locale,
+    depth: 0,
+  });
+  const routes = await store.route.findMany<IRoute>();
+  const decoratedItems = [];
+  for (const item of items) {
+    const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+    decoratedItems.push(decoratedItem);
+  }
+  return decoratedItems;
+}
+
+export async function collectCategory_<
+  T extends { category?: IEquatable | ICategory } = { category?: IEquatable | ICategory }
+>(
+  categories: ICategory[],
+  routes: IRoute[],
+  item: T,
+  params: QueryParams = {},
+  depth: number
+): Promise<T> {
+  if (depth === 0) {
+    return item;
+  }
+  if (isUnresolvedCategory(item.category)) {
+    const category = categories.find(x => x.id === item.category);
+    if (category) {
       const route = findRouteOfCategory(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
-      return { ...item, category };
+      const decoratedCategory = await collectCategory_(categories, routes, category, params, depth - 1);
+      return { ...item, category: decoratedCategory };
     }
   }
   return item;
 }
-
-export async function decorateCategories_<T extends ICategorized = ICategorized>(store: IStore, items: T[], params: QueryParams = {}): Promise<(T | (T & { category: ICategory }))[]> {
-  const hasUndecoratedCategories = items.find(x => typeof x.category === 'string') !== undefined;
-  if (hasUndecoratedCategories) {
-    const categories = await store.category.findMany<ICategory>();
-    let routes = await store.route.findMany<IRoute>();
-    routes = routes.filter(x => x.market === params.market && x.locale === params.locale);
-    return items.map(item => {
-      const category = categories.find(x => x.id === item.category);
-      if (category) {
-        const route = findRouteOfCategory(routes, category.id);
-        if (route) {
-          category.href = route.id;
-        }
-        return { ...item, category };
-      }
-      return item;
-    });
-  }
-  return items;
-}

package/src/decorators/consts.ts

@@ -0,0 +1,2 @@
+
+export const DEFAULT_DEPTH = 3;

package/src/decorators/index.ts

@@ -1,4 +1,5 @@
 export * from './category';
+export * from './consts';
 export * from './href';
 export * from './localizable';
 export * from './menu';
@@ -6,4 +7,3 @@ export * from './nav';
 export * from './optimize';
 export * from './relation';
 export * from './schema';
-

package/src/decorators/relation.ts

@@ -1,9 +1,8 @@
 import { ICategorized, IEquatable, ISchema, IStore, QueryParams, isArray, isObject, isUnresolvedRelation } from '@websolutespa/bom-core';
-
-export const SERVICE_DEFAULT_DEPTH = 3;
+import { DEFAULT_DEPTH } from './consts';
 
 export async function decorateRelation_<T extends ISchema = ISchema>(store: IStore, item: T, params: QueryParams = {}): Promise<T> {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }

package/src/mock/mock-page.service.ts

@@ -7,7 +7,11 @@ export class MockPageService<T extends ICategorized = ICategorized> extends Mock
   protected override async decorateOne_<B extends T = T>(item: B, params: QueryParams = {}): Promise<B> {
     const store = this.store;
     let decoratedItem = item;
-    decoratedItem = await decorateCategory_<B>(store, decoratedItem, params);
+    decoratedItem = await decorateCategory_<B>(store, decoratedItem, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth,
+    });
     decoratedItem = await decorateLocalizable_<B>(decoratedItem, params);
     decoratedItem = await decorateHref_<B>(store, decoratedItem, params);
     decoratedItem = await decorateNav_<B>(store, decoratedItem, params);
@@ -23,7 +27,11 @@ export class MockPageService<T extends ICategorized = ICategorized> extends Mock
     const store = this.store;
     let decoratedItems = items;
     // decoratedItems = await optimizeMany_(decoratedItems);
-    decoratedItems = await decorateCategories_<B>(store, decoratedItems, params);
+    decoratedItems = await decorateCategories_<B>(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth,
+    });
     decoratedItems = await decorateLocalizables_<B>(decoratedItems, params);
     decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);
     decoratedItems = await decorateRelations_<B>(store, decoratedItems, {

package/src/mock/mock.service.ts

@@ -1,5 +1,5 @@
 import { IEntity, IStore, JsonService, QueryParams } from '@websolutespa/bom-core';
-import { SERVICE_DEFAULT_DEPTH, decorateLocalizable_, decorateLocalizables_, decorateRelation_, decorateRelations_ } from '../decorators';
+import { DEFAULT_DEPTH, decorateLocalizable_, decorateLocalizables_, decorateRelation_, decorateRelations_ } from '../decorators';
 
 export class MockService<T extends IEntity = IEntity> extends JsonService<T> {
   store: IStore;
@@ -16,7 +16,7 @@ export class MockService<T extends IEntity = IEntity> extends JsonService<T> {
     decoratedItem = await decorateRelation_<B>(store, decoratedItem, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH,
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH,
     });
     return decoratedItem;
   }
@@ -28,7 +28,7 @@ export class MockService<T extends IEntity = IEntity> extends JsonService<T> {
     decoratedItems = await decorateRelations_<B>(store, decoratedItems, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH,
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH,
     });
     return decoratedItems;
   }

package/src/static/static.service.ts

@@ -1,5 +1,5 @@
 import { IEntity, IEquatable, IStore, JsonService, QueryParams, httpGet } from '@websolutespa/bom-core';
-import { SERVICE_DEFAULT_DEPTH, decorateLocalizable_, decorateLocalizables_ } from '../decorators';
+import { DEFAULT_DEPTH, decorateLocalizable_, decorateLocalizables_ } from '../decorators';
 import { IField, MapTo, StaticServiceConfig } from './static';
 
 export class StaticService<T extends IEntity = IEntity> extends JsonService<T> {
@@ -80,7 +80,7 @@ export class StaticService<T extends IEntity = IEntity> extends JsonService<T> {
 }
 
 export async function decorateStaticRelation_<T>(store: IStore, fields: IField[], item: T, params: QueryParams = {}): Promise<T> {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }