@websolutespa/bom-mixer-models 0.2.0 → 0.4.0

package/CHANGELOG.md

@@ -1,25 +1,37 @@
-# @websolutespa/bom-mixer-models
-
-## 0.2.0
-
-### Minor Changes
-
-- Added: LazyComponent Types.
-
-## 0.1.1
-
-### Patch Changes
-
-- Modified: page service.
-
-## 0.1.0
-
-### Minor Changes
-
-- mock refactor.
-
-## 0.0.2
-
-### Patch Changes
-
-- Added: first release.
+# @websolutespa/bom-mixer-models
+
+## 0.4.0
+
+### Minor Changes
+
+- Added: splat routes.
+
+## 0.3.0
+
+### Minor Changes
+
+- Added: @websolutespa/bom-core.
+
+## 0.2.0
+
+### Minor Changes
+
+- Added: LazyComponent Types.
+
+## 0.1.1
+
+### Patch Changes
+
+- Modified: page service.
+
+## 0.1.0
+
+### Minor Changes
+
+- mock refactor.
+
+## 0.0.2
+
+### Patch Changes
+
+- Added: first release.

package/dist/index.d.ts

@@ -1,20 +1,7 @@
-import { ISchema, IEquatable, IEntity, ILocalizedString, QueryParams, IOption, INamedEntity, ValueOf, IQuerable } from '@websolutespa/bom-mixer-core';
+import { ISchema, IEquatable, IMedia, QueryParams, ICategory, ICategorized, IOption, INamedEntity, ILabel, ILayout, ILocale, IMarket, IMenu, ValueOf, IPageResult, IRoute, IPage, IRouteLink, IQuerable, IEntity } from '@websolutespa/bom-core';
 import { ComponentType, ComponentProps } from 'react';
 import { NextRequest, NextFetchEvent, NextResponse } from 'next/server';
 
