@websolutespa/bom-mixer-store 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.2
+
+### Patch Changes
+
+- Modified: getRemoteStoreStaticBuild_
+
+## 1.8.1
+
+### Patch Changes
+
+- 15ad595: Modified: getRemoteApiRequestOptions added user Bearer
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -4,10 +4,10 @@ import { NextRequest } from 'next/server';
 import * as _websolutespa_bom_mixer_store from '@websolutespa/bom-mixer-store';
 
 type ApiRequestOptions = FetchRequestOptions;
-/**
- * !!! todo: evaluate authenticated end user bearer
- */
 declare function getLocalApiRequestOptions(): ApiRequestOptions;
+declare const REMOTE_API_SESSION: {
+    token: string | null;
+};
 declare function getRemoteApiRequestOptions(): ApiRequestOptions;
 
 type ICrudMethod = 'get' | 'post' | 'put' | 'patch' | 'delete' | string;
@@ -242,4 +242,4 @@ declare function getStore<T extends IStore>(): Promise<T>;
 
 declare function varsHandler(): _websolutespa_bom_mixer_store.IHandler<any>;
 
-export { ApiRequestOptions, BuildStrategy, COLLECTIONS, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, RemoteMenuService, RemotePageService, RemoteService, RemoteServiceStrategy, SERVICE_DEFAULT_DEPTH, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_, decorateStaticRelation_, decorateStaticRelations_, errorHandler, findRoute, fromCache, getLocalApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteApiRequestOptions, getRemoteApiUrl, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, optimizeMany_, optimizeOne_, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy, varsHandler };
+export { ApiRequestOptions, BuildStrategy, COLLECTIONS, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, REMOTE_API_SESSION, RemoteMenuService, RemotePageService, RemoteService, RemoteServiceStrategy, SERVICE_DEFAULT_DEPTH, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectionDelete, collectionGet, collectionPatch, collectionPost, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateLocalizable_, decorateLocalizables_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateRelation_, decorateRelations_, decorateSchema_, decorateSchemas_, decorateStaticRelation_, decorateStaticRelations_, errorHandler, findRoute, fromCache, getLocalApiRequestOptions, getLocalApiUrl, getMockStore, getMockStoreFromData_, getRemoteApiRequestOptions, getRemoteApiUrl, getRemoteStore, getStore, isApiRequest, isNextRequest, isStaticRequest, localApiDelete, localApiFetch, localApiGet, localApiPatch, localApiPost, localApiPut, mockApiDelete, mockApiFetch, mockApiGet, mockApiPatch, mockApiPost, mockApiPut, mockHandler, nextPhase, optimizeMany_, optimizeOne_, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy, varsHandler };

package/dist/index.js

@@ -39,6 +39,7 @@ __export(src_exports, {
   MockPageService: () => MockPageService,
   MockService: () => MockService,
   NextPhase: () => NextPhase,
+  REMOTE_API_SESSION: () => REMOTE_API_SESSION,
   RemoteMenuService: () => RemoteMenuService,
   RemotePageService: () => RemotePageService,
   RemoteService: () => RemoteService,
@@ -126,20 +127,26 @@ function getLocalApiRequestOptions() {
     headers: {}
   };
 }
+var REMOTE_API_SESSION = {
+  token: null
+};
 function getRemoteApiRequestOptions() {
-  return {
-    // mode: 'cors',
-    headers: {
-      /**
-       * guest user api key (users)
-       */
-      Authorization: `users API-Key ${process.env.STORE_API_KEY}`
-      /**
-       * authenticated end user bearer (end_users)
-       */
-      // Authorization: `Bearer ${bearer}`,
-    }
-  };
+  if (REMOTE_API_SESSION.token) {
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `Bearer ${REMOTE_API_SESSION.token}`
+        // Authorization: `JWT ${REMOTE_API_SESSION.token}`,
+      }
+    };
+  } else {
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `users API-Key ${process.env.STORE_API_KEY}`
+      }
+    };
+  }
 }
 
 // src/api/api.handler.ts
@@ -512,7 +519,7 @@ async function decorateNav_(store, item, params = {}, routes) {
   const navs = collectNavs_(item);
   for (const nav of navs) {
     const decoratedNav = decorateNav__(nav, routes);
-    nav.nav = decoratedNav.nav;
+    Object.assign(nav, decoratedNav);
   }
   return item;
 }
