@websolutespa/bom-mixer-store 1.8.8 → 1.8.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.10
+
+### Patch Changes
+
+- f0d17f3: Modified: page market filtering
+- Updated dependencies [f0d17f3]
+  - @websolutespa/bom-core@1.8.19
+
+## 1.8.9
+
+### Patch Changes
+
+- Modified: BuildStrategy.Runtime
+
 ## 1.8.8
 
 ### Patch Changes

package/dist/index.js

@@ -362,7 +362,7 @@ function itemsFilteredByMarket_(items, market) {
   });
 }
 function itemHasMarket_(item, market) {
-  return Array.isArray(item.markets) ? item.markets.includes(market) : true;
+  return Array.isArray(item.markets) && item.markets.length > 0 ? item.markets.includes(market) : true;
 }
 function collectUndecoratedCategories(items, undecoratedCategories = []) {
   items.forEach((item) => {
@@ -818,6 +818,12 @@ var MockPageService = class extends MockService {
       locale: params.locale,
       depth: params.depth
     });
+    const invalidKeys = ["components"];
+    decoratedItems = decoratedItems.map((x) => Object.fromEntries(
+      Object.entries(x).filter(
+        ([k, v]) => !invalidKeys.includes(k)
+      )
+    ));
     return decoratedItems;
   }
 };
@@ -1746,7 +1752,7 @@ async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
     let store = {};
-    const url = "/store";
+    const url = `/store?strategy=${buildStrategy}`;
     const json = await remoteApiGet(url);
     if (json != null) {
       const data = Object.fromEntries(
@@ -1757,24 +1763,9 @@ async function getRemoteStoreStaticBuild_() {
     return store;
   }, "STORE_BUILD_");
 }
-async function getRemoteStoreRuntimeBuild_() {
-  return fromCache(async () => {
-    console.log("getRemoteStoreRuntimeBuild_");
-    const data = {};
-    COLLECTIONS.forEach((key) => {
-      data[key] = [];
-    });
-    const store = getMockStoreFromData_(data);
-    return store;
-  }, "STORE_RUNTIME_BUILD_");
-}
 async function getRemoteStore() {
   if (nextPhase === "phase-production-build" /* ProductionBuild */) {
-    if (buildStrategy === "runtime" /* Runtime */) {
-      return await getRemoteStoreRuntimeBuild_();
-    } else {
-      return await getRemoteStoreStaticBuild_();
-    }
+    return await getRemoteStoreStaticBuild_();
   } else {
     return await getRemoteStore_();
   }

package/dist/index.mjs

@@ -257,7 +257,7 @@ function itemsFilteredByMarket_(items, market) {
   });
 }
 function itemHasMarket_(item, market) {
-  return Array.isArray(item.markets) ? item.markets.includes(market) : true;
+  return Array.isArray(item.markets) && item.markets.length > 0 ? item.markets.includes(market) : true;
 }
 function collectUndecoratedCategories(items, undecoratedCategories = []) {
   items.forEach((item) => {
@@ -713,6 +713,12 @@ var MockPageService = class extends MockService {
       locale: params.locale,
       depth: params.depth
     });
+    const invalidKeys = ["components"];
+    decoratedItems = decoratedItems.map((x) => Object.fromEntries(
+      Object.entries(x).filter(
+        ([k, v]) => !invalidKeys.includes(k)
+      )
+    ));
     return decoratedItems;
   }
 };
@@ -1641,7 +1647,7 @@ async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
     let store = {};
-    const url = "/store";
+    const url = `/store?strategy=${buildStrategy}`;
     const json = await remoteApiGet(url);
     if (json != null) {
       const data = Object.fromEntries(
@@ -1652,24 +1658,9 @@ async function getRemoteStoreStaticBuild_() {
     return store;
   }, "STORE_BUILD_");
 }
