@websolutespa/bom-mixer-models 1.10.2 → 1.10.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @websolutespa/bom-mixer-models
 
+## 1.10.3
+
+### Patch Changes
+
+- Added: IApp global
+- Updated dependencies
+  - @websolutespa/bom-mixer-store@1.10.1
+  - @websolutespa/bom-core@1.8.24
+
 ## 1.10.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { IOption, ILayout, IPage, IRouteParams, QueryParams, ICategory, IEquatable, ICategorized, IEntity, IPaginationResult, INamedEntity, ILabel, IComponent, PageProps, ILocale, IMarket, IMenu, ILocalized, IRoute, IRedirect, IRouteLink, IQuerable } from '@websolutespa/bom-core';
+import { IOption, ILayout, IPage, IRouteParams, QueryParams, ICategory, IEquatable, ICategorized, IEntity, IPaginationResult, INamedEntity, ILabel, IAppExtended, IComponent, PageProps, ILocale, IMarket, IMenu, ILocalized, IRoute, IRedirect, IRouteLink, IQuerable, IApp } from '@websolutespa/bom-core';
 import { AppProps } from 'next/app';
 import { FC, ReactNode, ComponentType } from 'react';
 import { GetServerSideProps, Redirect, NextApiRequest, NextApiResponse } from 'next';
@@ -93,7 +93,7 @@ declare function getLabels(params?: QueryParams): Promise<ILabel[]>;
 declare function getLabel(id: IEquatable, params?: QueryParams): Promise<ILabel | undefined>;
 declare function resolveLabel(labels: ILabel[], id: string): string;
 
