@websolutespa/bom-mixer-store 1.8.3 → 1.8.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.5
+
+### Patch Changes
+
+- Modified: IQuerable
+- Updated dependencies
+  - @websolutespa/bom-core@1.8.12
+
+## 1.8.4
+
+### Patch Changes
+
+- Modified: decorateCategory\_
+- Updated dependencies
+  - @websolutespa/bom-core@1.8.11
+
 ## 1.8.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,7 +1,6 @@
-import { FetchRequestOptions, ICategorized, IStore, QueryParams, ICategory, ISchema, IUndecoratedMenu, IMenu, IRoute, IEquatable, IEntity, JsonService, IMemoryStore, IQuerable, IPagedResult } from '@websolutespa/bom-core';
+import { FetchRequestOptions, IEquatable, ICategory, IStore, QueryParams, ICategorized, IRoute, ISchema, IUndecoratedMenu, IMenu, IEntity, JsonService, IMemoryStore, IQuerable, IPagedResult } from '@websolutespa/bom-core';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { NextRequest } from 'next/server';
-import * as _websolutespa_bom_mixer_store from '@websolutespa/bom-mixer-store';
 
 type ApiRequestOptions = FetchRequestOptions;
 declare function getLocalApiRequestOptions(): ApiRequestOptions;
@@ -18,12 +17,23 @@ declare function errorHandler(error: any, response: NextApiResponse): NextApiRes
 
 declare function fromCache<T = unknown>(callback: () => Promise<T>, key?: string): Promise<T>;
 