-async function getRemoteStoreRuntimeBuild_() {
-  return fromCache(async () => {
-    console.log("getRemoteStoreRuntimeBuild_");
-    const data = {};
-    COLLECTIONS.forEach((key) => {
-      data[key] = [];
-    });
-    const store = getMockStoreFromData_(data);
-    return store;
-  }, "STORE_RUNTIME_BUILD_");
-}
 async function getRemoteStore() {
   if (nextPhase === "phase-production-build" /* ProductionBuild */) {
-    if (buildStrategy === "runtime" /* Runtime */) {
-      return await getRemoteStoreRuntimeBuild_();
-    } else {
-      return await getRemoteStoreStaticBuild_();
-    }
+    return await getRemoteStoreStaticBuild_();
   } else {
     return await getRemoteStore_();
   }

package/package.json

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

package/src/decorators/menu.ts

@@ -64,7 +64,7 @@ function itemsFilteredByMarket_(items: IUndecoratedMenuItem[], market: string):
 }
 
 function itemHasMarket_(item: IUndecoratedMenuItem, market: string): boolean {
-  return Array.isArray(item.markets) ? item.markets.includes(market) : true;
+  return (Array.isArray(item.markets) && item.markets.length > 0) ? item.markets.includes(market) : true;
 }
 
 function collectUndecoratedCategories(items: IUndecoratedMenuItem[], undecoratedCategories: IUndecoratedMenuCategory[] = []): IUndecoratedMenuCategory[] {

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

@@ -39,8 +39,14 @@ export class MockPageService<T extends ICategorized = ICategorized> extends Mock
       locale: params.locale,
       depth: params.depth,
     });
+    // !!! optimization for index listing removing components
+    const invalidKeys = ['components'];
+    decoratedItems = decoratedItems.map(x => Object.fromEntries(
+      Object.entries(x).filter(
+        ([k, v]) => !invalidKeys.includes(k)
+      )
+    )) as B[];
     /*
-    // !!! optimization for index listing
     decoratedItems = await decorateNavs_<B>(store, decoratedItems, params);
     */
     return decoratedItems;

package/src/remote/remote.store.ts

@@ -2,7 +2,7 @@ import { IMemoryStore, IQuerable, IStore } from '@websolutespa/bom-core';
 import { fromCache } from '../cache/cache.service';
 import { CachedService } from '../cached/cached.service';
 import { getMockStore, getMockStoreFromData_ } from '../mock/mock.store';
-import { BuildStrategy, COLLECTIONS, KNOWN_COLLECTIONS, MOCK_COLLECTIONS, NextPhase, StoreStrategy, buildStrategy, nextPhase, storeStrategy } from '../store/store';
+import { COLLECTIONS, KNOWN_COLLECTIONS, MOCK_COLLECTIONS, NextPhase, StoreStrategy, buildStrategy, nextPhase, storeStrategy } from '../store/store';
 import { RemoteMenuService } from './remote-menu.service';
 import { RemotePageService } from './remote-page.service';
 import { remoteApiGet } from './remote.api';
@@ -49,7 +49,7 @@ async function getRemoteStoreStaticBuild_<T extends IStore>(): Promise<T> {
   return fromCache<T>(async () => {
     console.log('getRemoteStoreStaticBuild_');
     let store: IStore = {};
-    const url = '/store';
+    const url = `/store?strategy=${buildStrategy}`;
     const json = await remoteApiGet<IMemoryStore>(url);
     if (json != null) {
       const data = Object.fromEntries(
@@ -75,11 +75,14 @@ async function getRemoteStoreRuntimeBuild_<T extends IStore>(): Promise<T> {
 
 export async function getRemoteStore<T extends IStore>(): Promise<T> {
   if (nextPhase === NextPhase.ProductionBuild) {
+    /*
     if (buildStrategy === BuildStrategy.Runtime) {
       return await getRemoteStoreRuntimeBuild_();
     } else {
       return await getRemoteStoreStaticBuild_();
     }
+    */
+    return await getRemoteStoreStaticBuild_();
   } else {
     return await getRemoteStore_();
   }