-declare function getLayout(market: string, locale: string): Promise<ILayout>;
+declare function getLayout<T extends IAppExtended = IAppExtended>(market: string, locale: string): Promise<ILayout<T>>;
 
 type ILazyComponent = IComponent;
 type ILazyProps<T> = {
@@ -477,6 +477,7 @@ declare function getSiteMapXML(origin: string, marketId?: string, localeId?: str
 declare function getSiteMapXSL(localeId?: string): Promise<string>;
 
 type IModelStore = {
+    app: IQuerable<IApp>;
     category: IQuerable<ICategory>;
     label: IQuerable<ILabel>;
     locale: IQuerable<ILocale>;

package/dist/index.js

@@ -252,15 +252,23 @@ function resolveLabel(labels, id) {
   return label && label.text ? label.text.toString() : id;
 }
 
-// src/locale/locale.service.ts
+// src/app/app.service.ts
 var import_bom_mixer_store7 = require("@websolutespa/bom-mixer-store");
-async function getLocales(params = {}) {
+async function getApp(params = {}) {
   const store = await (0, import_bom_mixer_store7.getStore)();
+  const item = await store.app.findGlobal(params);
+  return item;
+}
+
+// src/locale/locale.service.ts
+var import_bom_mixer_store8 = require("@websolutespa/bom-mixer-store");
+async function getLocales(params = {}) {
+  const store = await (0, import_bom_mixer_store8.getStore)();
   const items = await store.locale.findMany(params);
   return items;
 }
 async function getLocale(id, params = {}) {
-  const store = await (0, import_bom_mixer_store7.getStore)();
+  const store = await (0, import_bom_mixer_store8.getStore)();
   const item = await store.locale.findOne(id, params);
   return item;
 }
@@ -269,46 +277,46 @@ function getLocaleFromProps(props) {
 }
 
 // src/market/market.service.ts
-var import_bom_mixer_store8 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store9 = require("@websolutespa/bom-mixer-store");
 async function getMarkets(params = {}) {
-  const store = await (0, import_bom_mixer_store8.getStore)();
+  const store = await (0, import_bom_mixer_store9.getStore)();
   const items = await store.market.findMany(params);
   return items;
 }
 async function getMarket(id, params = {}) {
-  const store = await (0, import_bom_mixer_store8.getStore)();
+  const store = await (0, import_bom_mixer_store9.getStore)();
   const item = await store.market.findOne(id, params);
   return item;
 }
 
 // src/menu/menu.service.ts
-var import_bom_mixer_store9 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store10 = require("@websolutespa/bom-mixer-store");
 async function getMenus(params = {}) {
-  const store = await (0, import_bom_mixer_store9.getStore)();
+  const store = await (0, import_bom_mixer_store10.getStore)();
   const items = await store.menu.findMany(params);
   return items;
 }
 async function getMenu(id, params = {}) {
-  const store = await (0, import_bom_mixer_store9.getStore)();
+  const store = await (0, import_bom_mixer_store10.getStore)();
   const item = await store.menu.findOne(id, params);
   return item;
 }
 
 // src/route/route.service.ts
 var import_bom_core3 = require("@websolutespa/bom-core");
-var import_bom_mixer_store10 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store11 = require("@websolutespa/bom-mixer-store");
 async function getRoutes(params = {}) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const routes = await store.route.findMany(params);
   return routes;
 }
 async function getRoute(id) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const route = await store.route.findOne(id);
   return route;
 }
 async function getRoutesForSchemas(schemas, market, locale) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const routes = await store.route.findMany({
     where: {
       schema: {
@@ -329,7 +337,7 @@ async function getRoutesForSchemas(schemas, market, locale) {
   return items;
 }
 async function getRoutesForTemplates(templates, market, locale) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const routes = await store.route.findMany({
     where: {
       template: {
@@ -352,10 +360,10 @@ async function getRoutesForTemplates(templates, market, locale) {
   return items;
 }
 async function getStaticPathsForSchema(schema, template) {
-  if (import_bom_mixer_store10.buildStrategy === import_bom_mixer_store10.BuildStrategy.Runtime) {
+  if (import_bom_mixer_store11.buildStrategy === import_bom_mixer_store11.BuildStrategy.Runtime) {
     return [];
   }
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const routes = await store.route.findMany({
     where: template ? {
       and: [{
@@ -376,7 +384,7 @@ async function getStaticPathsForSchema(schema, template) {
   return routes.map((x) => ({ params: { id: x.page.toString(), market: x.market, locale: x.locale } }));
 }
 async function getStaticPathsForSchemaAndFallback(schema, fallback = "blocking", template) {
-  if (import_bom_mixer_store10.buildStrategy === import_bom_mixer_store10.BuildStrategy.Runtime || fallback === "blocking" && import_bom_mixer_store10.storeStrategy !== import_bom_mixer_store10.StoreStrategy.Mock) {
+  if (import_bom_mixer_store11.buildStrategy === import_bom_mixer_store11.BuildStrategy.Runtime || fallback === "blocking" && import_bom_mixer_store11.storeStrategy !== import_bom_mixer_store11.StoreStrategy.Mock) {
     return { paths: [], fallback };
   }
   const paths = await getStaticPathsForSchema(schema, template);
@@ -418,7 +426,7 @@ async function getBreadcrumbFromSegments(segments, route) {
   return tree;
 }
 async function getRouteLinkTree(market, locale) {
-  const store = await (0, import_bom_mixer_store10.getStore)();
+  const store = await (0, import_bom_mixer_store11.getStore)();
   const routes = await store.route.findMany({
     where: {
       market: {
@@ -497,6 +505,7 @@ async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
   const locales = await getLocales({ locale });
   const labels = await getLabels({ locale });
+  const app = await getApp({ locale }) || {};
   const tree = await getRouteLinkTree(market, locale);
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
@@ -523,6 +532,7 @@ async function getLayout(market, locale) {
     locales,
     market,
     markets,
+    app,
     menu,
     topLevelHrefs,
     topLevelRoutes,
@@ -575,9 +585,9 @@ function getLink(category, layout) {
 
 // src/page/page.service.ts
 var import_bom_core4 = require("@websolutespa/bom-core");
-var import_bom_mixer_store11 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store12 = require("@websolutespa/bom-mixer-store");
 async function findOnePage(schema, id, params) {
-  const store = await (0, import_bom_mixer_store11.getStore)();
+  const store = await (0, import_bom_mixer_store12.getStore)();
   const collection = store[schema];
   if (!collection) {
     throw `PageService.findOnePage: Collection not found [${schema}]`;
@@ -591,7 +601,7 @@ async function findOnePage(schema, id, params) {
   }
 }
 async function findManyPages(schema, params) {
-  const store = await (0, import_bom_mixer_store11.getStore)();
+  const store = await (0, import_bom_mixer_store12.getStore)();
   const collection = store[schema];
   if (!collection) {
     throw `PageService.findManyPages: Collection not found [${schema}]`;
@@ -649,7 +659,7 @@ async function NotFound(market, locale) {
   return;
 }
 async function getPageRoutes(schema, id) {
-  const store = await (0, import_bom_mixer_store11.getStore)();
+  const store = await (0, import_bom_mixer_store12.getStore)();
   let routes = [];
   try {
     routes = await store.route.findMany({
@@ -671,7 +681,7 @@ async function getPageCategory(schema, page, market, locale) {
   if (!page) {
     return;
   }
-  const store = await (0, import_bom_mixer_store11.getStore)();
+  const store = await (0, import_bom_mixer_store12.getStore)();
   const pages = await findManyPages(schema, {
     where: {
       category: {
@@ -759,19 +769,19 @@ function resolveHref(href) {
 }
 
 // src/redirect/redirect.service.ts
-var import_bom_mixer_store12 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store13 = require("@websolutespa/bom-mixer-store");
 async function getRedirects(locale) {
-  const store = await (0, import_bom_mixer_store12.getStore)();
+  const store = await (0, import_bom_mixer_store13.getStore)();
   const items = await store.redirect.findMany({ locale });
   return items;
 }
 async function getRedirect(id, params = {}) {
-  const store = await (0, import_bom_mixer_store12.getStore)();
+  const store = await (0, import_bom_mixer_store13.getStore)();
   const item = await store.redirect.findOne(id, params);
   return item;
 }
 async function getRedirectsPagination(params = {}) {
-  const store = await (0, import_bom_mixer_store12.getStore)();
+  const store = await (0, import_bom_mixer_store13.getStore)();
   const pagination = await store.redirect.findPaged(params);
   return pagination;
 }
@@ -785,9 +795,9 @@ function redirectTo(layout, key = "not_found") {
 }
 
 // src/route/route-revalidate.handler.ts
-var import_bom_mixer_store13 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store14 = require("@websolutespa/bom-mixer-store");
 function routeRevalidateHandler() {
-  return (0, import_bom_mixer_store13.apiHandler)({
+  return (0, import_bom_mixer_store14.apiHandler)({
     post: async (request, response) => {
       const authorization = request.headers.authorization;
       const bearer = authorization && authorization.replace("Bearer ", "");
@@ -819,7 +829,7 @@ function routeRevalidateHandler() {
 
 // src/route/route.interceptor.ts
 var import_bom_core5 = require("@websolutespa/bom-core");
-var import_bom_mixer_store14 = require("@websolutespa/bom-mixer-store");
+var import_bom_mixer_store15 = require("@websolutespa/bom-mixer-store");
 var import_server = require("next/server");
 async function detectLocale(request, defaultLocale4) {
   const acceptLanguage = request.headers.get("accept-language")?.split(",")[0];
@@ -855,19 +865,19 @@ async function detectCountry(request, defaultMarket4) {
 }
 async function getMarkets2() {
   let routes = [];
-  if (import_bom_mixer_store14.storeStrategy === import_bom_mixer_store14.StoreStrategy.DecoratedApi) {
-    routes = await (0, import_bom_mixer_store14.localApiGet)("/market");
+  if (import_bom_mixer_store15.storeStrategy === import_bom_mixer_store15.StoreStrategy.DecoratedApi) {
+    routes = await (0, import_bom_mixer_store15.localApiGet)("/market");
   } else {
-    routes = await (0, import_bom_mixer_store14.storeApiGet)("/market");
+    routes = await (0, import_bom_mixer_store15.storeApiGet)("/market");
   }
   return routes;
 }
 async function getRootRoutes() {
   let routes = [];
-  if (import_bom_mixer_store14.storeStrategy === import_bom_mixer_store14.StoreStrategy.DecoratedApi) {
-    routes = await (0, import_bom_mixer_store14.localApiGet)("/route?where[isRoot][equals]=true");
+  if (import_bom_mixer_store15.storeStrategy === import_bom_mixer_store15.StoreStrategy.DecoratedApi) {
+    routes = await (0, import_bom_mixer_store15.localApiGet)("/route?where[isRoot][equals]=true");
   } else {
-    routes = await (0, import_bom_mixer_store14.storeApiGet)("/route?where[isRoot][equals]=true");
+    routes = await (0, import_bom_mixer_store15.storeApiGet)("/route?where[isRoot][equals]=true");
   }
   return routes;
 }
@@ -929,10 +939,10 @@ async function routeInterceptor(request, next) {
       });
       return response2;
     }
-    if (import_bom_mixer_store14.storeStrategy === import_bom_mixer_store14.StoreStrategy.DecoratedApi) {
-      route = await (0, import_bom_mixer_store14.localApiPost)("/route", { pathname: url.pathname, href: url.href, hrefBeforeRedirect });
+    if (import_bom_mixer_store15.storeStrategy === import_bom_mixer_store15.StoreStrategy.DecoratedApi) {
+      route = await (0, import_bom_mixer_store15.localApiPost)("/route", { pathname: url.pathname, href: url.href, hrefBeforeRedirect });
     } else {
-      route = await (0, import_bom_mixer_store14.storeApiPost)("/route", { pathname: url.pathname, href: url.href, hrefBeforeRedirect });
+      route = await (0, import_bom_mixer_store15.storeApiPost)("/route", { pathname: url.pathname, href: url.href, hrefBeforeRedirect });
     }
     if (!route) {
       console.log("routeInterceptor.route.notfound", url.pathname);

package/dist/index.mjs

@@ -152,15 +152,23 @@ function resolveLabel(labels, id) {
   return label && label.text ? label.text.toString() : id;
 }
 
-// src/locale/locale.service.ts
+// src/app/app.service.ts
 import { getStore as getStore7 } from "@websolutespa/bom-mixer-store";
-async function getLocales(params = {}) {
+async function getApp(params = {}) {
   const store = await getStore7();
+  const item = await store.app.findGlobal(params);
+  return item;
+}
+
+// src/locale/locale.service.ts
+import { getStore as getStore8 } from "@websolutespa/bom-mixer-store";
+async function getLocales(params = {}) {
+  const store = await getStore8();
   const items = await store.locale.findMany(params);
   return items;
 }
 async function getLocale(id, params = {}) {
-  const store = await getStore7();
+  const store = await getStore8();
   const item = await store.locale.findOne(id, params);
   return item;
 }
@@ -169,46 +177,46 @@ function getLocaleFromProps(props) {
 }
 
 // src/market/market.service.ts
-import { getStore as getStore8 } from "@websolutespa/bom-mixer-store";
+import { getStore as getStore9 } from "@websolutespa/bom-mixer-store";
 async function getMarkets(params = {}) {
-  const store = await getStore8();
+  const store = await getStore9();
   const items = await store.market.findMany(params);
   return items;
 }
 async function getMarket(id, params = {}) {
-  const store = await getStore8();
+  const store = await getStore9();
   const item = await store.market.findOne(id, params);
   return item;
 }
 
 // src/menu/menu.service.ts
-import { getStore as getStore9 } from "@websolutespa/bom-mixer-store";
+import { getStore as getStore10 } from "@websolutespa/bom-mixer-store";
 async function getMenus(params = {}) {
-  const store = await getStore9();
+  const store = await getStore10();
   const items = await store.menu.findMany(params);
   return items;
 }
 async function getMenu(id, params = {}) {
-  const store = await getStore9();
+  const store = await getStore10();
   const item = await store.menu.findOne(id, params);
   return item;
 }
 
 // src/route/route.service.ts
 import { asCategoryId, defaultLocale, defaultMarket, findRouteOfCategory, getRootCategory, localize } from "@websolutespa/bom-core";
-import { buildStrategy, BuildStrategy, getStore as getStore10, StoreStrategy, storeStrategy } from "@websolutespa/bom-mixer-store";
+import { buildStrategy, BuildStrategy, getStore as getStore11, StoreStrategy, storeStrategy } from "@websolutespa/bom-mixer-store";
 async function getRoutes(params = {}) {
-  const store = await getStore10();
+  const store = await getStore11();
   const routes = await store.route.findMany(params);
   return routes;
 }
 async function getRoute(id) {
-  const store = await getStore10();
+  const store = await getStore11();
   const route = await store.route.findOne(id);
   return route;
 }
 async function getRoutesForSchemas(schemas, market, locale) {
-  const store = await getStore10();
+  const store = await getStore11();
   const routes = await store.route.findMany({
     where: {
       schema: {
@@ -229,7 +237,7 @@ async function getRoutesForSchemas(schemas, market, locale) {
   return items;
 }
 async function getRoutesForTemplates(templates, market, locale) {
-  const store = await getStore10();
+  const store = await getStore11();
   const routes = await store.route.findMany({
     where: {
       template: {
@@ -255,7 +263,7 @@ async function getStaticPathsForSchema(schema, template) {
   if (buildStrategy === BuildStrategy.Runtime) {
     return [];
   }
-  const store = await getStore10();
+  const store = await getStore11();
   const routes = await store.route.findMany({
     where: template ? {
       and: [{
@@ -318,7 +326,7 @@ async function getBreadcrumbFromSegments(segments, route) {
   return tree;
 }
 async function getRouteLinkTree(market, locale) {
-  const store = await getStore10();
+  const store = await getStore11();
   const routes = await store.route.findMany({
     where: {
       market: {
@@ -397,6 +405,7 @@ async function getLayout(market, locale) {
   const markets = await getMarkets({ locale });
   const locales = await getLocales({ locale });
   const labels = await getLabels({ locale });
+  const app = await getApp({ locale }) || {};
   const tree = await getRouteLinkTree(market, locale);
   const firstLevelRoutes = tree?.items || [];
   const flatTopLevelRoutes = tree ? [tree, ...firstLevelRoutes] : [];
@@ -423,6 +432,7 @@ async function getLayout(market, locale) {
     locales,
     market,
     markets,
+    app,
     menu,
     topLevelHrefs,
     topLevelRoutes,
@@ -475,9 +485,9 @@ function getLink(category, layout) {
 
 // src/page/page.service.ts
 import { asCategoryId as asCategoryId2, asServerProps, defaultLocale as defaultLocale2, defaultMarket as defaultMarket2 } from "@websolutespa/bom-core";
-import { getStore as getStore11 } from "@websolutespa/bom-mixer-store";
+import { getStore as getStore12 } from "@websolutespa/bom-mixer-store";
 async function findOnePage(schema, id, params) {
-  const store = await getStore11();
+  const store = await getStore12();
   const collection = store[schema];
   if (!collection) {
     throw `PageService.findOnePage: Collection not found [${schema}]`;
@@ -491,7 +501,7 @@ async function findOnePage(schema, id, params) {
   }
 }
 async function findManyPages(schema, params) {
-  const store = await getStore11();
+  const store = await getStore12();
   const collection = store[schema];
   if (!collection) {
     throw `PageService.findManyPages: Collection not found [${schema}]`;
@@ -549,7 +559,7 @@ async function NotFound(market, locale) {
   return;
 }
 async function getPageRoutes(schema, id) {
-  const store = await getStore11();
+  const store = await getStore12();
   let routes = [];
   try {
     routes = await store.route.findMany({
@@ -571,7 +581,7 @@ async function getPageCategory(schema, page, market, locale) {
   if (!page) {
     return;
   }
-  const store = await getStore11();
+  const store = await getStore12();
   const pages = await findManyPages(schema, {
     where: {
       category: {
@@ -659,19 +669,19 @@ function resolveHref(href) {
 }
 
 // src/redirect/redirect.service.ts
-import { getStore as getStore12 } from "@websolutespa/bom-mixer-store";
+import { getStore as getStore13 } from "@websolutespa/bom-mixer-store";
 async function getRedirects(locale) {
-  const store = await getStore12();
+  const store = await getStore13();
   const items = await store.redirect.findMany({ locale });
   return items;
 }
 async function getRedirect(id, params = {}) {
-  const store = await getStore12();
+  const store = await getStore13();
   const item = await store.redirect.findOne(id, params);
   return item;
 }
 async function getRedirectsPagination(params = {}) {
-  const store = await getStore12();
+  const store = await getStore13();
   const pagination = await store.redirect.findPaged(params);
   return pagination;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",

package/src/app/app.service.ts

@@ -0,0 +1,9 @@
+import { IApp, IAppExtended, QueryParams } from '@websolutespa/bom-core';
+import { getStore } from '@websolutespa/bom-mixer-store';
+import { IModelStore } from '../store/store';
+
+export async function getApp<T extends IAppExtended = IAppExtended>(params: QueryParams = {}): Promise<IApp<T> | undefined> {
+  const store = await getStore<IModelStore>();
+  const item = await store.app.findGlobal(params);
+  return item as IApp<T>;
+}

package/src/layout/layout.service.ts

@@ -1,17 +1,19 @@
-import { ILabel, ILayout, ILocale, ILocalizedMenu, IMarket, IRouteLink } from '@websolutespa/bom-core';
+import { IApp, IAppExtended, ILabel, ILayout, ILocale, ILocalizedMenu, IMarket, IRouteLink } from '@websolutespa/bom-core';
+import { getApp } from '../app/app.service';
 import { getLabels } from '../label/label.service';
 import { getLocales } from '../locale/locale.service';
 import { getMarkets } from '../market/market.service';
 import { getMenus } from '../menu/menu.service';
 import { getRouteLinkTree } from '../route/route.service';
 
-export async function getLayout(market: string, locale: string): Promise<ILayout> {
+export async function getLayout<T extends IAppExtended = IAppExtended>(market: string, locale: string): Promise<ILayout<T>> {
   const markets: IMarket[] = await getMarkets({ locale });
   // console.log('markets', markets);
   const locales: ILocale[] = await getLocales({ locale });
   // console.log('locales', locales);
   const labels: ILabel[] = await getLabels({ locale });
   // console.log('labels', labels);
+  const app = (await getApp<T>({ locale }) || {}) as IApp<T>;
   const tree = await getRouteLinkTree(market, locale);
   // console.log('tree', tree);
   const firstLevelRoutes = tree?.items || [];
@@ -46,6 +48,7 @@ export async function getLayout(market: string, locale: string): Promise<ILayout
     locales,
     market,
     markets,
+    app,
     menu,
     topLevelHrefs,
     topLevelRoutes,

package/src/store/store.ts

@@ -1,6 +1,7 @@
-import { ICategory, IEntity, ILabel, ILocale, IMarket, IMenu, INamedEntity, IQuerable, IRedirect, IRoute } from '@websolutespa/bom-core';
+import { IApp, ICategory, IEntity, ILabel, ILocale, IMarket, IMenu, INamedEntity, IQuerable, IRedirect, IRoute } from '@websolutespa/bom-core';
 
 export type IModelStore = {
+  app: IQuerable<IApp>;
   category: IQuerable<ICategory>;
   label: IQuerable<ILabel>;
   locale: IQuerable<ILocale>;