-declare function decorateCategory_<T extends ICategorized = ICategorized>(store: IStore, item: T, params?: QueryParams): Promise<T | (T & {
+declare function decorateCategory_<T extends {
+    category?: IEquatable | ICategory;
+} = {
+    category?: IEquatable | ICategory;
+}>(store: IStore, item: T, params?: QueryParams): Promise<T | (T & {
     category: ICategory;
 })>;
 declare function decorateCategories_<T extends ICategorized = ICategorized>(store: IStore, items: T[], params?: QueryParams): Promise<(T | (T & {
     category: ICategory;
 }))[]>;
+declare function collectCategory_<T extends {
+    category?: IEquatable | ICategory;
+} = {
+    category?: IEquatable | ICategory;
+}>(categories: ICategory[], routes: IRoute[], item: T, params: QueryParams | undefined, depth: number): Promise<T>;
+
+declare const DEFAULT_DEPTH = 3;
 
 declare function decorateHref_<T extends ISchema = ISchema>(store: IStore, item: T, params?: QueryParams): Promise<T | T & {
     href: string | null;
@@ -51,7 +61,6 @@ declare function decorateNavs_<T extends ISchema = ISchema>(store: IStore, items
 declare function optimizeOne_<T extends ICategorized = ICategorized>(item: T): Promise<T>;
 declare function optimizeMany_<T extends ICategorized = ICategorized>(items: T[]): Promise<T[]>;
 
-declare const SERVICE_DEFAULT_DEPTH = 3;
 declare function decorateRelation_<T extends ISchema = ISchema>(store: IStore, item: T, params?: QueryParams): Promise<T>;
 declare function decorateRelations_<T extends ISchema = ISchema>(store: IStore, items: T[], params?: QueryParams): Promise<T[]>;
 type IPageResolvedRelation = {
@@ -136,11 +145,15 @@ declare class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     key: string;
     store: IStore;
     constructor(key: string, store: IStore);
-    findOne<B extends T = T>(id: IEquatable, params?: QueryParams): Promise<B | undefined>;
+    findOne<B extends T = T>(id: IEquatable, params?: Omit<QueryParams, 'where'>): Promise<B | undefined>;
     findMany<B extends T = T>(params?: QueryParams): Promise<B[]>;
     findPaged<B extends T = T>(params?: QueryParams): Promise<IPagedResult<B>>;
-    create<B extends T = T>(payload: Omit<B, 'id'>): Promise<B>;
-    update<B extends T = T>(payload: Partial<B>): Promise<B>;
+    create<B extends T = T>(payload: Omit<B, 'id'>, params?: QueryParams): Promise<B>;
+    updateOne<B extends T = T>(id: IEquatable, payload: Partial<B>, params?: Omit<QueryParams, 'where'>): Promise<B>;
+    updateMany<B extends T = T>(payload: Partial<B>, params?: QueryParams): Promise<B[]>;
+    deleteOne<B extends T = T>(id: IEquatable, params?: Omit<QueryParams, 'where'>): Promise<B | undefined>;
+    deleteMany<B extends T = T>(params?: QueryParams): Promise<B[]>;
+    update<B extends T = T>(payload: Partial<B>, params?: QueryParams): Promise<B>;
     delete<B extends T = T>(id: IEquatable): Promise<B | undefined>;
     protected decorateOne_<B extends T = T>(item: B, params?: QueryParams): Promise<B>;
     protected decorateMany_<B extends T = T>(items: B[], params?: QueryParams): Promise<B[]>;
@@ -240,6 +253,6 @@ declare function findRoute(store: IStore, pathname: string, href: string, hrefBe
 
 declare function getStore<T extends IStore>(): Promise<T>;
 
-declare function varsHandler(): _websolutespa_bom_mixer_store.IHandler<any>;
+declare function varsHandler(): IHandler<any>;
 
-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 };
+export { ApiRequestOptions, BuildStrategy, COLLECTIONS, DEFAULT_DEPTH, IApiHandler, ICrudMethod, IField, IHandler, IPageResolvedRelation, KNOWN_COLLECTIONS, MAX_INT, MOCK_COLLECTIONS, MapTo, MockMenuService, MockPageService, MockService, NextPhase, REMOTE_API_SESSION, 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 };

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   BuildStrategy: () => BuildStrategy,
   COLLECTIONS: () => COLLECTIONS,
+  DEFAULT_DEPTH: () => DEFAULT_DEPTH,
   KNOWN_COLLECTIONS: () => KNOWN_COLLECTIONS,
   MAX_INT: () => MAX_INT,
   MOCK_COLLECTIONS: () => MOCK_COLLECTIONS,
@@ -44,12 +45,12 @@ __export(src_exports, {
   RemotePageService: () => RemotePageService,
   RemoteService: () => RemoteService,
   RemoteServiceStrategy: () => RemoteServiceStrategy,
-  SERVICE_DEFAULT_DEPTH: () => SERVICE_DEFAULT_DEPTH,
   STATIC_COLLECTIONS: () => STATIC_COLLECTIONS,
   StaticService: () => StaticService,
   StoreStrategy: () => StoreStrategy,
   apiHandler: () => apiHandler,
   buildStrategy: () => buildStrategy,
+  collectCategory_: () => collectCategory_,
   collectionDelete: () => collectionDelete,
   collectionGet: () => collectionGet,
   collectionPatch: () => collectionPatch,
@@ -192,47 +193,60 @@ async function fromCache(callback, key) {
 
 // src/decorators/category.ts
 var import_bom_core = require("@websolutespa/bom-core");
+
+// src/decorators/consts.ts
+var DEFAULT_DEPTH = 3;
+
+// src/decorators/category.ts
 async function decorateCategory_(store, item, params = {}) {
-  if (typeof item.category === "string") {
-    const categories = await store.category.findMany({
-      where: {
-        id: {
-          equals: item.category
-        }
-      }
-    });
-    if (categories.length > 0) {
-      const category = categories[0];
-      const routes = await store.route.findMany();
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return item;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+  return decoratedItem;
+}
+async function decorateCategories_(store, items, params = {}) {
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
+  if (depth === 0) {
+    return items;
+  }
+  const categories = await store.category.findMany({
+    market: params.market,
+    locale: params.locale,
+    depth: 0
+  });
+  const routes = await store.route.findMany();
+  const decoratedItems = [];
+  for (const item of items) {
+    const decoratedItem = await collectCategory_(categories, routes, item, params, depth);
+    decoratedItems.push(decoratedItem);
+  }
+  return decoratedItems;
+}
+async function collectCategory_(categories, routes, item, params = {}, depth) {
+  if (depth === 0) {
+    return item;
+  }
+  if ((0, import_bom_core.isUnresolvedCategory)(item.category)) {
+    const category = categories.find((x) => x.id === item.category);
+    if (category) {
       const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id, params.market, params.locale);
       if (route) {
         category.href = route.id;
       }
-      return { ...item, category };
+      const decoratedCategory = await collectCategory_(categories, routes, category, params, depth - 1);
+      return { ...item, category: decoratedCategory };
     }
   }
   return item;
 }
-async function decorateCategories_(store, items, params = {}) {
-  const hasUndecoratedCategories = items.find((x) => typeof x.category === "string") !== void 0;
-  if (hasUndecoratedCategories) {
-    const categories = await store.category.findMany();
-    let routes = await store.route.findMany();
-    routes = routes.filter((x) => x.market === params.market && x.locale === params.locale);
-    return items.map((item) => {
-      const category = categories.find((x) => x.id === item.category);
-      if (category) {
-        const route = (0, import_bom_core.findRouteOfCategory)(routes, category.id);
-        if (route) {
-          category.href = route.id;
-        }
-        return { ...item, category };
-      }
-      return item;
-    });
-  }
-  return items;
-}
 
 // src/decorators/href.ts
 async function decorateHref_(store, item, params = {}) {
@@ -591,9 +605,8 @@ async function optimizeMany_(items) {
 
 // src/decorators/relation.ts
 var import_bom_core5 = require("@websolutespa/bom-core");
-var SERVICE_DEFAULT_DEPTH = 3;
 async function decorateRelation_(store, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -729,7 +742,7 @@ var MockService = class extends import_bom_core7.JsonService {
     decoratedItem = await decorateRelation_(store, decoratedItem, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItem;
   }
@@ -740,7 +753,7 @@ var MockService = class extends import_bom_core7.JsonService {
     decoratedItems = await decorateRelations_(store, decoratedItems, {
       market: params.market,
       locale: params.locale,
-      depth: params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH
+      depth: params.depth != null ? params.depth : DEFAULT_DEPTH
     });
     return decoratedItems;
   }
@@ -779,7 +792,11 @@ var MockPageService = class extends MockService {
   async decorateOne_(item, params = {}) {
     const store = this.store;
     let decoratedItem = item;
-    decoratedItem = await decorateCategory_(store, decoratedItem, params);
+    decoratedItem = await decorateCategory_(store, decoratedItem, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItem = await decorateLocalizable_(decoratedItem, params);
     decoratedItem = await decorateHref_(store, decoratedItem, params);
     decoratedItem = await decorateNav_(store, decoratedItem, params);
@@ -793,7 +810,11 @@ var MockPageService = class extends MockService {
   async decorateMany_(items, params = {}) {
     const store = this.store;
     let decoratedItems = items;
-    decoratedItems = await decorateCategories_(store, decoratedItems, params);
+    decoratedItems = await decorateCategories_(store, decoratedItems, {
+      market: params.market,
+      locale: params.locale,
+      depth: params.depth
+    });
     decoratedItems = await decorateLocalizables_(decoratedItems, params);
     decoratedItems = await decorateHrefs_(store, decoratedItems, params);
     decoratedItems = await decorateRelations_(store, decoratedItems, {
@@ -1233,7 +1254,7 @@ var StaticService = class extends import_bom_core9.JsonService {
   }
 };
 async function decorateStaticRelation_(store, fields, item, params = {}) {
-  const depth = params.depth != null ? params.depth : SERVICE_DEFAULT_DEPTH;
+  const depth = params.depth != null ? params.depth : DEFAULT_DEPTH;
   if (depth === 0) {
     return item;
   }
@@ -1412,6 +1433,19 @@ var CachedService = class extends import_bom_core11.JsonService {
   async create(payload) {
     return await this.service_.create(payload);
   }
+  async updateOne(id, payload, params = {}) {
+    return await this.service_.updateOne(id, payload, params);
+  }
+  async updateMany(payload, params = {}) {
+    return await this.service_.updateMany(payload, params);
+  }
+  async deleteOne(id, params = {}) {
+    return await this.service_.deleteOne(id, params);
+  }
+  async deleteMany(params = {}) {
+    return await this.service_.deleteMany(params);
+  }
+  // !!! old
   async update(payload) {
     return await this.service_.update(payload);
   }
@@ -1497,7 +1531,7 @@ var RemoteService = class {
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
     const response = await remoteApiGet(url);
-    const items = Array.isArray(response.docs) ? response.docs : response;
+    const items = Array.isArray(response) ? response : response.docs;
     return await this.decorateMany_(items, params);
   }
   async findPaged(params = {}) {
@@ -1512,21 +1546,60 @@ var RemoteService = class {
     items = await this.decorateMany_(items, params);
     return { ...response, docs: items };
   }
-  // !!! todo params
-  async create(payload) {
-    const url = `/${this.key}`;
+  async create(payload, params = {}) {
+    params.richText = String(params.richText) === "true" ? true : false;
+    params.draft = RemoteServiceStrategy.draft;
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}${search}`;
     const result = await remoteApiPost(url, payload);
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
-  async update(payload) {
+  async updateOne(id, payload, params = {}) {
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    const result = await remoteApiPatch(url, payload);
+    const item = result.doc ? result.doc : result;
+    return await this.decorateOne_(item, {});
+  }
+  async updateMany(payload, params = {}) {
+    params.richText = String(params.richText) === "true" ? true : false;
+    params.draft = RemoteServiceStrategy.draft;
+    params.pagination = false;
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}${search}`;
+    const response = await remoteApiPatch(url, payload);
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  async deleteOne(id, params = {}) {
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    const item = await remoteApiDelete(url);
+    return await this.decorateOne_(item, {});
+  }
+  async deleteMany(params = {}) {
+    params.richText = String(params.richText) === "true" ? true : false;
+    params.draft = RemoteServiceStrategy.draft;
+    params.pagination = false;
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}${search}`;
+    const response = await remoteApiDelete(url);
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  // !!! old
+  async update(payload, params = {}) {
     const url = `/${this.key}`;
-    const result = await remoteApiPut(url, payload);
+    const result = await remoteApiPatch(url, payload);
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
   async delete(id) {
     const params = {
       where: {
@@ -1769,19 +1842,40 @@ function collectionPost(storePromise) {
 function collectionPatch(storePromise) {
   return async (request, response) => {
     try {
-      const params = request.query;
-      const { collections, ...query } = params;
+      const { collections, ...query } = request.query;
+      if (!Array.isArray(collections) || collections?.length === 0) {
+        console.error("storeHandler.collectionUpdate", "method not allowed", collections);
+        return response.status(405).send("method not allowed");
+      }
       if (!Array.isArray(collections) || collections.length !== 2) {
         console.error("method not allowed", collections);
         return response.status(405).send("method not allowed");
       }
       const collection = collections[0];
+      const id = collections[1];
+      const qs = Object.entries(query).map((kv) => kv.join("=")).join("&");
+      const params = (0, import_bom_core14.qsDeserialize)(qs);
+      if (!COLLECTIONS.includes(collection)) {
+        console.error("storeHandler.collectionUpdate", "method not allowed", collection);
+        return response.status(405).send("method not allowed");
+      }
       const store = await storePromise();
       const service = store[collection];
       if (!service) {
-        console.error("method not allowed", collection);
+        console.error("storeHandler.collectionUpdate", "method not allowed", collection);
         return response.status(405).send("method not allowed");
       }
+      if (id) {
+        const item = await service.updateOne((0, import_bom_core14.asEquatable)(id), params);
+        if (item) {
+          return response.status(200).json(item);
+        } else {
+          return response.status(404).send("not found");
+        }
+      } else {
+        const items = await service.updateMany(params);
+        return response.status(200).json(items);
+      }
     } catch (error) {
       console.error("storeHandler.error.500", error);
       throw error;
@@ -1791,20 +1885,40 @@ function collectionPatch(storePromise) {
 function collectionDelete(storePromise) {
   return async (request, response) => {
     try {
-      const params = request.query;
-      const { collections, ...query } = params;
+      const { collections, ...query } = request.query;
+      if (!Array.isArray(collections) || collections?.length === 0) {
+        console.error("storeHandler.collectionDelete", "method not allowed", collections);
+        return response.status(405).send("method not allowed");
+      }
       if (!Array.isArray(collections) || collections.length !== 2) {
         console.error("method not allowed", collections);
         return response.status(405).send("method not allowed");
       }
       const collection = collections[0];
       const id = collections[1];
+      const qs = Object.entries(query).map((kv) => kv.join("=")).join("&");
+      const params = (0, import_bom_core14.qsDeserialize)(qs);
+      if (!COLLECTIONS.includes(collection)) {
+        console.error("storeHandler.collectionDelete", "method not allowed", collection);
+        return response.status(405).send("method not allowed");
+      }
       const store = await storePromise();
       const service = store[collection];
       if (!service) {
-        console.error("method not allowed", collection);
+        console.error("storeHandler.collectionDelete", "method not allowed", collection);
         return response.status(405).send("method not allowed");
       }
+      if (id) {
+        const item = await service.deleteOne((0, import_bom_core14.asEquatable)(id), params);
+        if (item) {
+          return response.status(200).json(item);
+        } else {
+          return response.status(404).send("not found");
+        }
+      } else {
+        const items = await service.deleteMany(params);
+        return response.status(200).json(items);
+      }
     } catch (error) {
       console.error("storeHandler.error.500", error);
       throw error;
@@ -2378,6 +2492,7 @@ function varsHandler() {
 0 && (module.exports = {
   BuildStrategy,
   COLLECTIONS,
+  DEFAULT_DEPTH,
   KNOWN_COLLECTIONS,
   MAX_INT,
   MOCK_COLLECTIONS,
@@ -2390,12 +2505,12 @@ function varsHandler() {
   RemotePageService,
   RemoteService,
   RemoteServiceStrategy,
-  SERVICE_DEFAULT_DEPTH,
   STATIC_COLLECTIONS,
   StaticService,
   StoreStrategy,
   apiHandler,
   buildStrategy,
+  collectCategory_,
   collectionDelete,
   collectionGet,
   collectionPatch,