@websolutespa/bom-mixer-store 1.4.4 → 1.4.6

package/CHANGELOG.md

@@ -1,130 +1,142 @@
-# @websolutespa/bom-mixer-store
-
-## 1.4.4
-
-### Patch Changes
-
-- Added: Schema decorator
-- Modified: RemoteMenuService, RemotePageService, RemoteService
-- Updated dependencies
-  - @websolutespa/bom-core@0.6.5
-
-## 1.4.3
-
-### Patch Changes
-
-- Modified: CachedService, Decorators, LocalApi, MockApi, MockStore, RemoteApi, RemoteStore, StoreHandler
-
-## 1.4.2
-
-### Patch Changes
-
-- Added: Decorators, CachedService, RemotePageService, RemoteMenuService, StoreStrategy.DecoratedApi, nextPhase, storeCacheDuration
-- Modified: RemoteStore
-- Updated dependencies
-  - @websolutespa/bom-core@0.6.4
-
-## 1.4.1
-
-### Patch Changes
-
-- Modified: MockPageService
-- Updated dependencies
-  - @websolutespa/bom-core@0.6.3
-
-## 1.4.0
-
-### Minor Changes
-
-- Added: BuildStrategy
-
-## 1.3.0
-
-### Minor Changes
-
-- Added: storeIndexHandler
-- Modified: Store, StoreHandler, RemoteService, MockService, MockPageService, MockMenuService, StaticService
-
-## 1.2.2
-
-### Patch Changes
-
-- Modified: MockMenuService IPageRelationResult
-
-## 1.2.1
-
-### Patch Changes
-
-- Fixing: MockMenuService collectPages
-
-## 1.2.0
-
-### Minor Changes
-
-- Updating: next 13
-
-## 1.1.1
-
-### Patch Changes
-
-- Fixing: check redirects by pattern
-
-## 1.1.0
-
-### Minor Changes
-
-- Modified: store refactor
-
-## 1.0.1
-
-### Patch Changes
-
-- Fixing: localhost url
-
-## 1.0.0
-
-### Minor Changes
-
-- Modified routes, added redirects
-
-## 0.3.2
-
-### Patch Changes
-
-- Modified: MockMenuService
-
-## 0.3.1
-
-### Patch Changes
-
-- Added: source files
-
-## 0.3.0
-
-### Minor Changes
-
-- Added: splat routes
-
-## 0.2.0
-
-### Minor Changes
-
-- Added: @websolutespa/bom-core
-
-## 0.1.1
-
-### Patch Changes
-
-- Modified: store service
-
-## 0.1.0
-
-### Minor Changes
-
-- mock refactor
-
-## 0.0.2
-
-### Patch Changes
-
-- Added: first release
+# @websolutespa/bom-mixer-store
+
+## 1.4.6
+
+### Patch Changes
+
+- Fixing: CachedService findMany DecoratedApi
+
+## 1.4.5
+
+### Patch Changes
+
+- Fixing: decorateSchema
+
+## 1.4.4
+
+### Patch Changes
+
+- Added: Schema decorator
+- Modified: RemoteMenuService, RemotePageService, RemoteService
+- Updated dependencies
+  - @websolutespa/bom-core@0.6.5
+
+## 1.4.3
+
+### Patch Changes
+
+- Modified: CachedService, Decorators, LocalApi, MockApi, MockStore, RemoteApi, RemoteStore, StoreHandler
+
+## 1.4.2
+
+### Patch Changes
+
+- Added: Decorators, CachedService, RemotePageService, RemoteMenuService, StoreStrategy.DecoratedApi, nextPhase, storeCacheDuration
+- Modified: RemoteStore
+- Updated dependencies
+  - @websolutespa/bom-core@0.6.4
+
+## 1.4.1
+
+### Patch Changes
+
+- Modified: MockPageService
+- Updated dependencies
+  - @websolutespa/bom-core@0.6.3
+
+## 1.4.0
+
+### Minor Changes
+
+- Added: BuildStrategy
+
+## 1.3.0
+
+### Minor Changes
+
+- Added: storeIndexHandler
+- Modified: Store, StoreHandler, RemoteService, MockService, MockPageService, MockMenuService, StaticService
+
+## 1.2.2
+
+### Patch Changes
+
+- Modified: MockMenuService IPageRelationResult
+
+## 1.2.1
+
+### Patch Changes
+
+- Fixing: MockMenuService collectPages
+
+## 1.2.0
+
+### Minor Changes
+
+- Updating: next 13
+
+## 1.1.1
+
+### Patch Changes
+
+- Fixing: check redirects by pattern
+
+## 1.1.0
+
+### Minor Changes
+
+- Modified: store refactor
+
+## 1.0.1
+
+### Patch Changes
+
+- Fixing: localhost url
+
+## 1.0.0
+
+### Minor Changes
+
+- Modified routes, added redirects
+
+## 0.3.2
+
+### Patch Changes
+
+- Modified: MockMenuService
+
+## 0.3.1
+
+### Patch Changes
+
+- Added: source files
+
+## 0.3.0
+
+### Minor Changes
+
+- Added: splat routes
+
+## 0.2.0
+
+### Minor Changes
+
+- Added: @websolutespa/bom-core
+
+## 0.1.1
+
+### Patch Changes
+
+- Modified: store service
+
+## 0.1.0
+
+### Minor Changes
+
+- mock refactor
+
+## 0.0.2
+
+### Patch Changes
+
+- Added: first release

