@websolutespa/bom-mixer-store 1.8.12 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-store
 
+## 1.10.0
+
+### Patch Changes
+
+- Modified: remote.service, Added: preview.handler
+
+## 1.8.13
+
+### Patch Changes
+
+- Fixing: decorators collectRelations\_ depth 0
+
 ## 1.8.12
 
 ### Patch Changes

package/dist/index.d.ts

@@ -132,9 +132,8 @@ declare function mockHandler(): IHandler<any>;
 declare function getMockStoreFromData_<T extends IStore>(data?: IMemoryStore): T;
 declare function getMockStore<T extends IStore = IStore>(): Promise<T>;
 
-declare const RemoteServiceStrategy: {
-    draft: boolean;
-};
+declare function previewHandler(): IHandler<any>;
+
 /**
  * This service handle call to remote api (bowl or over)
  */
@@ -252,4 +251,4 @@ declare function getStore<T extends IStore>(): Promise<T>;
 
 declare function varsHandler(): IHandler<any>;
 
-export { ApiRequestOptions, BuildStrategy, COLLECTIONS, DEFAULT_DEPTH, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, RemoteMenuService, RemotePageService, RemoteService, RemoteServiceStrategy, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectCategory_, 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, DEFAULT_DEPTH, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, RemoteMenuService, RemotePageService, RemoteService, STATIC_COLLECTIONS, StaticService, StaticServiceConfig, StaticServiceSrc, StoreStrategy, apiHandler, buildStrategy, collectCategory_, 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_, previewHandler, remoteApiDelete, remoteApiFetch, remoteApiGet, remoteApiPatch, remoteApiPost, remoteApiPut, routePost, staticCollections, storeApiDelete, storeApiGet, storeApiPatch, storeApiPost, storeApiPut, storeCacheDuration, storeHandler, storeIndexHandler, storeStrategy, varsHandler };

package/dist/index.js

