@websolutespa/bom-mixer-store 1.8.1 → 1.8.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.3
+
+### Patch Changes
+
+- Removed: optimizeMany\_
+
+## 1.8.2
+
+### Patch Changes
+
+- Modified: getRemoteStoreStaticBuild\_
+
 ## 1.8.1
 
 ### Patch Changes

package/dist/index.js

@@ -793,7 +793,6 @@ var MockPageService = class extends MockService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_(decoratedItems);
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
@@ -1603,7 +1602,6 @@ var RemotePageService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_(decoratedItems);
     decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
@@ -1648,17 +1646,14 @@ async function getRemoteStore_() {
 async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
-    const store = {};
+    let store = {};
     const url = "/store";
     const json = await remoteApiGet(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach((key) => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map((key) => [key, json[key] || []])
+      );
+      store = getMockStoreFromData_(data);
     }
     return store;
   }, "STORE_BUILD_");
@@ -2186,7 +2181,7 @@ function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
   const media = category.media || route?.media;
-  const schema = route?.schema || category?.schema || "unknown";
+  const schema = route?.template || route?.schema || category?.schema || "unknown";
   const title = (0, import_bom_core15.localize)(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
@@ -2215,7 +2210,7 @@ async function getLayout(market, locale) {
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
+    if (routeLink.href && (!object[routeLink.schema] || routeLink.schema === routeLink.category)) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;

package/dist/index.mjs

@@ -688,7 +688,6 @@ var MockPageService = class extends MockService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_(decoratedItems);
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
@@ -1498,7 +1497,6 @@ var RemotePageService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_(decoratedItems);
     decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
     decoratedItems = await decorateCategories_(store, decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
@@ -1543,17 +1541,14 @@ async function getRemoteStore_() {
 async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
-    const store = {};
+    let store = {};
     const url = "/store";
     const json = await remoteApiGet(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach((key) => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map((key) => [key, json[key] || []])
+      );
+      store = getMockStoreFromData_(data);
     }
     return store;
   }, "STORE_BUILD_");
@@ -2081,7 +2076,7 @@ function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
   const media = category.media || route?.media;
-  const schema = route?.schema || category?.schema || "unknown";
+  const schema = route?.template || route?.schema || category?.schema || "unknown";
   const title = localize(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
@@ -2110,7 +2105,7 @@ async function getLayout(market, locale) {
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
+    if (routeLink.href && (!object[routeLink.schema] || routeLink.schema === routeLink.category)) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { ICategorized, QueryParams } from '@websolutespa/bom-core';
-import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateNav_, decorateRelation_, decorateRelations_, optimizeMany_ } from '../decorators';
+import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateNav_, decorateRelation_, decorateRelations_ } from '../decorators';
 import { MockService } from './mock.service';
 
 export class MockPageService<T extends ICategorized = ICategorized> extends MockService<T> {
@@ -22,7 +22,7 @@ export class MockPageService<T extends ICategorized = ICategorized> extends Mock
   protected override async decorateMany_<B extends T = T>(items: B[], params: QueryParams = {}): Promise<B[]> {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_(decoratedItems);
+    // decoratedItems = await optimizeMany_(decoratedItems);
     decoratedItems = await decorateCategories_<B>(store, decoratedItems, params);
     decoratedItems = await decorateLocalizables_<B>(decoratedItems, params);
     decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);

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

@@ -1,5 +1,5 @@
 import { ICategorized, QueryParams } from '@websolutespa/bom-core';
-import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateNav_, decorateRelation_, decorateSchema_, decorateSchemas_, optimizeMany_ } from '../decorators';
+import { decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateNav_, decorateRelation_, decorateSchema_, decorateSchemas_ } from '../decorators';
 import { RemoteService } from './remote.service';
 
 export class RemotePageService<T extends ICategorized = ICategorized> extends RemoteService<T> {
@@ -22,7 +22,7 @@ export class RemotePageService<T extends ICategorized = ICategorized> extends Re
   protected override async decorateMany_<B extends T = T>(items: B[], params: QueryParams = {}): Promise<B[]> {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await optimizeMany_<B>(decoratedItems);
+    // decoratedItems = await optimizeMany_<B>(decoratedItems);
     decoratedItems = await decorateSchemas_<B>(store, decoratedItems, this.key);
     decoratedItems = await decorateCategories_<B>(store, decoratedItems, params);
     decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);

package/src/remote/remote.store.ts

@@ -1,7 +1,6 @@
 import { IMemoryStore, IQuerable, IStore } from '@websolutespa/bom-core';
 import { fromCache } from '../cache/cache.service';
 import { CachedService } from '../cached/cached.service';
-import { MockService } from '../mock/mock.service';
 import { getMockStore, getMockStoreFromData_ } from '../mock/mock.store';
 import { BuildStrategy, COLLECTIONS, KNOWN_COLLECTIONS, MOCK_COLLECTIONS, NextPhase, StoreStrategy, buildStrategy, nextPhase, storeStrategy } from '../store/store';
 import { RemoteMenuService } from './remote-menu.service';
@@ -49,17 +48,14 @@ async function getRemoteStore_<T extends IStore>(): Promise<T> {
 async function getRemoteStoreStaticBuild_<T extends IStore>(): Promise<T> {
   return fromCache<T>(async () => {
     console.log('getRemoteStoreStaticBuild_');
-    const store: IStore = {};
+    let store: IStore = {};
     const url = '/store';
     const json = await remoteApiGet<IMemoryStore>(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach(key => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map(key => ([key, json[key] || []]))
+      );
+      store = getMockStoreFromData_(data);
     }
     return store as T;
   }, 'STORE_BUILD_');