package/dist/index.js

@@ -513,11 +513,11 @@ function collectRelations_(item, relations = []) {
 
 // src/decorators/schema.ts
 async function decorateSchema_(store, item, schema) {
-  return { ...item, schema };
+  return { ...item, schema: item.schema || schema };
 }
 async function decorateSchemas_(store, items, schema) {
   return items.map((item) => {
-    return { ...item, schema };
+    return { ...item, schema: item.schema || schema };
   });
 }
 
@@ -1219,16 +1219,16 @@ var CachedService = class extends import_bom_core10.JsonService {
       const { market, locale, ...otherParams } = params;
       const serializedParams = (0, import_bom_core10.qsSerialize)({ market, locale });
       const key = `findMany?${serializedParams}`;
-      return await this.fromCache_(async () => {
-        let items = await this.service_.findMany({ market, locale });
-        if (otherParams.where) {
-          items = this.whereItems_(items, otherParams.where);
-        }
-        if (otherParams.sort) {
-          items = this.sortCollection_(items, otherParams.sort);
-        }
-        return items;
+      let items = await this.fromCache_(async () => {
+        return await this.service_.findMany({ market, locale });
       }, key);
+      if (otherParams.where) {
+        items = this.whereItems_(items, otherParams.where);
+      }
+      if (otherParams.sort) {
+        items = this.sortCollection_(items, otherParams.sort);
+      }
+      return items;
     } else {
       const serializedParams = (0, import_bom_core10.qsSerialize)(params);
       const key = `findMany?${serializedParams}`;

package/dist/index.mjs

@@ -410,11 +410,11 @@ function collectRelations_(item, relations = []) {
 
 // src/decorators/schema.ts
 async function decorateSchema_(store, item, schema) {
-  return { ...item, schema };
+  return { ...item, schema: item.schema || schema };
 }
 async function decorateSchemas_(store, items, schema) {
   return items.map((item) => {
-    return { ...item, schema };
+    return { ...item, schema: item.schema || schema };
   });
 }
 
@@ -1116,16 +1116,16 @@ var CachedService = class extends JsonService3 {
       const { market, locale, ...otherParams } = params;
       const serializedParams = qsSerialize({ market, locale });
       const key = `findMany?${serializedParams}`;
-      return await this.fromCache_(async () => {
-        let items = await this.service_.findMany({ market, locale });
-        if (otherParams.where) {
-          items = this.whereItems_(items, otherParams.where);
-        }
-        if (otherParams.sort) {
-          items = this.sortCollection_(items, otherParams.sort);
-        }
-        return items;
+      let items = await this.fromCache_(async () => {
+        return await this.service_.findMany({ market, locale });
       }, key);
+      if (otherParams.where) {
+        items = this.whereItems_(items, otherParams.where);
+      }
+      if (otherParams.sort) {
+        items = this.sortCollection_(items, otherParams.sort);
+      }
+      return items;
     } else {
       const serializedParams = qsSerialize(params);
       const key = `findMany?${serializedParams}`;

package/package.json

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

package/src/cached/cached.service.ts

@@ -73,16 +73,16 @@ export class CachedService<T extends IEntity = IEntity> extends JsonService<T> {
       const { market, locale, ...otherParams } = params;
       const serializedParams = qsSerialize({ market, locale });
       const key = `findMany?${serializedParams}`;
-      return await this.fromCache_(async () => {
-        let items = await this.service_.findMany({ market, locale });
-        if (otherParams.where) {
-          items = this.whereItems_(items, otherParams.where);
-        }
-        if (otherParams.sort) {
-          items = this.sortCollection_(items, otherParams.sort);
-        }
-        return items;
+      let items = await this.fromCache_(async () => {
+        return await this.service_.findMany({ market, locale });
       }, key) as B[];
+      if (otherParams.where) {
+        items = this.whereItems_(items, otherParams.where);
+      }
+      if (otherParams.sort) {
+        items = this.sortCollection_(items, otherParams.sort);
+      }
+      return items;
     } else {
       const serializedParams = qsSerialize(params);
       const key = `findMany?${serializedParams}`;

package/src/decorators/schema.ts

@@ -1,11 +1,11 @@
 import { ISchema, IStore } from '@websolutespa/bom-core';
 
 export async function decorateSchema_<T extends ISchema = ISchema>(store: IStore, item: T, schema: string): Promise<T | T & { schema: string }> {
-  return { ...item, schema };
+  return { ...item, schema: item.schema || schema };
 }
 
 export async function decorateSchemas_<T extends ISchema = ISchema>(store: IStore, items: T[], schema: string): Promise<(T & { schema: string })[]> {
   return items.map(item => {
-    return { ...item, schema };
+    return { ...item, schema: item.schema || schema };
   });
 }