@@ -542,14 +549,13 @@ function collectNavs_(item, navs = []) {
   return navs;
 }
 function decorateNav__(item, routes) {
-  const { nav, ...undecorated } = item;
-  if (nav !== void 0) {
-    const decorated = { ...undecorated };
+  let decoratedNav = item;
+  if (item !== void 0) {
     const route = routes.find(
-      (x) => x.page === nav.page.value && x.schema === nav.page.relationTo
+      (x) => x.page === item.page.value && x.schema === item.page.relationTo
     );
     if (route) {
-      decorated.nav = {
+      decoratedNav = {
         type: "page",
         id: route.page,
         href: route.id,
@@ -558,9 +564,8 @@ function decorateNav__(item, routes) {
         schema: route.schema
       };
     }
-    return decorated;
   }
-  return undecorated;
+  return decoratedNav;
 }
 
 // src/decorators/optimize.ts
@@ -1429,6 +1434,9 @@ function getRemoteApiUrl(pathname) {
   return url;
 }
 async function remoteApiFetch(pathname, options = {}) {
+  if (import_bom_core12.isBrowser) {
+    throw "Unauthorized: remote api cannot be fetched client side";
+  }
   const url = getRemoteApiUrl(pathname);
   const apiOptions = (0, import_bom_core12.merge)({ ...getRemoteApiRequestOptions() }, options);
   console.log("remoteApiFetch", apiOptions.method, url);
@@ -1472,9 +1480,13 @@ var RemoteService = class {
     const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
-    const item = await remoteApiGet(url);
-    if (item) {
-      return await this.decorateOne_(item, params);
+    try {
+      const item = await remoteApiGet(url);
+      if (item) {
+        return await this.decorateOne_(item, params);
+      }
+    } catch (error) {
+      console.log("RemoteService", this.key, "findOne.error");
     }
     return;
   }
@@ -1504,13 +1516,15 @@ var RemoteService = class {
   // !!! todo params
   async create(payload) {
     const url = `/${this.key}`;
-    const item = await remoteApiPost(url, payload);
+    const result = await remoteApiPost(url, payload);
+    const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
   // !!! todo params
   async update(payload) {
     const url = `/${this.key}`;
-    const item = await remoteApiPut(url, payload);
+    const result = await remoteApiPut(url, payload);
+    const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
   // !!! todo params
@@ -1634,17 +1648,14 @@ async function getRemoteStore_() {
 async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
-    const store = {};
+    let store = {};
     const url = "/store";
     const json = await remoteApiGet(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach((key) => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map((key) => [key, json[key] || []])
+      );
+      store = getMockStoreFromData_(data);
     }
     return store;
   }, "STORE_BUILD_");
@@ -2172,7 +2183,7 @@ function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
   const media = category.media || route?.media;
-  const schema = route?.schema || category?.schema || "unknown";
+  const schema = route?.template || route?.schema || category?.schema || "unknown";
   const title = (0, import_bom_core15.localize)(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
@@ -2201,7 +2212,7 @@ async function getLayout(market, locale) {
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
+    if (routeLink.href && (!object[routeLink.schema] || routeLink.schema === routeLink.category)) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;
@@ -2376,6 +2387,7 @@ function varsHandler() {
   MockPageService,
   MockService,
   NextPhase,
+  REMOTE_API_SESSION,
   RemoteMenuService,
   RemotePageService,
   RemoteService,

package/dist/index.mjs

@@ -12,20 +12,26 @@ function getLocalApiRequestOptions() {
     headers: {}
   };
 }
+var REMOTE_API_SESSION = {
+  token: null
+};
 function getRemoteApiRequestOptions() {
-  return {
-    // mode: 'cors',
-    headers: {
-      /**
-       * guest user api key (users)
-       */
-      Authorization: `users API-Key ${process.env.STORE_API_KEY}`
-      /**
-       * authenticated end user bearer (end_users)
-       */
-      // Authorization: `Bearer ${bearer}`,
-    }
-  };
+  if (REMOTE_API_SESSION.token) {
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `Bearer ${REMOTE_API_SESSION.token}`
+        // Authorization: `JWT ${REMOTE_API_SESSION.token}`,
+      }
+    };
+  } else {
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `users API-Key ${process.env.STORE_API_KEY}`
+      }
+    };
+  }
 }
 
 // src/api/api.handler.ts
@@ -408,7 +414,7 @@ async function decorateNav_(store, item, params = {}, routes) {
   const navs = collectNavs_(item);
   for (const nav of navs) {
     const decoratedNav = decorateNav__(nav, routes);
-    nav.nav = decoratedNav.nav;
+    Object.assign(nav, decoratedNav);
   }
   return item;
 }
@@ -438,14 +444,13 @@ function collectNavs_(item, navs = []) {
   return navs;
 }
 function decorateNav__(item, routes) {
-  const { nav, ...undecorated } = item;
-  if (nav !== void 0) {
-    const decorated = { ...undecorated };
+  let decoratedNav = item;
+  if (item !== void 0) {
     const route = routes.find(
-      (x) => x.page === nav.page.value && x.schema === nav.page.relationTo
+      (x) => x.page === item.page.value && x.schema === item.page.relationTo
     );
     if (route) {
-      decorated.nav = {
+      decoratedNav = {
         type: "page",
         id: route.page,
         href: route.id,
@@ -454,9 +459,8 @@ function decorateNav__(item, routes) {
         schema: route.schema
       };
     }
-    return decorated;
   }
-  return undecorated;
+  return decoratedNav;
 }
 
 // src/decorators/optimize.ts
@@ -1325,6 +1329,9 @@ function getRemoteApiUrl(pathname) {
   return url;
 }
 async function remoteApiFetch(pathname, options = {}) {
+  if (isBrowser3) {
+    throw "Unauthorized: remote api cannot be fetched client side";
+  }
   const url = getRemoteApiUrl(pathname);
   const apiOptions = merge3({ ...getRemoteApiRequestOptions() }, options);
   console.log("remoteApiFetch", apiOptions.method, url);
@@ -1368,9 +1375,13 @@ var RemoteService = class {
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
-    const item = await remoteApiGet(url);
-    if (item) {
-      return await this.decorateOne_(item, params);
+    try {
+      const item = await remoteApiGet(url);
+      if (item) {
+        return await this.decorateOne_(item, params);
+      }
+    } catch (error) {
+      console.log("RemoteService", this.key, "findOne.error");
     }
     return;
   }
@@ -1400,13 +1411,15 @@ var RemoteService = class {
   // !!! todo params
   async create(payload) {
     const url = `/${this.key}`;
-    const item = await remoteApiPost(url, payload);
+    const result = await remoteApiPost(url, payload);
+    const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
   // !!! todo params
   async update(payload) {
     const url = `/${this.key}`;
-    const item = await remoteApiPut(url, payload);
+    const result = await remoteApiPut(url, payload);
+    const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
   // !!! todo params
@@ -1530,17 +1543,14 @@ async function getRemoteStore_() {
 async function getRemoteStoreStaticBuild_() {
   return fromCache(async () => {
     console.log("getRemoteStoreStaticBuild_");
-    const store = {};
+    let store = {};
     const url = "/store";
     const json = await remoteApiGet(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach((key) => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map((key) => [key, json[key] || []])
+      );
+      store = getMockStoreFromData_(data);
     }
     return store;
   }, "STORE_BUILD_");
@@ -2068,7 +2078,7 @@ function newRouteLink(category, route, locale) {
   const href = route && route.id ? route.id.toString() : "/";
   const id = route?.page || category.id;
   const media = category.media || route?.media;
-  const schema = route?.schema || category?.schema || "unknown";
+  const schema = route?.template || route?.schema || category?.schema || "unknown";
   const title = localize(category.title || route?.title || "untitled", locale);
   const routeLink = {
     category: category.id,
@@ -2097,7 +2107,7 @@ async function getLayout(market, locale) {
     return object;
   }, {});
   const topLevelHrefs = flatTopLevelRoutes.reduce((object, routeLink) => {
-    if (routeLink.href && !object[routeLink.schema] || routeLink.schema === routeLink.category) {
+    if (routeLink.href && (!object[routeLink.schema] || routeLink.schema === routeLink.category)) {
       object[routeLink.schema] = routeLink.href;
     }
     return object;
@@ -2271,6 +2281,7 @@ export {
   MockPageService,
   MockService,
   NextPhase,
+  REMOTE_API_SESSION,
   RemoteMenuService,
   RemotePageService,
   RemoteService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-store",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",
@@ -27,7 +27,7 @@
   },
   "peerDependencies": {
     "@websolutespa/bom-core": "*",
-    "iron-session": ">= 6.2.1",
+    "iron-session": ">= 8.0.3",
     "next": ">= 14.1.4"
   },
   "devDependencies": {

package/src/api/api.ts

@@ -2,10 +2,6 @@ import { FetchRequestOptions } from '@websolutespa/bom-core';
 
 export type ApiRequestOptions = FetchRequestOptions;
 
-/**
- * !!! todo: evaluate authenticated end user bearer
- */
-
 export function getLocalApiRequestOptions(): ApiRequestOptions {
   return {
     headers: {
@@ -13,18 +9,31 @@ export function getLocalApiRequestOptions(): ApiRequestOptions {
   };
 }
 
+export const REMOTE_API_SESSION: { token: string | null } = {
+  token: null,
+};
+
 export function getRemoteApiRequestOptions(): ApiRequestOptions {
-  return {
-    // mode: 'cors',
-    headers: {
-      /**
-       * guest user api key (users)
-       */
-      Authorization: `users API-Key ${process.env.STORE_API_KEY}`,
-      /**
-       * authenticated end user bearer (end_users)
-       */
-      // Authorization: `Bearer ${bearer}`,
-    },
-  };
+  if (REMOTE_API_SESSION.token) {
+    /**
+     * authenticated end user JWT token bearer (end_users)
+     */
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `Bearer ${REMOTE_API_SESSION.token}`,
+        // Authorization: `JWT ${REMOTE_API_SESSION.token}`,
+      },
+    };
+  } else {
+    /**
+     * guest user api key (users)
+     */
+    return {
+      // mode: 'cors',
+      headers: {
+        Authorization: `users API-Key ${process.env.STORE_API_KEY}`,
+      },
+    };
+  }
 }

package/src/decorators/nav.ts

@@ -1,4 +1,4 @@
-import { IDecoratedNav, IEquatable, IMenuPage, IRoute, ISchema, IStore, IUndecoratedNav, QueryParams, isArray, isObject, isUndecoratedNav } from '@websolutespa/bom-core';
+import { IDecoratedNav, IEquatable, IRoute, ISchema, IStore, IUndecoratedNav, QueryParams, isArray, isObject, isUndecoratedNav } from '@websolutespa/bom-core';
 
 export async function decorateNav_<T extends ISchema = ISchema>(store: IStore, item: T, params: QueryParams = {}, routes?: IRoute[]): Promise<T> {
   if (!routes) {
@@ -12,7 +12,8 @@ export async function decorateNav_<T extends ISchema = ISchema>(store: IStore, i
   const navs = collectNavs_(item);
   for (const nav of navs) {
     const decoratedNav = decorateNav__(nav, routes);
-    (nav as IDecoratedNav<T>).nav = decoratedNav.nav;
+    Object.assign(nav, decoratedNav);
+    // (nav as IDecoratedNav<T>).nav = decoratedNav.nav;
   }
   return item;
 }
@@ -31,8 +32,8 @@ export async function decorateNavs_<T extends ISchema = ISchema>(store: IStore,
 }
 
 // collecting navs recursively
-function collectNavs_<T>(item: unknown, navs: IUndecoratedNav<T>[] = []): IUndecoratedNav<T>[] {
-  if (isUndecoratedNav<T>(item)) {
+function collectNavs_(item: unknown, navs: IUndecoratedNav[] = []): IUndecoratedNav[] {
+  if (isUndecoratedNav(item)) {
     navs.push(item);
   }
   // console.log(item, isUndecoratedNav<T>(item));
@@ -46,16 +47,15 @@ function collectNavs_<T>(item: unknown, navs: IUndecoratedNav<T>[] = []): IUndec
   return navs;
 }
 
-function decorateNav__<T>(item: IUndecoratedNav<T>, routes: IRoute[]): IDecoratedNav<T> {
-  const { nav, ...undecorated } = item;
-  if (nav !== undefined) {
-    const decorated = { ...undecorated } as { nav?: IMenuPage };
+function decorateNav__(item: IUndecoratedNav, routes: IRoute[]): IDecoratedNav {
+  let decoratedNav = item as unknown as IDecoratedNav;
+  if (item !== undefined) {
     const route = routes.find(x =>
-      x.page === (nav.page.value as unknown as IEquatable) &&
-      x.schema === nav.page.relationTo
+      x.page === (item.page.value as unknown as IEquatable) &&
+      x.schema === item.page.relationTo
     );
     if (route) {
-      decorated.nav = {
+      decoratedNav = {
         type: 'page',
         id: route.page,
         href: route.id,
@@ -64,7 +64,6 @@ function decorateNav__<T>(item: IUndecoratedNav<T>, routes: IRoute[]): IDecorate
         schema: route.schema,
       };
     }
-    return decorated as IDecoratedNav<T>;
   }
-  return undecorated as IDecoratedNav<T>;
+  return decoratedNav;
 }

package/src/index.ts

@@ -10,7 +10,6 @@ export * from './mock/mock.api';
 export * from './mock/mock.handler';
 export * from './mock/mock.service';
 export * from './mock/mock.store';
-// export * from './session/session.handler';
 export * from './remote/remote-menu.service';
 export * from './remote/remote-page.service';
 export * from './remote/remote.api';

package/src/remote/remote.api.ts

@@ -17,9 +17,13 @@ export function getRemoteApiUrl(pathname: string): string {
 }
 
 export async function remoteApiFetch<T = unknown>(pathname: string, options: ApiRequestOptions = {}): Promise<T> {
+  if (isBrowser) {
+    throw 'Unauthorized: remote api cannot be fetched client side';
+  }
   const url = getRemoteApiUrl(pathname);
   const apiOptions = merge({ ...getRemoteApiRequestOptions() }, options);
   console.log('remoteApiFetch', apiOptions.method, url);
+  // console.log('remoteApiFetch', 'Authorization', apiOptions.headers?.Authorization);
   const apiResponse = await httpFetch(url, apiOptions);
   return apiResponse;
 }

package/src/remote/remote.service.ts

@@ -32,9 +32,13 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     const search = query ? `?${query}` : '';
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
     // console.log('RemoteService', this.key, 'findOne', url);
-    const item = await remoteApiGet<B>(url);
-    if (item) {
-      return await this.decorateOne_(item, params);
+    try {
+      const item = await remoteApiGet<B>(url);
+      if (item) {
+        return await this.decorateOne_(item, params);
+      }
+    } catch (error) {
+      console.log('RemoteService', this.key, 'findOne.error');
     }
     return;
   }
@@ -70,7 +74,8 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
   async create<B extends T = T>(payload: Omit<B, 'id'>): Promise<B> {
     const url = `/${this.key}`;
     // console.log('RemoteService', this.key, 'create', url);
-    const item = await remoteApiPost<B>(url, payload);
+    const result = await remoteApiPost<B | { doc: B }>(url, payload);
+    const item = (result.doc ? result.doc : result) as B;
     return await this.decorateOne_(item, {});
   }
 
@@ -78,7 +83,8 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
   async update<B extends T = T>(payload: Partial<B>): Promise<B> {
     const url = `/${this.key}`;
     // console.log('RemoteService', this.key, 'update', url);
-    const item = await remoteApiPut<B>(url, payload);
+    const result = await remoteApiPut<B | { doc: B }>(url, payload);
+    const item = (result.doc ? result.doc : result) as B;
     return await this.decorateOne_(item, {});
   }
 

package/src/remote/remote.store.ts

@@ -1,7 +1,6 @@
 import { 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';
 import { getMockStore, getMockStoreFromData_ } from '../mock/mock.store';
 import { BuildStrategy, COLLECTIONS, KNOWN_COLLECTIONS, MOCK_COLLECTIONS, NextPhase, StoreStrategy, buildStrategy, nextPhase, storeStrategy } from '../store/store';
 import { RemoteMenuService } from './remote-menu.service';
@@ -49,17 +48,14 @@ async function getRemoteStore_<T extends IStore>(): Promise<T> {
 async function getRemoteStoreStaticBuild_<T extends IStore>(): Promise<T> {
   return fromCache<T>(async () => {
     console.log('getRemoteStoreStaticBuild_');
-    const store: IStore = {};
+    let store: IStore = {};
     const url = '/store';
     const json = await remoteApiGet<IMemoryStore>(url);
     if (json != null) {
-      const collections = Object.keys(json);
-      collections.sort();
-      collections.forEach(key => {
-        if (json[key]) {
-          store[key] = new MockService(json[key], store);
-        }
-      });
+      const data = Object.fromEntries(
+        COLLECTIONS.map(key => ([key, json[key] || []]))
+      );
+      store = getMockStoreFromData_(data);
     }
     return store as T;
   }, 'STORE_BUILD_');

package/src/vars/vars.handler.ts

@@ -13,13 +13,13 @@ const getFilteredEnv = (env: Record<string, unknown>): Record<string, unknown> =
   ));
   entries.sort();
   return Object.fromEntries(entries);
-}
+};
 
 const sortKeys = (object?: Record<string, unknown>): Record<string, unknown> => {
   const entries = Object.entries(object || {});
   entries.sort();
   return Object.fromEntries(entries);
-}
+};
 
 export function varsHandler() {
   return apiHandler({
@@ -43,7 +43,7 @@ export function varsHandler() {
           headers: { ...sortKeys(request.headers) },
           env: { ...getFilteredEnv(process.env) },
           layout: { ...sortKeys(layout) },
-        }
+        };
         if (!(request.headers.accept?.includes('text/html'))) {
           return response.status(200).json(info);
         }

package/src/session/session.handler.ts

@@ -1,61 +0,0 @@
-import { httpDelete, httpGet, httpPost } from '@websolutespa/bom-core';
-import { apiHandler } from '@websolutespa/bom-mixer-store';
-import { IronSessionOptions } from 'iron-session/edge';
-import { withIronSessionApiRoute } from 'iron-session/next';
-import { NextApiRequest, NextApiResponse } from 'next';
-import { StateStorage } from 'zustand/middleware';
-
-function sessionGet(request: NextApiRequest, response: NextApiResponse<string | null>) {
-  const { key } = request.query;
-  const session: { [key: string]: string | null } = request.session as any;
-  if (session[key as string]) {
-    response.status(200).json(session[key as string]);
-  } else {
-    response.status(200).json(null);
-  }
-}
-
-async function sessionPost(request: NextApiRequest, response: NextApiResponse<null>) {
-  const { key } = request.query;
-  const body = request.body;
-  const session: { [key: string]: string | null } = request.session as any;
-  // console.log('body', body);
-  session[key as string] = body.value;
-  // console.log('session', session);
-  await request.session.save();
-  response.status(200).json(null);
-}
-
-async function sessionDelete(request: NextApiRequest, response: NextApiResponse<null>) {
-  const { key } = request.query;
-  const session: { [key: string]: string | null } = request.session as any;
-  session[key as string] = null;
-  await request.session.save();
-  response.status(200).json(null);
-}
-
-export type ISessionHandler = (request: NextApiRequest, response: NextApiResponse) => Promise<void>;
-
-export function sessionHandler<T extends {}>(sessionOptions: IronSessionOptions) {
-  return apiHandler({
-    get: withIronSessionApiRoute(sessionGet, sessionOptions) as ISessionHandler,
-    post: withIronSessionApiRoute(sessionPost, sessionOptions) as ISessionHandler,
-    delete: withIronSessionApiRoute(sessionDelete, sessionOptions) as ISessionHandler,
-  });
-}
-
-export const IronSessionStorage: StateStorage = {
-  getItem: async (name: string) => {
-    const value = await httpGet(`/api/__session/${name}`);
-    // console.log('IronSessionStorage.getItem', name, value);
-    return value;
-  },
-  setItem: async (name: string, value: string) => {
-    // console.log('IronSessionStorage.setItem', name, { cart: value });
-    await httpPost(`/api/__session/${name}`, { value });
-  },
-  removeItem: async (name: string) => {
-    // console.log('IronSessionStorage.removeItem', name);
-    await httpDelete(`/api/__session/${name}`);
-  },
-};