-type IMediaType = 'image' | 'video' | string;
-type IMedia = {
-    src: string;
-    type: IMediaType;
-    alt?: string;
-    title?: string;
-    abstract?: string;
-    width?: number;
-    height?: number;
-    url?: string;
-    media?: IMedia;
-};
-
 type ICartItem = ISchema & {
     id: IEquatable;
     schema: string;
@@ -27,31 +14,9 @@ type ICartItem = ISchema & {
 };
 type ICartAddItem = Omit<ICartItem, 'qty'>;
 
-type ICategory = IEntity & {
-    id: IEquatable;
-    slug?: ILocalizedString | string;
-    title?: ILocalizedString | string;
-    media?: IMedia;
-    schema?: string;
-    page?: IEquatable;
-    category?: IEquatable | ICategory;
-};
-type ICategoryItem = ICategory & {
-    items: ICategory[];
-};
-type ICategorized = {
-    id: IEquatable;
-    schema?: string;
-    category: IEquatable | ICategory;
-    isDefault?: boolean;
-    slug?: ILocalizedString | string;
-    title?: ILocalizedString | string;
-    media?: IMedia;
-};
-
 declare function getCategories(params?: QueryParams): Promise<ICategory[]>;
 declare function getSegments(item: ICategorized, params?: QueryParams): Promise<ICategory[]>;
-declare function getRouteSegments(schema: string | undefined, item: ICategorized, categories: ICategory[]): ICategory[];
+declare function getRouteSegments(item: ICategorized, categories: ICategory[]): ICategory[];
 
 type IUserLogin = {
     email: string;
@@ -182,73 +147,9 @@ type IFeatureType = {
 
 declare function getFeatureTypes(params?: QueryParams): Promise<IFeatureType[]>;
 
-type ILabel = IEntity & {
-    id: IEquatable;
-    text?: string | ILocalizedString;
-};
-
 declare function getLabels(params?: QueryParams): Promise<ILabel[]>;
 declare function resolveLabel(labels: ILabel[], id: string): string;
 
-type ILocale = IEntity & {
-    id: string;
-    title?: string;
-    isActive?: boolean;
-    isDefault?: boolean;
-};
-
-type IMarket = IEntity & {
-    id: string;
-    title?: string;
-    isActive?: boolean;
-    isDefault?: boolean;
-    countries?: string[];
-    languages?: string[];
-    defaultLanguage?: string;
-};
-
-type IRoute = {
-    id: string;
-    market: string;
-    locale: string;
-    category: string;
-    page: IEquatable;
-    schema: string;
-    template?: string;
-};
-type IRouteLink = {
-    id: IEquatable;
-    href: string;
-    title: string;
-    items?: IRouteLink[];
-    media?: IMedia;
-};
-type IRouteParams = {
-    id: IEquatable;
-    market: string;
-    locale: string;
-    [key: string]: any;
-};
-type SchemaType = string;
-
-type ILayout = {
-    market: string;
-    locale: string;
-    markets: IMarket[];
-    locales: ILocale[];
-    labels: ILabel[];
-    tree?: IRouteLink;
-    navs: {
-        [key: string]: IRouteLink[];
-    };
-    topLevelRoutes: {
-        [key: string]: IRouteLink;
-    };
-    topLevelHrefs: {
-        [key: string]: string;
-    };
-};
-
 declare function getLayout(market: string, locale: string): Promise<ILayout>;
 
 type ILazyComponent = {
@@ -286,17 +187,8 @@ declare function getLocales(params?: QueryParams): Promise<ILocale[]>;
 
 declare function getMarkets(params?: QueryParams): Promise<IMarket[]>;
 
-type IMenu = IEntity & {
-    id: IEquatable;
-    items: IMenuItem[];
-};
-type IMenuItem = {
-    name: string;
-    href: string;
-};
-
-declare function getMenu(id: IEquatable): Promise<IMenu | undefined>;
-declare function getMenus(): Promise<IMenu[]>;
+declare function getMenu(id: IEquatable, params?: QueryParams): Promise<IMenu | undefined>;
+declare function getMenus(params?: QueryParams): Promise<IMenu[]>;
 
 declare const IOrderStatus: {
     Pending: string;
@@ -327,46 +219,6 @@ type IOrderDetail = IOrder & {
 declare function getOrders(market: string, locale: string): Promise<IOrderDetail[]>;
 declare function getOrder(id: IEquatable, market: string, locale: string): Promise<IOrderDetail | null>;
 
-type IMeta = {
-    title?: string;
-    description?: string;
-    keywords?: string;
-    robots?: string;
-};
-type IImage = {
-    url: string;
-    type?: string;
-    alt?: string;
-    title?: string;
-    caption?: string;
-    width?: number;
-    height?: number;
-};
-type IPage = ICategorized & {
-    slug?: string;
-    href: string;
-    alternates: IRoute[];
-    breadcrumb: IRouteLink[];
-    parentRoute?: IRouteLink;
-    title?: string;
-    abstract?: string;
-    description?: string;
-    content?: string;
-    createdAt?: Date;
-    updatedAt?: Date;
-    meta?: IMeta;
-    [key: string]: any;
-};
-type IPageResult<T extends ICategorized = ICategorized> = IPage & T;
-type PageProps<T extends ICategorized = ICategorized> = {
-    layout: ILayout;
-    page: IPageResult<T>;
-    params: IRouteParams;
-    locales?: string[];
-    locale?: string;
-    defaultLocale?: string;
-};
-
 declare function findOnePage<T extends ICategorized = ICategorized>(schema: string, id: IEquatable, params?: QueryParams): Promise<T | undefined>;
 declare function findManyPages<T extends ICategorized = ICategorized>(schema: string, params?: QueryParams): Promise<T[]>;
 declare function getPage<T extends ICategorized = ICategorized>(schema: string, id: IEquatable, market?: string, locale?: string): Promise<IPageResult<T> | undefined>;
@@ -397,7 +249,9 @@ declare function getStaticPathsForSchema(schema: string): Promise<StaticPath[]>;
 declare function getBreadcrumbFromSegments(segments: ICategory[], market?: string, locale?: string): Promise<IRouteLink[]>;
 declare function getRouteLinkTree(market?: string, locale?: string): Promise<IRouteLink | undefined>;
 declare function categoryToRouteLink(routes: IRoute[], categories: ICategory[], category: ICategory, locale?: string): IRouteLink;
-declare function resolveRoute(route: IRoute): string;
+declare function resolveRoute(route: IRoute & {
+    splat?: string;
+}): string;
 type StaticPath = {
     params: {
         [key: string]: string;
@@ -419,4 +273,4 @@ type IModelStore = {
     [key: string]: IQuerable<IEntity>;
 };
 
-export { IAddress, IAddressOptions, ICartAddItem, ICartItem, ICategorized, ICategory, ICategoryItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutStore, ICompanyAddress, IFeatureType, IGenericLazyComponentProps, IImage, IKeyedList, ILabel, ILayout, ILazyComponent, ILazyComponentProps, ILazyModules, ILink, IList, ILocale, IMarket, IMedia, IMediaType, IMenu, IMenuItem, IMeta, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, IPage, IPageResult, IRoute, IRouteLink, IRouteParams, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, PageProps, SchemaType, StaticPath, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCountries, getDeliveries, getErrorPageLayout, getFeatureTypes, getInfo, getItems, getLabels, getLayout, getListByKeys, getLists, getLocales, getMarkets, getMenu, getMenus, getOrder, getOrders, getPage, getPageCategory, getPageRoutes, getPayment, getPayments, getProvinces, getRegions, getRoute, getRouteLinkTree, getRouteSegments, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getStaticPathsForSchema, getStores, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout };
+export { IAddress, IAddressOptions, ICartAddItem, ICartItem, ICheckout, ICheckoutDelivery, ICheckoutDiscount, ICheckoutInfo, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutStore, ICompanyAddress, IFeatureType, IGenericLazyComponentProps, IKeyedList, ILazyComponent, ILazyComponentProps, ILazyModules, ILink, IList, IModelStore, IOrder, IOrderDetail, IOrderStatus, IOrderStatusValue, IUser, IUserAddress, IUserChangePassword, IUserForgot, IUserLogin, IUserRegister, StaticPath, categoryToRouteLink, findManyPages, findOnePage, getBreadcrumbFromSegments, getCategories, getCountries, getDeliveries, getErrorPageLayout, getFeatureTypes, getInfo, getItems, getLabels, getLayout, getListByKeys, getLists, getLocales, getMarkets, getMenu, getMenus, getOrder, getOrders, getPage, getPageCategory, getPageRoutes, getPayment, getPayments, getProvinces, getRegions, getRoute, getRouteLinkTree, getRouteSegments, getRoutes, getRoutesForSchemas, getRoutesForTemplates, getSegments, getStaticPathsForSchema, getStores, resolveLabel, resolveRoute, routeInterceptor, routeRevalidateHandler, setDiscountCode, updateCheckout };

package/dist/index.js

@@ -76,9 +76,9 @@ async function getCategories(params = {}) {
 }
 async function getSegments(item, params = {}) {
   const categories = await getCategories(params);
-  return getRouteSegments(item.schema, item, categories);
+  return getRouteSegments(item, categories);
 }
-function getRouteSegments(schema, item, categories) {
+function getRouteSegments(item, categories) {
   const segments = [];
   let parentId = item.category || null;
   while (parentId != null) {
@@ -94,14 +94,13 @@ function getRouteSegments(schema, item, categories) {
     }
   }
   if (item.isDefault !== true) {
-    segments.push({
+    const segment = {
       id: item.id,
       title: item.title,
       slug: item.slug,
-      schema,
-      page: item.id,
       media: item.media
-    });
+    };
+    segments.push(segment);
   }
   return segments;
 }
@@ -131,7 +130,7 @@ async function getRegions(locale) {
 }
 
 // src/route/route.service.ts
-var import_bom_mixer_core = require("@websolutespa/bom-mixer-core");
+var import_bom_core = require("@websolutespa/bom-core");
 var import_bom_mixer_store5 = require("@websolutespa/bom-mixer-store");
 async function getRoutes(params = {}) {
   const store = await (0, import_bom_mixer_store5.getStore)();
@@ -214,17 +213,17 @@ async function getBreadcrumbFromSegments(segments, market = "ww", locale = "en")
     }
   });
   const tree = segments.map((segment) => {
-    const route = segment.schema && segment.page ? routes.find(
-      (r) => r.schema === segment.schema && r.page === segment.page
-    ) : void 0;
+    const route = routes.find(
+      (r) => r.category === segment.id
+    );
     const href = route ? route.id.toString() : "/#";
     return { segment, href };
   }).map((x) => {
     const segment = x.segment;
     const href = x.href;
     let title = segment.title || "untitled";
-    if ((0, import_bom_mixer_core.isLocalizedString)(title)) {
-      title = (0, import_bom_mixer_core.localizedToString)(title, locale);
+    if ((0, import_bom_core.isLocalizedString)(title)) {
+      title = (0, import_bom_core.localizedToString)(title, locale);
     }
     return {
       id: segment.id,
@@ -261,10 +260,10 @@ function categoryToRouteLink(routes, categories, category, locale = "en") {
   const route = routes.find(
     (r) => r.category === category.id
   );
-  const href = route ? route.id.toString() : "/#";
+  const href = route && route.id ? route.id.toString() : "/";
   let title = category.title || "untitled";
-  if ((0, import_bom_mixer_core.isLocalizedString)(title)) {
-    title = (0, import_bom_mixer_core.localizedToString)(title, locale);
+  if ((0, import_bom_core.isLocalizedString)(title)) {
+    title = (0, import_bom_core.localizedToString)(title, locale);
   }
   const childCategories = categories.filter((x) => {
     const parentId = x.category && typeof x.category === "object" ? x.category["id"] : x.category;
@@ -280,7 +279,7 @@ function categoryToRouteLink(routes, categories, category, locale = "en") {
 }
 function resolveRoute(route) {
   const routepath = route.template ? route.template : route.schema;
-  const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}`;
+  const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}${route.splat || ""}`;
   return resolvedPathname;
 }
 
@@ -630,6 +629,19 @@ async function getMarkets(params = {}) {
   return items;
 }
 
+// src/menu/menu.service.ts
+var import_bom_mixer_store10 = require("@websolutespa/bom-mixer-store");
+async function getMenu(id, params = {}) {
+  const store = await (0, import_bom_mixer_store10.getStore)();
+  const item = await store.menu.findOne(id, params);
+  return item;
+}
+async function getMenus(params = {}) {
+  const store = await (0, import_bom_mixer_store10.getStore)();
+  const items = await store.menu.findMany(params);
+  return items;
+}
+
 // src/layout/layout.service.ts
 async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
@@ -648,33 +660,33 @@ async function getLayout(market, locale) {
     }
     return object;
   }, {});
-  const navs = {
-    primary: tree && tree.items ? tree.items : [],
-    secondary: [],
-    footer: []
-  };
+  const menu = {};
+  const menus = await getMenus({ market, locale });
+  menus.forEach((x) => {
+    menu[x.id] = x;
+  });
   return {
-    markets,
-    market,
-    locales,
-    locale,
     labels,
-    tree,
-    navs,
+    locale,
+    locales,
+    market,
+    markets,
+    menu,
+    topLevelHrefs,
     topLevelRoutes,
-    topLevelHrefs
+    tree
   };
 }
 
 // src/list/list.service.ts
-var import_bom_mixer_store10 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store11 = require("@websolutespa/bom-mixer-store");
 async function getLists(locale) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const items = await store.list.findMany({ locale });
   return items;
 }
 async function getListByKeys(keys, locale) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const items = await store.list.findMany({ locale });
   const lists = {};
   items.filter((x) => x.key && keys.includes(x.key)).forEach((x) => {
@@ -683,19 +695,6 @@ async function getListByKeys(keys, locale) {
   return lists;
 }
 
-// src/menu/menu.service.ts
-var import_bom_mixer_store11 = require("@websolutespa/bom-mixer-store");
-async function getMenu(id) {
-  const store = await (0, import_bom_mixer_store11.getStore)();
-  const item = await store.menu.findOne(id);
-  return item;
-}
-async function getMenus() {
-  const store = await (0, import_bom_mixer_store11.getStore)();
-  const items = await store.menu.findMany();
-  return items;
-}
-
 // src/order/order.ts
 var IOrderStatus = {
   Pending: "pending",
@@ -1044,7 +1043,6 @@ async function findManyPages(schema, params) {
   return pages;
 }
 async function getPage(schema, id, market, locale) {
-  const store = await (0, import_bom_mixer_store12.getStore)();
   const page = await findOnePage(schema, id, { market, locale });
   if (page) {
     const routes = await getPageRoutes(schema, id);
@@ -1131,28 +1129,29 @@ async function getErrorPageLayout() {
   const title = resolveLabel(layout.labels, "notfound.title");
   const abstract = resolveLabel(layout.labels, "notfound.abstract");
   const page = {
-    id: "notfound",
-    schema: "notfound",
-    href: "",
+    abstract,
     alternates: [],
     breadcrumb: [],
-    title,
-    abstract,
     category: "homepage",
+    href: "",
+    id: "notfound",
+    markets: [],
     meta: {
       title,
       description: abstract,
       keywords: "",
       robots: "all"
-    }
+    },
+    schema: "notfound",
+    title
   };
   return { layout, page };
 }
 
 // src/route/route-revalidate.handler.ts
-var import_bom_mixer_core2 = require("@websolutespa/bom-mixer-core");
+var import_bom_mixer_store13 = require("@websolutespa/bom-mixer-store");
 function routeRevalidateHandler() {
-  return (0, import_bom_mixer_core2.apiHandler)({
+  return (0, import_bom_mixer_store13.apiHandler)({
     post: async (request, response) => {
       const authorization = request.headers.authorization;
       const bearer = authorization && authorization.replace("Bearer ", "");
@@ -1176,13 +1175,13 @@ function routeRevalidateHandler() {
 }
 
 // src/route/route.interceptor.ts
-var import_bom_mixer_core3 = require("@websolutespa/bom-mixer-core");
+var import_bom_mixer_store14 = require("@websolutespa/bom-mixer-store");
 var import_server = require("next/server");
 async function routeInterceptor(request, next) {
   let url = request.nextUrl;
   let route;
   try {
-    route = await (0, import_bom_mixer_core3.apiPost)("/route", { pathname: url.pathname });
+    route = await (0, import_bom_mixer_store14.apiPost)("/route", { pathname: url.pathname });
     if (!route) {
       console.log("routeInterceptor.route.notfound", url.pathname);
       return;

package/dist/index.mjs

@@ -7,9 +7,9 @@ async function getCategories(params = {}) {
 }
 async function getSegments(item, params = {}) {
   const categories = await getCategories(params);
-  return getRouteSegments(item.schema, item, categories);
+  return getRouteSegments(item, categories);
 }
-function getRouteSegments(schema, item, categories) {
+function getRouteSegments(item, categories) {
   const segments = [];
   let parentId = item.category || null;
   while (parentId != null) {
@@ -25,14 +25,13 @@ function getRouteSegments(schema, item, categories) {
     }
   }
   if (item.isDefault !== true) {
-    segments.push({
+    const segment = {
       id: item.id,
       title: item.title,
       slug: item.slug,
-      schema,
-      page: item.id,
       media: item.media
-    });
+    };
+    segments.push(segment);
   }
   return segments;
 }
@@ -62,7 +61,7 @@ async function getRegions(locale) {
 }
 
 // src/route/route.service.ts
-import { isLocalizedString, localizedToString } from "@websolutespa/bom-mixer-core";
+import { isLocalizedString, localizedToString } from "@websolutespa/bom-core";
 import { getStore as getStore5 } from "@websolutespa/bom-mixer-store";
 async function getRoutes(params = {}) {
   const store = await getStore5();
@@ -145,9 +144,9 @@ async function getBreadcrumbFromSegments(segments, market = "ww", locale = "en")
     }
   });
   const tree = segments.map((segment) => {
-    const route = segment.schema && segment.page ? routes.find(
-      (r) => r.schema === segment.schema && r.page === segment.page
-    ) : void 0;
+    const route = routes.find(
+      (r) => r.category === segment.id
+    );
     const href = route ? route.id.toString() : "/#";
     return { segment, href };
   }).map((x) => {
@@ -192,7 +191,7 @@ function categoryToRouteLink(routes, categories, category, locale = "en") {
   const route = routes.find(
     (r) => r.category === category.id
   );
-  const href = route ? route.id.toString() : "/#";
+  const href = route && route.id ? route.id.toString() : "/";
   let title = category.title || "untitled";
   if (isLocalizedString(title)) {
     title = localizedToString(title, locale);
@@ -211,7 +210,7 @@ function categoryToRouteLink(routes, categories, category, locale = "en") {
 }
 function resolveRoute(route) {
   const routepath = route.template ? route.template : route.schema;
-  const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}`;
+  const resolvedPathname = `/${route.market}/${route.locale}/${routepath}/${route.page}${route.splat || ""}`;
   return resolvedPathname;
 }
 
@@ -561,6 +560,19 @@ async function getMarkets(params = {}) {
   return items;
 }
 
+// src/menu/menu.service.ts
+import { getStore as getStore10 } from "@websolutespa/bom-mixer-store";
+async function getMenu(id, params = {}) {
+  const store = await getStore10();
+  const item = await store.menu.findOne(id, params);
+  return item;
+}
+async function getMenus(params = {}) {
+  const store = await getStore10();
+  const items = await store.menu.findMany(params);
+  return items;
+}
+
 // src/layout/layout.service.ts
 async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
@@ -579,33 +591,33 @@ async function getLayout(market, locale) {
     }
     return object;
   }, {});
-  const navs = {
-    primary: tree && tree.items ? tree.items : [],
-    secondary: [],
-    footer: []
-  };
+  const menu = {};
+  const menus = await getMenus({ market, locale });
+  menus.forEach((x) => {
+    menu[x.id] = x;
+  });
   return {
-    markets,
-    market,
-    locales,
-    locale,
     labels,
-    tree,
-    navs,
+    locale,
+    locales,
+    market,
+    markets,
+    menu,
+    topLevelHrefs,
     topLevelRoutes,
-    topLevelHrefs
+    tree
   };
 }
 
 // src/list/list.service.ts
-import { getStore as getStore10 } from "@websolutespa/bom-mixer-store";
+import { getStore as getStore11 } from "@websolutespa/bom-mixer-store";
 async function getLists(locale) {
-  const store = await getStore10();
+  const store = await getStore11();
   const items = await store.list.findMany({ locale });
   return items;
 }
 async function getListByKeys(keys, locale) {
-  const store = await getStore10();
+  const store = await getStore11();
   const items = await store.list.findMany({ locale });
   const lists = {};
   items.filter((x) => x.key && keys.includes(x.key)).forEach((x) => {
@@ -614,19 +626,6 @@ async function getListByKeys(keys, locale) {
   return lists;
 }
 
-// src/menu/menu.service.ts
-import { getStore as getStore11 } from "@websolutespa/bom-mixer-store";
-async function getMenu(id) {
-  const store = await getStore11();
-  const item = await store.menu.findOne(id);
-  return item;
-}
-async function getMenus() {
-  const store = await getStore11();
-  const items = await store.menu.findMany();
-  return items;
-}
-
 // src/order/order.ts
 var IOrderStatus = {
   Pending: "pending",
@@ -975,7 +974,6 @@ async function findManyPages(schema, params) {
   return pages;
 }
 async function getPage(schema, id, market, locale) {
-  const store = await getStore12();
   const page = await findOnePage(schema, id, { market, locale });
   if (page) {
     const routes = await getPageRoutes(schema, id);
@@ -1062,26 +1060,27 @@ async function getErrorPageLayout() {
   const title = resolveLabel(layout.labels, "notfound.title");
   const abstract = resolveLabel(layout.labels, "notfound.abstract");
   const page = {
-    id: "notfound",
-    schema: "notfound",
-    href: "",
+    abstract,
     alternates: [],
     breadcrumb: [],
-    title,
-    abstract,
     category: "homepage",
+    href: "",
+    id: "notfound",
+    markets: [],
     meta: {
       title,
       description: abstract,
       keywords: "",
       robots: "all"
-    }
+    },
+    schema: "notfound",
+    title
   };
   return { layout, page };
 }
 
 // src/route/route-revalidate.handler.ts
-import { apiHandler } from "@websolutespa/bom-mixer-core";
+import { apiHandler } from "@websolutespa/bom-mixer-store";
 function routeRevalidateHandler() {
   return apiHandler({
     post: async (request, response) => {
@@ -1107,7 +1106,7 @@ function routeRevalidateHandler() {
 }
 
 // src/route/route.interceptor.ts
-import { apiPost } from "@websolutespa/bom-mixer-core";
+import { apiPost } from "@websolutespa/bom-mixer-store";
 import { NextResponse } from "next/server";
 async function routeInterceptor(request, next) {
   let url = request.nextUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",
@@ -18,11 +18,10 @@
     "prepack": "bom prepack",
     "postpack": "bom postpack"
   },
-  "dependencies": {
-    "@websolutespa/bom-mixer-core": "*",
-    "@websolutespa/bom-mixer-store": "*"
-  },
+  "dependencies": {},
   "peerDependencies": {
+    "@websolutespa/bom-core": "*",
+    "@websolutespa/bom-mixer-store": "*",
     "next": ">= 12.3.2"
   },
   "devDependencies": {