@websolutespa/bom-mixer-store 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,115 +1,121 @@
-# @websolutespa/bom-mixer-store
-
-## 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.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.d.ts

@@ -206,7 +206,8 @@ declare function collectionPatch<T extends IStore>(storePromise: () => Promise<T
 declare function collectionDelete<T extends IStore>(storePromise: () => Promise<T>): (request: NextApiRequest, response: NextApiResponse) => Promise<void>;
 declare function routePost(store: IStore, request: NextApiRequest, response: NextApiResponse): Promise<void>;
 declare function storeIndexHandler(): any;
+declare function findRoute(store: IStore, pathname: string, href: string): Promise<IRoute | undefined>;
 
 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, 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_, 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

@@ -64,6 +64,7 @@ __export(src_exports, {
   decorateStaticRelations_: () => decorateStaticRelations_,
   defaultApiRequestOptions: () => defaultApiRequestOptions,
   errorHandler: () => errorHandler,
+  findRoute: () => findRoute,
   fromCache: () => fromCache,
   getDefaultApiRequestOptions: () => getDefaultApiRequestOptions,
   getLocalApiUrl: () => getLocalApiUrl,
@@ -203,10 +204,6 @@ async function decorateHrefs_(store, items, params = {}) {
         locale: {
           equals: params.locale
         }
-        /*
-        ...(params.market ? { market: { equals: params.market } } : {}),
-        ...(params.locale ? { locale: { equals: params.locale } } : {}),
-        */
       }
     });
     return items.map((item) => {
@@ -252,7 +249,6 @@ async function decorateMenu_(store, item, params) {
   const undecoratedPages = collectUndecoratedPages(items);
   if (undecoratedCategories.length > 0 || undecoratedPages.length > 0) {
     const routes = await store.route.findMany({
-      ...params,
       where: {
         ...market ? { market: { equals: market } } : {},
         ...locale ? { locale: { equals: locale } } : {}
@@ -419,7 +415,6 @@ async function decorateNav_(store, item, params = {}, routes) {
 }
 async function decorateNavs_(store, items, params = {}) {
   const routes = await store.route.findMany({
-    ...params,
     where: {
       ...params.market ? { market: { equals: params.market } } : {},
       ...params.locale ? { locale: { equals: params.locale } } : {}
@@ -521,7 +516,6 @@ var API_BASE = process.env.NEXT_PUBLIC_API || "/api";
 function getLocalApiUrl(pathname) {
   let url = `${import_bom_core5.isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
   url = import_bom_core5.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getLocalApiUrl", url);
   return url;
 }
 async function localApiFetch(pathname, options = {}, serviceOptions) {
@@ -531,6 +525,7 @@ async function localApiFetch(pathname, options = {}, serviceOptions) {
     url.searchParams.append("market", serviceOptions.market);
   }
   const apiOptions = (0, import_bom_core5.merge)({ ...getDefaultApiRequestOptions() }, options);
+  console.log("localApiFetch", apiOptions.method, url.href);
   const apiResponse = await (0, import_bom_core5.httpFetch)(url.href, apiOptions);
   return apiResponse;
 }
@@ -665,12 +660,12 @@ var API_BASE3 = process.env.NEXT_PUBLIC_API || "/api";
 function getMockApiUrl(pathname) {
   let url = `${API_URL2}${API_BASE3}/_mock${pathname}`;
   url = import_bom_core7.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getMockApiUrl", url);
   return url;
 }
 async function mockApiFetch(pathname, options = {}) {
   const url = getMockApiUrl(pathname);
   const apiOptions = (0, import_bom_core7.merge)({ ...getDefaultApiRequestOptions() }, options);
+  console.log("mockApiFetch", apiOptions.method, url);
   const apiResponse = await (0, import_bom_core7.httpFetch)(url, apiOptions);
   return apiResponse;
 }
@@ -691,7 +686,7 @@ async function mockApiDelete(url, options = {}) {
 }
 
 // src/store/store.handler.ts
-var import_bom_core14 = require("@websolutespa/bom-core");
+var import_bom_core13 = require("@websolutespa/bom-core");
 
 // src/static/static.ts
 var staticCollections = [{
@@ -1128,7 +1123,7 @@ function getMockStoreFromData_(data) {
       }
     }
   } else {
-    console.log("mock store not found");
+    console.warn("mock store not found");
   }
   staticCollections.forEach((config) => {
     store[config.slug] = new StaticService(config, store);
@@ -1160,13 +1155,11 @@ async function getMockStore() {
   }, import_bom_core9.isDevelopment ? void 0 : "STORE_MOCK_");
 }
 
-// src/remote/remote.store.ts
-var import_bom_core13 = require("@websolutespa/bom-core");
-
 // src/cached/cached.service.ts
 var import_bom_core10 = require("@websolutespa/bom-core");
-var CachedService = class {
+var CachedService = class extends import_bom_core10.JsonService {
   constructor(service, options = {}) {
+    super([]);
     this.cache_ = /* @__PURE__ */ new Map();
     this.duration_ = storeCacheDuration;
     if (!service) {
@@ -1210,11 +1203,27 @@ var CachedService = class {
     }, key);
   }
   async findMany(params = {}) {
-    const serializedParams = (0, import_bom_core10.qsSerialize)(params);
-    const key = `findMany?${serializedParams}`;
-    return await this.fromCache_(async () => {
-      return await this.service_.findMany(params);
-    }, key);
+    if (storeStrategy === "decoratedApi" /* DecoratedApi */) {
+      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;
+      }, key);
+    } else {
+      const serializedParams = (0, import_bom_core10.qsSerialize)(params);
+      const key = `findMany?${serializedParams}`;
+      return await this.fromCache_(async () => {
+        return await this.service_.findMany(params);
+      }, key);
+    }
   }
   async findPaged(params = {}) {
     const serializedParams = (0, import_bom_core10.qsSerialize)(params);
@@ -1244,12 +1253,12 @@ var API_BASE4 = process.env.STORE_API || "/api";
 function getRemoteApiUrl(pathname) {
   let url = `${API_URL3}${API_BASE4}${pathname}`;
   url = import_bom_core11.isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getRemoteApiUrl", url);
   return url;
 }
 async function remoteApiFetch(pathname, options = {}) {
   const url = getRemoteApiUrl(pathname);
   const apiOptions = (0, import_bom_core11.merge)({ ...getDefaultApiRequestOptions() }, options);
+  console.log("remoteApiFetch", apiOptions.method, url);
   const apiResponse = await (0, import_bom_core11.httpFetch)(url, apiOptions);
   return apiResponse;
 }
@@ -1406,7 +1415,6 @@ var RemotePageService = class extends RemoteService {
 var PAGES2 = process.env.PAGES ? process.env.PAGES.split(",") : [];
 async function getRemoteStore_() {
   return fromCache(async () => {
-    console.log("getRemoteStore_");
     if (COLLECTIONS.length === 0) {
       console.error("RemoteStore.getRemoteStore_ no collections");
       throw "RemoteStore.getRemoteStore_ no collections";
@@ -1426,7 +1434,7 @@ async function getRemoteStore_() {
         store[key] = new CachedService(
           new RemoteMenuService(key, store)
         );
-      } else if (KNOWN_COLLECTIONS.includes(key) && !import_bom_core13.isDevelopment) {
+      } else if (KNOWN_COLLECTIONS.includes(key)) {
         store[key] = new CachedService(
           new RemoteService(key, store)
         );
@@ -1508,7 +1516,7 @@ function collectionGet(storePromise) {
       const collection = collections[0];
       const id = collections[1];
       const qs = Object.entries(query).map((kv) => kv.join("=")).join("&");
-      const params = (0, import_bom_core14.qsDeserialize)(qs);
+      const params = (0, import_bom_core13.qsDeserialize)(qs);
       if (!COLLECTIONS.includes(collection)) {
         console.error("storeHandler.collectionGet", "method not allowed", collection);
         return response.status(405).send("method not allowed");
@@ -1520,7 +1528,7 @@ function collectionGet(storePromise) {
         return response.status(405).send("method not allowed");
       }
       if (id) {
-        const item = await service.findOne((0, import_bom_core14.asEquatable)(id), params);
+        const item = await service.findOne((0, import_bom_core13.asEquatable)(id), params);
         if (item) {
           return response.status(200).json(item);
         } else {
@@ -1612,87 +1620,20 @@ async function routePost(store, request, response) {
   if (request.body.pathname && request.body.href) {
     try {
       const { pathname, href } = request.body;
-      const routes = await store.route.findMany({
-        where: {
-          id: {
-            equals: pathname
-          }
-        }
-      });
-      if (routes.length > 0) {
-        return response.status(200).json(routes[0]);
-      } else {
-        const splatRoutes = await store.route.findMany({
-          where: {
-            useSplat: {
-              equals: true
-            }
-          }
-        });
-        const splatRoute = splatRoutes.reduce((p, c) => {
-          const match = pathname.indexOf(c.id) === 0;
-          if (match && (!p || p.id.length < c.id.length)) {
-            return { ...c, splat: pathname.substring(c.id.length, pathname.length) };
-          } else {
-            return p;
-          }
-        }, void 0);
-        if (splatRoute) {
-          return response.status(200).json(splatRoute);
-        }
-        const redirects = await store.redirect.findMany({
-          where: {
-            isActive: {
-              equals: true
-            }
-          }
-        });
-        const exactMatchResolver = (redirect) => {
-          const status = parseInt(redirect.status) || 307;
-          if (status < 400) {
-            const redirectUrl = redirect.to;
-            return response.status(status).send({
-              redirectUrl
-            });
-          } else {
-            return response.status(status).send("gone");
-          }
-        };
-        const exactMatchRedirect = redirects.find((x) => x.from === href);
-        if (exactMatchRedirect !== void 0) {
-          return exactMatchResolver(exactMatchRedirect);
+      const route = await findRoute(store, pathname, href);
+      return response.status(200).json(route);
+    } catch (error) {
+      if (error.status < 500) {
+        if (error.status < 400) {
+          return response.status(error.status).send({
+            redirectUrl: error.redirectUrl
+          });
         }
-        const patternMatchResolver = (redirect) => {
-          const status = parseInt(redirect.status) || 307;
-          if (status < 400) {
-            const regexp = new RegExp(redirect.from);
-            let i = 0;
-            let redirectUrl = redirect.to.replace(/\*/g, (...rest) => {
-              return `$${++i}`;
-            });
-            redirectUrl = href.replace(regexp, redirectUrl);
-            return response.status(status).send({
-              redirectUrl
-            });
-          } else {
-            return response.status(status).send("gone");
-          }
-        };
-        redirects.forEach((x) => {
-          let expression = x.from;
-          expression = expression.replace(/\*(?!\))/g, "(.*)");
-          expression = `^${expression.replace(/(^\^)|(\$$)/g, "")}$`;
-          x.from = expression;
-        });
-        const firstMatch = redirects.find((x) => href.match(x.from));
-        if (firstMatch) {
-          return patternMatchResolver(firstMatch);
+        if (error.status === 404) {
+          return response.status(404).send("not found");
+        } else {
+          return response.status(error.status).send("gone");
         }
-        return response.status(404).send("not found");
-      }
-    } catch (error) {
-      if (error.status === 404) {
-        return response.status(404).send("not found");
       } else {
         console.error("storeHandler.error.500", error);
         throw error;
@@ -1706,8 +1647,8 @@ function storeIndexHandler() {
   return apiHandler({
     get: async (request, response) => {
       try {
-        const market = import_bom_core14.defaultMarket;
-        const locale = import_bom_core14.defaultLocale;
+        const market = import_bom_core13.defaultMarket;
+        const locale = import_bom_core13.defaultLocale;
         if (!Array.isArray(COLLECTIONS) || COLLECTIONS?.length === 0) {
           console.error("apiHome.collectionGet", "collections not found", COLLECTIONS);
           return response.status(405).send("method not allowed");
@@ -1833,6 +1774,82 @@ function storeIndexHandler() {
     }
   });
 }
+async function findRoute(store, pathname, href) {
+  const routes = await store.route.findMany({
+    where: {
+      id: {
+        equals: pathname
+      }
+    }
+  });
+  if (routes.length > 0) {
+    return routes[0];
+  } else {
+    const splatRoutes = await store.route.findMany({
+      where: {
+        useSplat: {
+          equals: true
+        }
+      }
+    });
+    const splatRoute = splatRoutes.reduce((p, c) => {
+      const match = pathname.indexOf(c.id) === 0;
+      if (match && (!p || p.id.length < c.id.length)) {
+        return { ...c, splat: pathname.substring(c.id.length, pathname.length) };
+      } else {
+        return p;
+      }
+    }, void 0);
+    if (splatRoute) {
+      return splatRoute;
+    }
+    const redirects = await store.redirect.findMany({
+      where: {
+        isActive: {
+          equals: true
+        }
+      }
+    });
+    const exactMatchResolver = (redirect) => {
+      const status = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const redirectUrl = redirect.to;
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    const exactMatchRedirect = redirects.find((x) => x.from === href);
+    if (exactMatchRedirect !== void 0) {
+      return exactMatchResolver(exactMatchRedirect);
+    }
+    const patternMatchResolver = (redirect) => {
+      const status = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const regexp = new RegExp(redirect.from);
+        let i = 0;
+        let redirectUrl = redirect.to.replace(/\*/g, (...rest) => {
+          return `$${++i}`;
+        });
+        redirectUrl = href.replace(regexp, redirectUrl);
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    redirects.forEach((x) => {
+      let expression = x.from;
+      expression = expression.replace(/\*(?!\))/g, "(.*)");
+      expression = `^${expression.replace(/(^\^)|(\$$)/g, "")}$`;
+      x.from = expression;
+    });
+    const firstMatch = redirects.find((x) => href.match(x.from));
+    if (firstMatch) {
+      return patternMatchResolver(firstMatch);
+    }
+    throw { status: 404 };
+  }
+}
 
 // src/mock/mock.handler.ts
 function mockHandler() {
@@ -1892,6 +1909,7 @@ async function storeApiDelete(url, options = {}) {
   decorateStaticRelations_,
   defaultApiRequestOptions,
   errorHandler,
+  findRoute,
   fromCache,
   getDefaultApiRequestOptions,
   getLocalApiUrl,

package/dist/index.mjs

@@ -99,10 +99,6 @@ async function decorateHrefs_(store, items, params = {}) {
         locale: {
           equals: params.locale
         }
-        /*
-        ...(params.market ? { market: { equals: params.market } } : {}),
-        ...(params.locale ? { locale: { equals: params.locale } } : {}),
-        */
       }
     });
     return items.map((item) => {
@@ -152,7 +148,6 @@ async function decorateMenu_(store, item, params) {
   const undecoratedPages = collectUndecoratedPages(items);
   if (undecoratedCategories.length > 0 || undecoratedPages.length > 0) {
     const routes = await store.route.findMany({
-      ...params,
       where: {
         ...market ? { market: { equals: market } } : {},
         ...locale ? { locale: { equals: locale } } : {}
@@ -319,7 +314,6 @@ async function decorateNav_(store, item, params = {}, routes) {
 }
 async function decorateNavs_(store, items, params = {}) {
   const routes = await store.route.findMany({
-    ...params,
     where: {
       ...params.market ? { market: { equals: params.market } } : {},
       ...params.locale ? { locale: { equals: params.locale } } : {}
@@ -421,7 +415,6 @@ var API_BASE = process.env.NEXT_PUBLIC_API || "/api";
 function getLocalApiUrl(pathname) {
   let url = `${isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
   url = isBrowser ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getLocalApiUrl", url);
   return url;
 }
 async function localApiFetch(pathname, options = {}, serviceOptions) {
@@ -431,6 +424,7 @@ async function localApiFetch(pathname, options = {}, serviceOptions) {
     url.searchParams.append("market", serviceOptions.market);
   }
   const apiOptions = merge({ ...getDefaultApiRequestOptions() }, options);
+  console.log("localApiFetch", apiOptions.method, url.href);
   const apiResponse = await httpFetch(url.href, apiOptions);
   return apiResponse;
 }
@@ -565,12 +559,12 @@ var API_BASE3 = process.env.NEXT_PUBLIC_API || "/api";
 function getMockApiUrl(pathname) {
   let url = `${API_URL2}${API_BASE3}/_mock${pathname}`;
   url = isBrowser2 ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getMockApiUrl", url);
   return url;
 }
 async function mockApiFetch(pathname, options = {}) {
   const url = getMockApiUrl(pathname);
   const apiOptions = merge2({ ...getDefaultApiRequestOptions() }, options);
+  console.log("mockApiFetch", apiOptions.method, url);
   const apiResponse = await httpFetch2(url, apiOptions);
   return apiResponse;
 }
@@ -1028,7 +1022,7 @@ function getMockStoreFromData_(data) {
       }
     }
   } else {
-    console.log("mock store not found");
+    console.warn("mock store not found");
   }
   staticCollections.forEach((config) => {
     store[config.slug] = new StaticService(config, store);
@@ -1060,13 +1054,11 @@ async function getMockStore() {
   }, isDevelopment ? void 0 : "STORE_MOCK_");
 }
 
-// src/remote/remote.store.ts
-import { isDevelopment as isDevelopment2 } from "@websolutespa/bom-core";
-
 // src/cached/cached.service.ts
-import { qsSerialize } from "@websolutespa/bom-core";
-var CachedService = class {
+import { JsonService as JsonService3, qsSerialize } from "@websolutespa/bom-core";
+var CachedService = class extends JsonService3 {
   constructor(service, options = {}) {
+    super([]);
     this.cache_ = /* @__PURE__ */ new Map();
     this.duration_ = storeCacheDuration;
     if (!service) {
@@ -1110,11 +1102,27 @@ var CachedService = class {
     }, key);
   }
   async findMany(params = {}) {
-    const serializedParams = qsSerialize(params);
-    const key = `findMany?${serializedParams}`;
-    return await this.fromCache_(async () => {
-      return await this.service_.findMany(params);
-    }, key);
+    if (storeStrategy === "decoratedApi" /* DecoratedApi */) {
+      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;
+      }, key);
+    } else {
+      const serializedParams = qsSerialize(params);
+      const key = `findMany?${serializedParams}`;
+      return await this.fromCache_(async () => {
+        return await this.service_.findMany(params);
+      }, key);
+    }
   }
   async findPaged(params = {}) {
     const serializedParams = qsSerialize(params);
@@ -1144,12 +1152,12 @@ var API_BASE4 = process.env.STORE_API || "/api";
 function getRemoteApiUrl(pathname) {
   let url = `${API_URL3}${API_BASE4}${pathname}`;
   url = isBrowser3 ? url : url.replace("://localhost", "://127.0.0.1");
-  console.log("getRemoteApiUrl", url);
   return url;
 }
 async function remoteApiFetch(pathname, options = {}) {
   const url = getRemoteApiUrl(pathname);
   const apiOptions = merge3({ ...getDefaultApiRequestOptions() }, options);
+  console.log("remoteApiFetch", apiOptions.method, url);
   const apiResponse = await httpFetch3(url, apiOptions);
   return apiResponse;
 }
@@ -1306,7 +1314,6 @@ var RemotePageService = class extends RemoteService {
 var PAGES2 = process.env.PAGES ? process.env.PAGES.split(",") : [];
 async function getRemoteStore_() {
   return fromCache(async () => {
-    console.log("getRemoteStore_");
     if (COLLECTIONS.length === 0) {
       console.error("RemoteStore.getRemoteStore_ no collections");
       throw "RemoteStore.getRemoteStore_ no collections";
@@ -1326,7 +1333,7 @@ async function getRemoteStore_() {
         store[key] = new CachedService(
           new RemoteMenuService(key, store)
         );
-      } else if (KNOWN_COLLECTIONS.includes(key) && !isDevelopment2) {
+      } else if (KNOWN_COLLECTIONS.includes(key)) {
         store[key] = new CachedService(
           new RemoteService(key, store)
         );
@@ -1512,87 +1519,20 @@ async function routePost(store, request, response) {
   if (request.body.pathname && request.body.href) {
     try {
       const { pathname, href } = request.body;
-      const routes = await store.route.findMany({
-        where: {
-          id: {
-            equals: pathname
-          }
-        }
-      });
-      if (routes.length > 0) {
-        return response.status(200).json(routes[0]);
-      } else {
-        const splatRoutes = await store.route.findMany({
-          where: {
-            useSplat: {
-              equals: true
-            }
-          }
-        });
-        const splatRoute = splatRoutes.reduce((p, c) => {
-          const match = pathname.indexOf(c.id) === 0;
-          if (match && (!p || p.id.length < c.id.length)) {
-            return { ...c, splat: pathname.substring(c.id.length, pathname.length) };
-          } else {
-            return p;
-          }
-        }, void 0);
-        if (splatRoute) {
-          return response.status(200).json(splatRoute);
-        }
-        const redirects = await store.redirect.findMany({
-          where: {
-            isActive: {
-              equals: true
-            }
-          }
-        });
-        const exactMatchResolver = (redirect) => {
-          const status = parseInt(redirect.status) || 307;
-          if (status < 400) {
-            const redirectUrl = redirect.to;
-            return response.status(status).send({
-              redirectUrl
-            });
-          } else {
-            return response.status(status).send("gone");
-          }
-        };
-        const exactMatchRedirect = redirects.find((x) => x.from === href);
-        if (exactMatchRedirect !== void 0) {
-          return exactMatchResolver(exactMatchRedirect);
+      const route = await findRoute(store, pathname, href);
+      return response.status(200).json(route);
+    } catch (error) {
+      if (error.status < 500) {
+        if (error.status < 400) {
+          return response.status(error.status).send({
+            redirectUrl: error.redirectUrl
+          });
         }
-        const patternMatchResolver = (redirect) => {
-          const status = parseInt(redirect.status) || 307;
-          if (status < 400) {
-            const regexp = new RegExp(redirect.from);
-            let i = 0;
-            let redirectUrl = redirect.to.replace(/\*/g, (...rest) => {
-              return `$${++i}`;
-            });
-            redirectUrl = href.replace(regexp, redirectUrl);
-            return response.status(status).send({
-              redirectUrl
-            });
-          } else {
-            return response.status(status).send("gone");
-          }
-        };
-        redirects.forEach((x) => {
-          let expression = x.from;
-          expression = expression.replace(/\*(?!\))/g, "(.*)");
-          expression = `^${expression.replace(/(^\^)|(\$$)/g, "")}$`;
-          x.from = expression;
-        });
-        const firstMatch = redirects.find((x) => href.match(x.from));
-        if (firstMatch) {
-          return patternMatchResolver(firstMatch);
+        if (error.status === 404) {
+          return response.status(404).send("not found");
+        } else {
+          return response.status(error.status).send("gone");
         }
-        return response.status(404).send("not found");
-      }
-    } catch (error) {
-      if (error.status === 404) {
-        return response.status(404).send("not found");
       } else {
         console.error("storeHandler.error.500", error);
         throw error;
@@ -1733,6 +1673,82 @@ function storeIndexHandler() {
     }
   });
 }
+async function findRoute(store, pathname, href) {
+  const routes = await store.route.findMany({
+    where: {
+      id: {
+        equals: pathname
+      }
+    }
+  });
+  if (routes.length > 0) {
+    return routes[0];
+  } else {
+    const splatRoutes = await store.route.findMany({
+      where: {
+        useSplat: {
+          equals: true
+        }
+      }
+    });
+    const splatRoute = splatRoutes.reduce((p, c) => {
+      const match = pathname.indexOf(c.id) === 0;
+      if (match && (!p || p.id.length < c.id.length)) {
+        return { ...c, splat: pathname.substring(c.id.length, pathname.length) };
+      } else {
+        return p;
+      }
+    }, void 0);
+    if (splatRoute) {
+      return splatRoute;
+    }
+    const redirects = await store.redirect.findMany({
+      where: {
+        isActive: {
+          equals: true
+        }
+      }
+    });
+    const exactMatchResolver = (redirect) => {
+      const status = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const redirectUrl = redirect.to;
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    const exactMatchRedirect = redirects.find((x) => x.from === href);
+    if (exactMatchRedirect !== void 0) {
+      return exactMatchResolver(exactMatchRedirect);
+    }
+    const patternMatchResolver = (redirect) => {
+      const status = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const regexp = new RegExp(redirect.from);
+        let i = 0;
+        let redirectUrl = redirect.to.replace(/\*/g, (...rest) => {
+          return `$${++i}`;
+        });
+        redirectUrl = href.replace(regexp, redirectUrl);
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    redirects.forEach((x) => {
+      let expression = x.from;
+      expression = expression.replace(/\*(?!\))/g, "(.*)");
+      expression = `^${expression.replace(/(^\^)|(\$$)/g, "")}$`;
+      x.from = expression;
+    });
+    const firstMatch = redirects.find((x) => href.match(x.from));
+    if (firstMatch) {
+      return patternMatchResolver(firstMatch);
+    }
+    throw { status: 404 };
+  }
+}
 
 // src/mock/mock.handler.ts
 function mockHandler() {
@@ -1791,6 +1807,7 @@ export {
   decorateStaticRelations_,
   defaultApiRequestOptions,
   errorHandler,
+  findRoute,
   fromCache,
   getDefaultApiRequestOptions,
   getLocalApiUrl,

package/package.json

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

package/src/cached/cached.service.ts

@@ -1,5 +1,5 @@
-import { IEntity, IEquatable, IPagedResult, IQuerable, QueryParams, qsSerialize } from '@websolutespa/bom-core';
-import { storeCacheDuration } from '../store/store';
+import { IEntity, IEquatable, IPagedResult, IQuerable, JsonService, QueryParams, qsSerialize } from '@websolutespa/bom-core';
+import { StoreStrategy, storeCacheDuration, storeStrategy } from '../store/store';
 
 export type ICacheResult<T extends IEntity = IEntity> = T | T[] | IPagedResult<T> | undefined;
 
@@ -12,13 +12,15 @@ export type InMemoryCacheOptions = {
   duration?: number | false;
 };
 
-export class CachedService<T extends IEntity = IEntity> implements IQuerable<T> {
+// export class CachedService<T extends IEntity = IEntity> implements IQuerable<T> {
+export class CachedService<T extends IEntity = IEntity> extends JsonService<T> {
 
   private service_: IQuerable<T>;
   private cache_: Map<string, ICache<T>> = new Map<string, ICache<T>>();
   private duration_: number | false = storeCacheDuration;
 
   constructor(service: IQuerable<T>, options: InMemoryCacheOptions = {}) {
+    super([]);
     if (!service) {
       throw new Error('CachedService: service is required');
     }
@@ -67,11 +69,27 @@ export class CachedService<T extends IEntity = IEntity> implements IQuerable<T>
   }
 
   async findMany<B extends T = T>(params: QueryParams = {}): Promise<B[]> {
-    const serializedParams = qsSerialize(params);
-    const key = `findMany?${serializedParams}`;
-    return await this.fromCache_(async () => {
-      return await this.service_.findMany(params);
-    }, key) as B[];
+    if (storeStrategy === StoreStrategy.DecoratedApi) {
+      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;
+      }, key) as B[];
+    } else {
+      const serializedParams = qsSerialize(params);
+      const key = `findMany?${serializedParams}`;
+      return await this.fromCache_(async () => {
+        return await this.service_.findMany(params);
+      }, key) as B[];
+    }
   }
 
   async findPaged<B extends T = T>(params: QueryParams = {}): Promise<IPagedResult<B>> {

package/src/decorators/href.ts

@@ -35,10 +35,6 @@ export async function decorateHrefs_<T extends ISchema = ISchema>(store: IStore,
         locale: {
           equals: params.locale,
         },
-        /*
-        ...(params.market ? { market: { equals: params.market } } : {}),
-        ...(params.locale ? { locale: { equals: params.locale } } : {}),
-        */
       },
     });
     return items.map(item => {

package/src/decorators/menu.ts

@@ -22,7 +22,6 @@ export async function decorateMenu_(store: IStore, item: IUndecoratedMenu, param
     undecoratedPages.length > 0
   ) {
     const routes = await store.route.findMany<IRoute>({
-      ...params,
       where: {
         ...(market ? { market: { equals: market } } : {}),
         ...(locale ? { locale: { equals: locale } } : {}),

package/src/decorators/nav.ts

@@ -19,7 +19,6 @@ export async function decorateNav_<T extends ISchema = ISchema>(store: IStore, i
 
 export async function decorateNavs_<T extends ISchema = ISchema>(store: IStore, items: T[], params: QueryParams = {}): Promise<T[]> {
   const routes = await store.route.findMany<IRoute>({
-    ...params,
     where: {
       ...(params.market ? { market: { equals: params.market } } : {}),
       ...(params.locale ? { locale: { equals: params.locale } } : {}),

package/src/local/local.api.ts

@@ -16,7 +16,7 @@ export function getLocalApiUrl(pathname: string): string {
   let url = `${isBrowser ? window.location.origin : API_URL}${API_BASE}${pathname}`;
   // !!! node 18 issue -> require('dns').setDefaultResultOrder('ipv4first');
   url = isBrowser ? url : url.replace('://localhost', '://127.0.0.1');
-  console.log('getLocalApiUrl', url);
+  // console.log('getLocalApiUrl', url);
   return url;
 }
 
@@ -28,7 +28,7 @@ export async function localApiFetch<T = unknown>(pathname: string, options: ApiR
     url.searchParams.append('market', serviceOptions.market);
   }
   const apiOptions = merge({ ...getDefaultApiRequestOptions() }, options);
-  // console.log('localApiFetch', url.href, apiOptions);
+  console.log('localApiFetch', apiOptions.method, url.href);
   const apiResponse = await httpFetch(url.href, apiOptions);
   // console.log('localApiFetch', pathname, apiResponse);
   return apiResponse;

package/src/mock/mock.api.ts

@@ -12,13 +12,14 @@ function getMockApiUrl(pathname: string): string {
   let url = `${API_URL}${API_BASE}/_mock${pathname}`;
   // !!! node 18 issue -> require('dns').setDefaultResultOrder('ipv4first');
   url = isBrowser ? url : url.replace('://localhost', '://127.0.0.1');
-  console.log('getMockApiUrl', url);
+  // console.log('getMockApiUrl', url);
   return url;
 }
 
 export async function mockApiFetch<T = unknown>(pathname: string, options: ApiRequestOptions = {}): Promise<T> {
   const url = getMockApiUrl(pathname);
   const apiOptions = merge({ ...getDefaultApiRequestOptions() }, options);
+  console.log('mockApiFetch', apiOptions.method, url);
   const apiResponse = await httpFetch(url, apiOptions);
   return apiResponse;
 }

package/src/mock/mock.store.ts

@@ -39,7 +39,7 @@ export function getMockStoreFromData_<T extends IStore>(data?: IMemoryStore): T
       }
     }
   } else {
-    console.log('mock store not found');
+    console.warn('mock store not found');
   }
   staticCollections.forEach(config => {
     store[config.slug] = new StaticService(config, store);

package/src/remote/remote.api.ts

@@ -12,13 +12,14 @@ function getRemoteApiUrl(pathname: string): string {
   let url = `${API_URL}${API_BASE}${pathname}`;
   // !!! node 18 issue -> require('dns').setDefaultResultOrder('ipv4first');
   url = isBrowser ? url : url.replace('://localhost', '://127.0.0.1');
-  console.log('getRemoteApiUrl', url);
+  // console.log('getRemoteApiUrl', url);
   return url;
 }
 
 export async function remoteApiFetch<T = unknown>(pathname: string, options: ApiRequestOptions = {}): Promise<T> {
   const url = getRemoteApiUrl(pathname);
   const apiOptions = merge({ ...getDefaultApiRequestOptions() }, options);
+  console.log('remoteApiFetch', apiOptions.method, url);
   const apiResponse = await httpFetch(url, apiOptions);
   return apiResponse;
 }

package/src/remote/remote.store.ts

@@ -1,4 +1,4 @@
-import { IEntity, IMemoryStore, IQuerable, IStore, isDevelopment } from '@websolutespa/bom-core';
+import { IEntity, 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';
@@ -13,7 +13,7 @@ const PAGES: string[] = process.env.PAGES ? process.env.PAGES.split(',') : [];
 
 async function getRemoteStore_<T extends IStore>(): Promise<T> {
   return fromCache<T>(async () => {
-    console.log('getRemoteStore_');
+    // console.log('getRemoteStore_');
     if (COLLECTIONS.length === 0) {
       console.error('RemoteStore.getRemoteStore_ no collections');
       throw ('RemoteStore.getRemoteStore_ no collections');
@@ -33,7 +33,7 @@ async function getRemoteStore_<T extends IStore>(): Promise<T> {
         store[key] = new CachedService(
           new RemoteMenuService(key, store)
         );
-      } else if (KNOWN_COLLECTIONS.includes(key) && !isDevelopment) {
+      } else if (KNOWN_COLLECTIONS.includes(key)) {
         store[key] = new CachedService(
           new RemoteService(key, store)
         );
@@ -42,8 +42,8 @@ async function getRemoteStore_<T extends IStore>(): Promise<T> {
       }
     });
     return store as T;
-    // }, isDevelopment ? undefined : 'STORE_RUNTIME_');
   }, 'STORE_RUNTIME_');
+  // }, isDevelopment ? undefined : 'STORE_RUNTIME_');
 }
 
 async function getRemoteStoreStaticBuild_<T extends IStore>(): Promise<T> {

package/src/store/store.handler.ts

@@ -155,6 +155,9 @@ export async function routePost(store: IStore, request: NextApiRequest, response
   if (request.body.pathname && request.body.href) {
     try {
       const { pathname, href } = request.body;
+      const route = await findRoute(store, pathname, href);
+      return response.status(200).json(route);
+      /*
       // here we use findMany because route id would break api url
       const routes = await store.route.findMany<IRoute>({
         where: {
@@ -221,7 +224,7 @@ export async function routePost(store: IStore, request: NextApiRequest, response
           if (status < 400) {
             const regexp = new RegExp(redirect.from);
             let i = 0;
-            let redirectUrl = (redirect.to as string).replace(/\*/g, (...rest) => {
+            let redirectUrl = (redirect.to as string).replace(//g, (...rest) => {
               return `$${++i}`;
             });
             redirectUrl = href.replace(regexp, redirectUrl);
@@ -249,7 +252,24 @@ export async function routePost(store: IStore, request: NextApiRequest, response
         // console.error('not found', collection);
         return response.status(404).send('not found');
       }
+      */
     } catch (error: any) {
+      if (error.status < 500) {
+        if (error.status < 400) {
+          return response.status(error.status).send({
+            redirectUrl: error.redirectUrl,
+          });
+        }
+        if (error.status === 404) {
+          return response.status(404).send('not found');
+        } else {
+          return response.status(error.status).send('gone');
+        }
+      } else {
+        console.error('storeHandler.error.500', error);
+        throw error;
+      }
+      /*
       if (error.status === 404) {
         // console.error('not found', collection);
         return response.status(404).send('not found');
@@ -257,6 +277,7 @@ export async function routePost(store: IStore, request: NextApiRequest, response
         console.error('storeHandler.error.500', error);
         throw error;
       }
+      */
     }
   } else {
     return response.status(400).send('bad request');
@@ -397,3 +418,97 @@ export function storeIndexHandler() {
     },
   });
 }
+
+
+
+export async function findRoute(store: IStore, pathname: string, href: string): Promise<IRoute | undefined> {
+  // here we use findMany because route id would break api url
+  const routes = await store.route.findMany<IRoute>({
+    where: {
+      id: {
+        equals: pathname,
+      },
+    },
+  });
+  // console.log('pathname', pathname);
+  if (routes.length > 0) {
+    return routes[0];
+  } else {
+    // exact route match not found
+    // let's try if match splat routes
+    const splatRoutes = await store.route.findMany<IRoute>({
+      where: {
+        useSplat: {
+          equals: true,
+        },
+      },
+    });
+    // console.log('splatRoutes', splatRoutes);
+    // find best match splat route
+    const splatRoute = splatRoutes.reduce((p: (IRoute & { splat: string }) | undefined, c: IRoute) => {
+      const match = pathname.indexOf(c.id) === 0;
+      if (match && (!p || p.id.length < c.id.length)) {
+        return { ...c, splat: pathname.substring(c.id.length, pathname.length) };
+      } else {
+        return p;
+      }
+    }, undefined);
+    if (splatRoute) {
+      return splatRoute;
+    }
+    // collect redirects
+    const redirects = await store.redirect.findMany<IRedirect>({
+      where: {
+        isActive: {
+          equals: true,
+        },
+      },
+    });
+    // redirects.sort((a, b) => a.order - b.order);
+    // exact match redirect resolver
+    const exactMatchResolver = (redirect: IRedirect) => {
+      const status: number = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const redirectUrl = redirect.to;
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    // check exact match redirects
+    const exactMatchRedirect = redirects.find(x => x.from === href);
+    if (exactMatchRedirect !== undefined) {
+      return exactMatchResolver(exactMatchRedirect);
+    }
+    // pattern match redirect resolver
+    const patternMatchResolver = (redirect: IRedirect) => {
+      const status: number = parseInt(redirect.status) || 307;
+      if (status < 400) {
+        const regexp = new RegExp(redirect.from);
+        let i = 0;
+        let redirectUrl = (redirect.to as string).replace(/\*/g, (...rest) => {
+          return `$${++i}`;
+        });
+        redirectUrl = href.replace(regexp, redirectUrl);
+        throw { status, redirectUrl };
+      } else {
+        throw { status };
+      }
+    };
+    // check redirects by pattern
+    redirects.forEach(x => {
+      let expression = x.from;
+      // wrapping catchall in (.*)
+      expression = expression.replace(/\*(?!\))/g, '(.*)');
+      // wrapping expression in ^...$
+      expression = `^${expression.replace(/(^\^)|(\$$)/g, '')}$`;
+      x.from = expression;
+    });
+    // check if a regex pattern redirect does match
+    const firstMatch = redirects.find(x => href.match(x.from));
+    if (firstMatch) {
+      return patternMatchResolver(firstMatch);
+    }
+    throw { status: 404 };
+  }
+}