@@ -43,7 +43,6 @@ __export(src_exports, {
   RemoteMenuService: () => RemoteMenuService,
   RemotePageService: () => RemotePageService,
   RemoteService: () => RemoteService,
-  RemoteServiceStrategy: () => RemoteServiceStrategy,
   STATIC_COLLECTIONS: () => STATIC_COLLECTIONS,
   StaticService: () => StaticService,
   StoreStrategy: () => StoreStrategy,
@@ -100,6 +99,7 @@ __export(src_exports, {
   nextPhase: () => nextPhase,
   optimizeMany_: () => optimizeMany_,
   optimizeOne_: () => optimizeOne_,
+  previewHandler: () => previewHandler,
   remoteApiDelete: () => remoteApiDelete,
   remoteApiFetch: () => remoteApiFetch,
   remoteApiGet: () => remoteApiGet,
@@ -606,9 +606,6 @@ async function optimizeMany_(items) {
 var import_bom_core5 = require("@websolutespa/bom-core");
 async function decorateRelation_(store, item, params = {}) {
   const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
-  if (depth === 0) {
-    return item;
-  }
   item = await collectRelations_({ store, params, depth }, item);
   return item;
 }
@@ -620,6 +617,9 @@ async function decorateRelations_(store, items, params = {}) {
 }
 async function collectRelations_(context, item, relations = []) {
   if ((0, import_bom_core5.isUnresolvedRelation)(item)) {
+    if (context.depth === 0) {
+      return item.value;
+    }
     const index = relations.findIndex(
       (x) => x.relationTo === item.relationTo && x.value === item.value
     );
@@ -1528,9 +1528,6 @@ async function remoteApiDelete(url, options = {}) {
 }
 
 // src/remote/remote.service.ts
-var RemoteServiceStrategy = {
-  draft: false
-};
 var RemoteService = class {
   constructor(key, store) {
     if (!key) {
@@ -1544,7 +1541,6 @@ var RemoteService = class {
   }
   async findOne(id, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
@@ -1560,7 +1556,6 @@ var RemoteService = class {
   }
   async findMany(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
@@ -1571,7 +1566,6 @@ var RemoteService = class {
   }
   async findPaged(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
@@ -1583,7 +1577,6 @@ var RemoteService = class {
   }
   async create(payload, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
@@ -1601,7 +1594,6 @@ var RemoteService = class {
   }
   async updateMany(payload, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
@@ -1619,7 +1611,6 @@ var RemoteService = class {
   }
   async deleteMany(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = (0, import_bom_core14.qsSerialize)(params);
     const search = query ? `?${query}` : "";
@@ -2242,6 +2233,23 @@ function mockHandler() {
   return storeHandler(async () => await getMockStore());
 }
 
+// src/preview/preview.handler.ts
+function previewHandler() {
+  return apiHandler({
+    options: async (request, response) => {
+      response.status(200).end();
+    },
+    get: async (request, response) => {
+      const query = request.query;
+      const { marketId, localeId, templateId, documentId, _status } = query;
+      const destination = `/${marketId}/${localeId}/${templateId}/${documentId}${query._live ? "?_live=true" : ""}`;
+      response.setPreviewData({ _status });
+      response.setDraftMode({ enable: true });
+      response.redirect(307, destination);
+    }
+  });
+}
+
 // src/store/store.api.ts
 var storeApiFetch = storeStrategy === "mock" /* Mock */ ? localApiFetch : remoteApiFetch;
 async function storeApiGet(url, options = {}) {
@@ -2308,23 +2316,29 @@ async function getRouteLinkTree(market, locale) {
   const categories = await store.category.findMany({ market, locale });
   const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
   if (rootCategory) {
-    const root = categoryToRouteLink(routes, categories, rootCategory, locale);
+    const root = getRouteLinkCategory(locale, routes, categories, rootCategory, rootCategory);
     return root;
   }
   return void 0;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
+function getRouteLinkCategory(locale, routes, categories, rootCategory, category) {
   const route = (0, import_bom_core16.findRouteOfCategory)(routes, category.id);
-  if (!route) {
-    return void 0;
-  }
-  const rootCategory = (0, import_bom_core16.getRootCategory)(categories);
-  const childCategories = categories.filter((x) => {
-    const parentId = (0, import_bom_core16.asCategoryId)(x.category);
-    return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
-  });
+  const otherCategories = categories.filter((x) => x.id !== category.id);
+  const childCategories = otherCategories.filter((x) => (0, import_bom_core16.asCategoryId)(x.category) === category.id);
   const routeLink = newRouteLink(category, route, locale);
-  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  const items = [];
+  for (const childCategory of childCategories) {
+    const itemOrItems = getRouteLinkCategory(locale, routes, otherCategories, rootCategory, childCategory);
+    if (Array.isArray(itemOrItems)) {
+      items.push(...itemOrItems);
+    } else if (itemOrItems) {
+      items.push(itemOrItems);
+    }
+  }
+  if (!route || category.isHidden && category.id !== rootCategory.id) {
+    return items;
+  }
+  routeLink.items = items;
   return routeLink;
 }
 function newRouteLink(category, route, locale) {
@@ -2539,7 +2553,6 @@ function varsHandler() {
   RemoteMenuService,
   RemotePageService,
   RemoteService,
-  RemoteServiceStrategy,
   STATIC_COLLECTIONS,
   StaticService,
   StoreStrategy,
@@ -2596,6 +2609,7 @@ function varsHandler() {
   nextPhase,
   optimizeMany_,
   optimizeOne_,
+  previewHandler,
   remoteApiDelete,
   remoteApiFetch,
   remoteApiGet,

package/dist/index.mjs

@@ -501,9 +501,6 @@ async function optimizeMany_(items) {
 import { isArray as isArray2, isObject as isObject2, isUnresolvedRelation } from "@websolutespa/bom-core";
 async function decorateRelation_(store, item, params = {}) {
   const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
-  if (depth === 0) {
-    return item;
-  }
   item = await collectRelations_({ store, params, depth }, item);
   return item;
 }
@@ -515,6 +512,9 @@ async function decorateRelations_(store, items, params = {}) {
 }
 async function collectRelations_(context, item, relations = []) {
   if (isUnresolvedRelation(item)) {
+    if (context.depth === 0) {
+      return item.value;
+    }
     const index = relations.findIndex(
       (x) => x.relationTo === item.relationTo && x.value === item.value
     );
@@ -1423,9 +1423,6 @@ async function remoteApiDelete(url, options = {}) {
 }
 
 // src/remote/remote.service.ts
-var RemoteServiceStrategy = {
-  draft: false
-};
 var RemoteService = class {
   constructor(key, store) {
     if (!key) {
@@ -1439,7 +1436,6 @@ var RemoteService = class {
   }
   async findOne(id, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
@@ -1455,7 +1451,6 @@ var RemoteService = class {
   }
   async findMany(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
@@ -1466,7 +1461,6 @@ var RemoteService = class {
   }
   async findPaged(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
@@ -1478,7 +1472,6 @@ var RemoteService = class {
   }
   async create(payload, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
@@ -1496,7 +1489,6 @@ var RemoteService = class {
   }
   async updateMany(payload, params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
@@ -1514,7 +1506,6 @@ var RemoteService = class {
   }
   async deleteMany(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
@@ -2137,6 +2128,23 @@ function mockHandler() {
   return storeHandler(async () => await getMockStore());
 }
 
+// src/preview/preview.handler.ts
+function previewHandler() {
+  return apiHandler({
+    options: async (request, response) => {
+      response.status(200).end();
+    },
+    get: async (request, response) => {
+      const query = request.query;
+      const { marketId, localeId, templateId, documentId, _status } = query;
+      const destination = `/${marketId}/${localeId}/${templateId}/${documentId}${query._live ? "?_live=true" : ""}`;
+      response.setPreviewData({ _status });
+      response.setDraftMode({ enable: true });
+      response.redirect(307, destination);
+    }
+  });
+}
+
 // src/store/store.api.ts
 var storeApiFetch = storeStrategy === "mock" /* Mock */ ? localApiFetch : remoteApiFetch;
 async function storeApiGet(url, options = {}) {
@@ -2203,23 +2211,29 @@ async function getRouteLinkTree(market, locale) {
   const categories = await store.category.findMany({ market, locale });
   const rootCategory = getRootCategory(categories);
   if (rootCategory) {
-    const root = categoryToRouteLink(routes, categories, rootCategory, locale);
+    const root = getRouteLinkCategory(locale, routes, categories, rootCategory, rootCategory);
     return root;
   }
   return void 0;
 }
-function categoryToRouteLink(routes, categories, category, locale) {
+function getRouteLinkCategory(locale, routes, categories, rootCategory, category) {
   const route = findRouteOfCategory3(routes, category.id);
-  if (!route) {
-    return void 0;
-  }
-  const rootCategory = getRootCategory(categories);
-  const childCategories = categories.filter((x) => {
-    const parentId = asCategoryId2(x.category);
-    return rootCategory && rootCategory.id === category.id ? x.id !== rootCategory.id && (parentId === category.id || !parentId) : parentId === category.id;
-  });
+  const otherCategories = categories.filter((x) => x.id !== category.id);
+  const childCategories = otherCategories.filter((x) => asCategoryId2(x.category) === category.id);
   const routeLink = newRouteLink(category, route, locale);
-  routeLink.items = childCategories.map((x) => categoryToRouteLink(routes, categories, x, locale)).filter((x) => x !== void 0);
+  const items = [];
+  for (const childCategory of childCategories) {
+    const itemOrItems = getRouteLinkCategory(locale, routes, otherCategories, rootCategory, childCategory);
+    if (Array.isArray(itemOrItems)) {
+      items.push(...itemOrItems);
+    } else if (itemOrItems) {
+      items.push(itemOrItems);
+    }
+  }
+  if (!route || category.isHidden && category.id !== rootCategory.id) {
+    return items;
+  }
+  routeLink.items = items;
   return routeLink;
 }
 function newRouteLink(category, route, locale) {
@@ -2433,7 +2447,6 @@ export {
   RemoteMenuService,
   RemotePageService,
   RemoteService,
-  RemoteServiceStrategy,
   STATIC_COLLECTIONS,
   StaticService,
   StoreStrategy,
@@ -2490,6 +2503,7 @@ export {
   nextPhase,
   optimizeMany_,
   optimizeOne_,
+  previewHandler,
   remoteApiDelete,
   remoteApiFetch,
   remoteApiGet,

package/package.json

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

package/src/decorators/relation.ts

@@ -3,9 +3,7 @@ import { DEFAULT_DEPTH } from './consts';
 
 export async function decorateRelation_<T extends ISchema = ISchema>(store: IStore, item: T, params: QueryParams = {}): Promise<T> {
   const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
-  if (depth === 0) {
-    return item;
-  }
+  // console.log('decorateRelation_', depth, typeof depth);
   item = await collectRelations_({ store, params, depth }, item);
   return item;
 }
@@ -30,6 +28,9 @@ async function collectRelations_<T = any>(context: {
   depth: number;
 }, item: T, relations: IPageResolvedRelation[] = []): Promise<T> {
   if (isUnresolvedRelation(item)) {
+    if (context.depth === 0) {
+      return item.value as T;
+    }
     // skip circular reference
     const index = relations.findIndex(x =>
       x.relationTo === item.relationTo && x.value === item.value

package/src/index.ts

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

package/src/preview/preview.handler.ts

@@ -0,0 +1,26 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+import { apiHandler } from '../api/api.handler';
+
+export function previewHandler() {
+  return apiHandler({
+    options: async (request: NextApiRequest, response: NextApiResponse) => {
+      response.status(200).end();
+    },
+    get: async (request: NextApiRequest, response: NextApiResponse) => {
+      const query = request.query as {
+        marketId: string;
+        localeId: string;
+        templateId: string;
+        documentId: string;
+        _status: 'published' | 'draft';
+        _live: string;
+        _token: string;
+      };
+      const { marketId, localeId, templateId, documentId, _status } = query;
+      const destination = `/${marketId}/${localeId}/${templateId}/${documentId}${query._live ? '?_live=true' : ''}`;
+      response.setPreviewData({ _status });
+      response.setDraftMode({ enable: true });
+      response.redirect(307, destination);
+    },
+  });
+}

package/src/remote/remote.service.ts

@@ -3,10 +3,6 @@ import { getRemoteApiRequestOptions } from '../api/api';
 import { decorateSchema_, decorateSchemas_ } from '../decorators';
 import { remoteApiDelete, remoteApiGet, remoteApiPatch, remoteApiPost } from './remote.api';
 
-export const RemoteServiceStrategy = {
-  draft: false,
-};
-
 /**
  * This service handle call to remote api (bowl or over)
  */
@@ -28,7 +24,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async findOne<B extends T = T>(id: IEquatable, params: Omit<QueryParams, 'where'> = {}, token?: string): Promise<B | undefined> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
@@ -46,7 +41,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async findMany<B extends T = T>(params: QueryParams = {}, token?: string): Promise<B[]> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';
@@ -59,7 +53,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async findPaged<B extends T = T>(params: QueryParams = {}, token?: string): Promise<IPagedResult<B>> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';
@@ -73,7 +66,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async create<B extends T = T>(payload: Omit<B, 'id'>, params: QueryParams = {}, token?: string): Promise<B> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';
     const url = `/${this.key}${search}`;
@@ -95,7 +87,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async updateMany<B extends T = T>(payload: Partial<B>, params: QueryParams = {}, token?: string): Promise<B[]> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';
@@ -117,7 +108,6 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
 
   async deleteMany<B extends T = T>(params: QueryParams = {}, token?: string): Promise<B[]> {
     params.richText = String(params.richText) === 'true' ? true : false;
-    params.draft = RemoteServiceStrategy.draft;
     params.pagination = false;
     const query = qsSerialize(params);
     const search = query ? `?${query}` : '';