@websolutespa/bom-mixer-models 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",
@@ -21,19 +21,19 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@websolutespa/bom-core": "*",
-    "@websolutespa/bom-mixer-store": "*",
+    "@websolutespa/bom-core": "^3.0.1",
+    "@websolutespa/bom-mixer-store": "^3.0.1",
     "iron-session": "8.0.4",
     "next": "16.1.6"
   },
   "devDependencies": {
-    "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3",
-    "@websolutespa/bom-cli": "*",
-    "@websolutespa/test": "*",
-    "@websolutespa/tsconfig": "*",
+    "@types/react": "19.2.10",
+    "@websolutespa/bom-cli": "^3.0.1",
+    "@websolutespa/eslint-config": "^3.0.0",
+    "@websolutespa/test": "^3.0.1",
+    "@websolutespa/tsconfig": "^3.0.0",
     "eslint": "9.31.0",
-    "@websolutespa/eslint-config": "*",
     "npm-run-all": "4.1.5",
     "react": "19.2.3",
     "schema-dts": "1.1.5",

package/src/page/page.service.ts

@@ -258,7 +258,6 @@ export function getPublicUrl() {
   return publicUrl;
 }
 
-export function resolveHref(href?: string | null) {
-  href = href || '';
+export function resolveHref(href: string = '') {
   return href.startsWith('http') ? href : `${getPublicUrl()}${href}`;
 }

package/src/route/route-revalidate.handler.ts

@@ -1,4 +1,5 @@
 
+import { Where } from '@websolutespa/bom-core';
 import { apiHandler } from '@websolutespa/bom-mixer-store/server';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { resolveRoute } from './route';
@@ -16,22 +17,31 @@ export function routeRevalidateHandler() {
       }
       try {
         /* { "id": 1, "schema": "product", "href": "/product/xxxx" } */
-        const { href } = request.body;
-        const routes = await getRoutes({
-          where: {
-            id: { equals: href },
-          },
-        });
+        const { href, schema, page } = request.body || {};
+
+        let where: Where;
+        if (href) {
+          where = { id: { equals: href } };
+        } else if (schema && page) {
+          where = { schema: { equals: schema }, page: { equals: page } };
+        } else {
+          return response.status(400).send('Missing href or schema and page');
+        }
+
+        const routes = await getRoutes({ where });
         if (routes.length === 0) {
           // console.log('route.notfound', href);
-          return response.status(404).send(`routeRevalidateHandler.notFound ${href}`);
+          const notFoundTarget = href || `${schema}:${page}`;
+          return response.status(404).send(`routeRevalidateHandler.notFound ${notFoundTarget}`);
         }
         // console.log('routes', routes);
         for (const route of routes) {
           // console.log('route.found', route);
           const resolvedRoute = resolveRoute(route);
-          console.log('route.revalidating', resolvedRoute);
+          // console.log('route.revalidating', resolvedRoute);
           await response.revalidate(resolvedRoute);
+
+          // @TODO: CDN cache purge
         }
         return response.json({ revalidated: true });
       } catch (error) {

package/src/route/route.interceptor.ts

@@ -48,29 +48,20 @@ export async function detectCountry(request: NextRequest, defaultMarket?: string
 }
 
 async function getMarkets() {
-  let routes: IMarket[] = [];
-  if (storeStrategy === StoreStrategy.DecoratedApi) {
-    routes = await localApiGet('/market?pagination=false');
-  } else {
-    routes = await storeApiGet('/market?pagination=false');
-  }
-  return routes;
+  const apiGet = storeStrategy === StoreStrategy.DecoratedApi ? localApiGet : storeApiGet;
+  const markets: IMarket[] = await apiGet('/market?pagination=false');
+  return markets;
 }
 
 async function getRootRoutes() {
-  let routes: IRoute[] = [];
-  if (storeStrategy === StoreStrategy.DecoratedApi) {
-    routes = await localApiGet('/route?where[isRoot][equals]=true');
-  } else {
-    routes = await storeApiGet('/route?where[isRoot][equals]=true');
-  }
+  const apiGet = storeStrategy === StoreStrategy.DecoratedApi ? localApiGet : storeApiGet;
+  const routes: IRoute[] = await apiGet('/route?where[isRoot][equals]=true');
   return routes;
 }
 
 export async function routeAutoDetection(request: NextRequest, next: NextFetchEvent): Promise<string | undefined> {
   let route: string | undefined;
   const url = request.nextUrl;
-  // console.log('routeInterceptor.routeAutoDetection', url);
   if (url.pathname === '/') {
     const cookie = request.cookies.get('detectedRoute');
     if (cookie?.value) {