@websolutespa/bom-mixer-store 1.4.3 → 1.4.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @websolutespa/bom-mixer-store
 
+## 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

package/dist/index.d.ts

@@ -41,6 +41,13 @@ declare const SERVICE_DEFAULT_DEPTH = 2;
 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[]>;
 
+declare function decorateSchema_<T extends ISchema = ISchema>(store: IStore, item: T, schema: string): Promise<T | T & {
+    schema: string;
+}>;
+declare function decorateSchemas_<T extends ISchema = ISchema>(store: IStore, items: T[], schema: string): Promise<(T & {
+    schema: string;
+})[]>;
+
 declare function getLocalApiUrl(pathname: string): string;
 declare function localApiFetch<T = unknown>(pathname: string, options?: ApiRequestOptions, serviceOptions?: {
     locale: string;
@@ -210,4 +217,4 @@ declare function findRoute(store: IStore, pathname: string, href: string): Promi
 
 declare function getStore<T extends IStore>(): Promise<T>;
 
-export { ApiRequestOptions, BuildStrategy, COLLECTIONS, IApiHandler, ICrudMethod, IField, IHandler, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, RemoteMenuService, RemotePageService, RemoteService, SERVICE_DEFAULT_DEPTH, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateHref_, decorateHrefs_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateStaticRelation_, decorateStaticRelations_, defaultApiRequestOptions, errorHandler, findRoute, fromCache, getDefaultApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, localizeItem_, localizeItems_, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy };
+export { ApiRequestOptions, BuildStrategy, COLLECTIONS, IApiHandler, ICrudMethod, IField, IHandler, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, RemoteMenuService, RemotePageService, RemoteService, SERVICE_DEFAULT_DEPTH, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateHref_, decorateHrefs_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_, decorateStaticRelation_, decorateStaticRelations_, defaultApiRequestOptions, errorHandler, findRoute, fromCache, getDefaultApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, localizeItem_, localizeItems_, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy };

package/dist/index.js

@@ -60,6 +60,8 @@ __export(src_exports, {
   decorateNavs_: () => decorateNavs_,
   decorateRelation_: () => decorateRelation_,
   decorateRelations_: () => decorateRelations_,
+  decorateSchema_: () => decorateSchema_,
+  decorateSchemas_: () => decorateSchemas_,
   decorateStaticRelation_: () => decorateStaticRelation_,
   decorateStaticRelations_: () => decorateStaticRelations_,
   defaultApiRequestOptions: () => defaultApiRequestOptions,
@@ -509,6 +511,16 @@ function collectRelations_(item, relations = []) {
   return relations;
 }
 
+// src/decorators/schema.ts
+async function decorateSchema_(store, item, schema) {
+  return { ...item, schema: item.schema || schema };
+}
+async function decorateSchemas_(store, items, schema) {
+  return items.map((item) => {
+    return { ...item, schema: item.schema || schema };
+  });
+}
+
 // src/local/local.api.ts
 var import_bom_core5 = require("@websolutespa/bom-core");
 var API_URL = process.env.NEXT_PUBLIC_URL === "https://" ? process.env.NEXT_PUBLIC_MOCK_FALLBACK_URL : process.env.NEXT_PUBLIC_URL;
@@ -1350,10 +1362,14 @@ var RemoteService = class {
     return await this.decorateOne_(item, {});
   }
   async decorateOne_(item, params = {}) {
-    return item;
+    let decoratedItem = item;
+    decoratedItem = await decorateSchema_(this.store, decoratedItem, this.key);
+    return decoratedItem;
   }
   async decorateMany_(items, params = {}) {
-    return items;
+    let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(this.store, decoratedItems, this.key);
+    return decoratedItems;
   }
 };
 
@@ -1362,6 +1378,7 @@ var RemoteMenuService = class extends RemoteService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
+    decoratedItem = await decorateSchema_(store, decoratedItem, this.key);
     decoratedItem = await localizeItem_(item, params);
     if (params.market && params.locale) {
       decoratedItem = await decorateMenu_(store, decoratedItem, {
@@ -1374,6 +1391,7 @@ var RemoteMenuService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
     decoratedItems = await localizeItems_(items, params);
     if (params.market && params.locale) {
       decoratedItems = await decorateMenus_(store, decoratedItems, {
@@ -1390,6 +1408,8 @@ var RemotePageService = class extends RemoteService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
+    decoratedItem = await decorateSchema_(store, decoratedItem, this.key);
+    decoratedItem = await decorateHref_(store, decoratedItem, params);
     decoratedItem = await decorateNav_(store, decoratedItem, params);
     decoratedItem = await decorateRelation_(store, decoratedItem, {
       market: params.market,
@@ -1401,6 +1421,8 @@ var RemotePageService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
+    decoratedItems = await decorateHrefs_(store, decoratedItems, params);
     decoratedItems = await decorateNavs_(store, decoratedItems, params);
     decoratedItems = await decorateRelations_(store, decoratedItems, {
       market: params.market,
@@ -1905,6 +1927,8 @@ async function storeApiDelete(url, options = {}) {
   decorateNavs_,
   decorateRelation_,
   decorateRelations_,
+  decorateSchema_,
+  decorateSchemas_,
   decorateStaticRelation_,
   decorateStaticRelations_,
   defaultApiRequestOptions,

package/dist/index.mjs

@@ -408,6 +408,16 @@ function collectRelations_(item, relations = []) {
   return relations;
 }
 
+// src/decorators/schema.ts
+async function decorateSchema_(store, item, schema) {
+  return { ...item, schema: item.schema || schema };
+}
+async function decorateSchemas_(store, items, schema) {
+  return items.map((item) => {
+    return { ...item, schema: item.schema || schema };
+  });
+}
+
 // src/local/local.api.ts
 import { httpFetch, isBrowser, merge } from "@websolutespa/bom-core";
 var API_URL = process.env.NEXT_PUBLIC_URL === "https://" ? process.env.NEXT_PUBLIC_MOCK_FALLBACK_URL : process.env.NEXT_PUBLIC_URL;
@@ -1249,10 +1259,14 @@ var RemoteService = class {
     return await this.decorateOne_(item, {});
   }
   async decorateOne_(item, params = {}) {
-    return item;
+    let decoratedItem = item;
+    decoratedItem = await decorateSchema_(this.store, decoratedItem, this.key);
+    return decoratedItem;
   }
   async decorateMany_(items, params = {}) {
-    return items;
+    let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(this.store, decoratedItems, this.key);
+    return decoratedItems;
   }
 };
 
@@ -1261,6 +1275,7 @@ var RemoteMenuService = class extends RemoteService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
+    decoratedItem = await decorateSchema_(store, decoratedItem, this.key);
     decoratedItem = await localizeItem_(item, params);
     if (params.market && params.locale) {
       decoratedItem = await decorateMenu_(store, decoratedItem, {
@@ -1273,6 +1288,7 @@ var RemoteMenuService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
     decoratedItems = await localizeItems_(items, params);
     if (params.market && params.locale) {
       decoratedItems = await decorateMenus_(store, decoratedItems, {
@@ -1289,6 +1305,8 @@ var RemotePageService = class extends RemoteService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
+    decoratedItem = await decorateSchema_(store, decoratedItem, this.key);
+    decoratedItem = await decorateHref_(store, decoratedItem, params);
     decoratedItem = await decorateNav_(store, decoratedItem, params);
     decoratedItem = await decorateRelation_(store, decoratedItem, {
       market: params.market,
@@ -1300,6 +1318,8 @@ var RemotePageService = class extends RemoteService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
+    decoratedItems = await decorateSchemas_(store, decoratedItems, this.key);
+    decoratedItems = await decorateHrefs_(store, decoratedItems, params);
     decoratedItems = await decorateNavs_(store, decoratedItems, params);
     decoratedItems = await decorateRelations_(store, decoratedItems, {
       market: params.market,
@@ -1803,6 +1823,8 @@ export {
   decorateNavs_,
   decorateRelation_,
   decorateRelations_,
+  decorateSchema_,
+  decorateSchemas_,
   decorateStaticRelation_,
   decorateStaticRelations_,
   defaultApiRequestOptions,

package/package.json

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

package/src/decorators/index.ts

@@ -3,4 +3,5 @@ export * from './localize';
 export * from './menu';
 export * from './nav';
 export * from './relation';
+export * from './schema';
 

package/src/decorators/schema.ts

@@ -0,0 +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: 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: item.schema || schema };
+  });
+}

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

@@ -8,7 +8,6 @@ export class MockMenuService<T extends IEntity = IEntity> extends MockService<T>
     const store = this.store;
     let decoratedItem = item;
     decoratedItem = await localizeItem_(item, params);
-    // decoratedItem = await decorateHref_<B>(store, decoratedItem, params);
     if (params.market && params.locale) {
       decoratedItem = await decorateMenu_(store, decoratedItem as any as IUndecoratedMenu, {
         market: params.market,
@@ -22,7 +21,6 @@ export class MockMenuService<T extends IEntity = IEntity> extends MockService<T>
     const store = this.store;
     let decoratedItems = items;
     decoratedItems = await localizeItems_(items, params);
-    // decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);
     if (params.market && params.locale) {
       decoratedItems = await decorateMenus_(store, decoratedItems as any as IUndecoratedMenu[], {
         market: params.market,

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

@@ -1,5 +1,5 @@
 import { IEntity, IUndecoratedMenu, QueryParams } from '@websolutespa/bom-core';
-import { decorateMenu_, decorateMenus_, localizeItem_, localizeItems_ } from '../decorators';
+import { decorateMenu_, decorateMenus_, decorateSchema_, decorateSchemas_, localizeItem_, localizeItems_ } from '../decorators';
 import { RemoteService } from './remote.service';
 
 export class RemoteMenuService<T extends IEntity = IEntity> extends RemoteService<T> {
@@ -7,9 +7,10 @@ export class RemoteMenuService<T extends IEntity = IEntity> extends RemoteServic
   protected override async decorateOne_<B extends T = T>(item: B, params: QueryParams = {}): Promise<B> {
     const store = this.store;
     let decoratedItem = item;
+    decoratedItem = await decorateSchema_<B>(store, decoratedItem, this.key);
     decoratedItem = await localizeItem_(item, params);
     if (params.market && params.locale) {
-      decoratedItem = await decorateMenu_(store, decoratedItem as any as IUndecoratedMenu, {
+      decoratedItem = await decorateMenu_(store, decoratedItem as IUndecoratedMenu, {
         market: params.market,
         locale: params.locale,
       }) as any;
@@ -20,9 +21,10 @@ export class RemoteMenuService<T extends IEntity = IEntity> extends RemoteServic
   protected override async decorateMany_<B extends T = T>(items: B[], params: QueryParams = {}): Promise<B[]> {
     const store = this.store;
     let decoratedItems = items;
+    decoratedItems = await decorateSchemas_<B>(store, decoratedItems, this.key);
     decoratedItems = await localizeItems_(items, params);
     if (params.market && params.locale) {
-      decoratedItems = await decorateMenus_(store, decoratedItems as any as IUndecoratedMenu[], {
+      decoratedItems = await decorateMenus_(store, decoratedItems as IUndecoratedMenu[], {
         market: params.market,
         locale: params.locale,
       }) as any[];

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

@@ -1,5 +1,5 @@
 import { IEntity, QueryParams } from '@websolutespa/bom-core';
-import { decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_ } from '../decorators';
+import { decorateHref_, decorateHrefs_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_ } from '../decorators';
 import { RemoteService } from './remote.service';
 
 export class RemotePageService<T extends IEntity = IEntity> extends RemoteService<T> {
@@ -7,7 +7,8 @@ export class RemotePageService<T extends IEntity = IEntity> extends RemoteServic
   protected override async decorateOne_<B extends T = T>(item: B, params: QueryParams = {}): Promise<B> {
     const store = this.store;
     let decoratedItem = item;
-    // decoratedItem = await decorateHref_<B>(store, decoratedItem, params);
+    decoratedItem = await decorateSchema_<B>(store, decoratedItem, this.key);
+    decoratedItem = await decorateHref_<B>(store, decoratedItem, params);
     decoratedItem = await decorateNav_<B>(store, decoratedItem, params);
     decoratedItem = await decorateRelation_<B>(store, decoratedItem, {
       market: params.market,
@@ -20,7 +21,8 @@ export class RemotePageService<T extends IEntity = IEntity> extends RemoteServic
   protected override async decorateMany_<B extends T = T>(items: B[], params: QueryParams = {}): Promise<B[]> {
     const store = this.store;
     let decoratedItems = items;
-    // decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);
+    decoratedItems = await decorateSchemas_<B>(store, decoratedItems, this.key);
+    decoratedItems = await decorateHrefs_<B>(store, decoratedItems, params);
     decoratedItems = await decorateNavs_<B>(store, decoratedItems, params);
     decoratedItems = await decorateRelations_<B>(store, decoratedItems, {
       market: params.market,

package/src/remote/remote.service.ts

@@ -1,4 +1,5 @@
 import { IEntity, IEquatable, IPagedResult, IQuerable, IStore, qsSerialize, QueryParams } from '@websolutespa/bom-core';
+import { decorateSchema_, decorateSchemas_ } from '../decorators';
 import { remoteApiDelete, remoteApiGet, remoteApiPost, remoteApiPut } from './remote.api';
 
 /**
@@ -92,10 +93,14 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
   }
 
   protected async decorateOne_<B extends T = T>(item: B, params: QueryParams = {}): Promise<B> {
-    return item;
+    let decoratedItem = item;
+    decoratedItem = await decorateSchema_<B>(this.store, decoratedItem, this.key);
+    return decoratedItem;
   }
 
   protected async decorateMany_<B extends T = T>(items: B[], params: QueryParams = {}): Promise<B[]> {
-    return items;
+    let decoratedItems = items;
+    decoratedItems = await decorateSchemas_<B>(this.store, decoratedItems, this.key);
+    return decoratedItems;
   }
 }