@websolutespa/bom-mixer-store 1.8.4 → 1.8.6

package/CHANGELOG.md

@@ -1,10 +1,24 @@
 # @websolutespa/bom-mixer-store
 
+## 1.8.6
+
+### Patch Changes
+
+- Modified: RemoteService
+
+## 1.8.5
+
+### Patch Changes
+
+- Modified: IQuerable
+- Updated dependencies
+  - @websolutespa/bom-core@1.8.12
+
 ## 1.8.4
 
 ### Patch Changes
 
-- Modified: decorateCategory_
+- Modified: decorateCategory\_
 - Updated dependencies
   - @websolutespa/bom-core@1.8.11
 
@@ -12,7 +26,7 @@
 
 ### Patch Changes
 
-- Removed: optimizeMany_
+- Removed: optimizeMany\_
 
 ## 1.8.2
 

package/dist/index.d.ts

@@ -1,14 +1,10 @@
 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;
-declare const REMOTE_API_SESSION: {
-    token: string | null;
-};
-declare function getRemoteApiRequestOptions(): ApiRequestOptions;
+declare function getRemoteApiRequestOptions(token?: string): ApiRequestOptions;
 
 type ICrudMethod = 'get' | 'post' | 'put' | 'patch' | 'delete' | string;
 type IHandler<T = any> = (request: NextApiRequest, response: NextApiResponse<T>) => Promise<NextApiResponse<T> | void>;
@@ -146,12 +142,16 @@ 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>;
-    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>;
-    delete<B extends T = T>(id: IEquatable): Promise<B | undefined>;
+    findOne<B extends T = T>(id: IEquatable, params?: Omit<QueryParams, 'where'>, token?: string): Promise<B | undefined>;
+    findMany<B extends T = T>(params?: QueryParams, token?: string): Promise<B[]>;
+    findPaged<B extends T = T>(params?: QueryParams, token?: string): Promise<IPagedResult<B>>;
+    create<B extends T = T>(payload: Omit<B, 'id'>, params?: QueryParams, token?: string): Promise<B>;
+    updateOne<B extends T = T>(id: IEquatable, payload: Partial<B>, params?: Omit<QueryParams, 'where'>, token?: string): Promise<B>;
+    updateMany<B extends T = T>(payload: Partial<B>, params?: QueryParams, token?: string): Promise<B[]>;
+    deleteOne<B extends T = T>(id: IEquatable, params?: Omit<QueryParams, 'where'>, token?: string): Promise<B | undefined>;
+    deleteMany<B extends T = T>(params?: QueryParams, token?: string): Promise<B[]>;
+    update<B extends T = T>(payload: Partial<B>, params?: QueryParams, token?: string): Promise<B>;
+    delete<B extends T = T>(id: IEquatable, token?: string): 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[]>;
 }
@@ -250,6 +250,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, 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 };
+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 };

package/dist/index.js

@@ -40,7 +40,6 @@ __export(src_exports, {
   MockPageService: () => MockPageService,
   MockService: () => MockService,
   NextPhase: () => NextPhase,
-  REMOTE_API_SESSION: () => REMOTE_API_SESSION,
   RemoteMenuService: () => RemoteMenuService,
   RemotePageService: () => RemotePageService,
   RemoteService: () => RemoteService,
@@ -128,16 +127,13 @@ function getLocalApiRequestOptions() {
     headers: {}
   };
 }
-var REMOTE_API_SESSION = {
-  token: null
-};
-function getRemoteApiRequestOptions() {
-  if (REMOTE_API_SESSION.token) {
+function getRemoteApiRequestOptions(token) {
+  if (token) {
     return {
       // mode: 'cors',
       headers: {
-        Authorization: `Bearer ${REMOTE_API_SESSION.token}`
-        // Authorization: `JWT ${REMOTE_API_SESSION.token}`,
+        Authorization: `JWT ${token}`
+        // Authorization: `Bearer ${token}`,
       }
     };
   } else {
@@ -1433,6 +1429,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);
   }
@@ -1494,14 +1503,14 @@ var RemoteService = class {
     this.key = key;
     this.store = store;
   }
-  async findOne(id, params = {}) {
+  async findOne(id, params = {}, token) {
     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}/${encodeURIComponent(id)}${search}`;
     try {
-      const item = await remoteApiGet(url);
+      const item = await remoteApiGet(url, getRemoteApiRequestOptions(token));
       if (item) {
         return await this.decorateOne_(item, params);
       }
@@ -1510,45 +1519,84 @@ var RemoteService = class {
     }
     return;
   }
-  async findMany(params = {}) {
+  async findMany(params = {}, token) {
     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 remoteApiGet(url);
-    const items = Array.isArray(response.docs) ? response.docs : response;
+    const response = await remoteApiGet(url, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
     return await this.decorateMany_(items, params);
   }
-  async findPaged(params = {}) {
+  async findPaged(params = {}, token) {
     params.richText = String(params.richText) === "true" ? true : false;
     params.draft = RemoteServiceStrategy.draft;
     params.pagination = true;
     const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
-    const response = await remoteApiGet(url);
+    const response = await remoteApiGet(url, getRemoteApiRequestOptions(token));
     let items = response.docs;
     items = await this.decorateMany_(items, params);
     return { ...response, docs: items };
   }
-  // !!! todo params
-  async create(payload) {
-    const url = `/${this.key}`;
-    const result = await remoteApiPost(url, payload);
+  async create(payload, params = {}, token) {
+    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, getRemoteApiRequestOptions(token));
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
-  async update(payload) {
+  async updateOne(id, payload, params = {}, token) {
+    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, getRemoteApiRequestOptions(token));
+    const item = result.doc ? result.doc : result;
+    return await this.decorateOne_(item, {});
+  }
+  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_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}${search}`;
+    const response = await remoteApiPatch(url, payload, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  async deleteOne(id, params = {}, token) {
+    const query = (0, import_bom_core13.qsSerialize)(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    const item = await remoteApiDelete(url, getRemoteApiRequestOptions(token));
+    return await this.decorateOne_(item, {});
+  }
+  async deleteMany(params = {}, token) {
+    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, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  // !!! old
+  async update(payload, params = {}, token) {
     const url = `/${this.key}`;
-    const result = await remoteApiPut(url, payload);
+    const result = await remoteApiPatch(url, payload, getRemoteApiRequestOptions(token));
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
-  async delete(id) {
+  async delete(id, token) {
     const params = {
       where: {
         id: {
@@ -1559,7 +1607,7 @@ var RemoteService = class {
     const query = (0, import_bom_core13.qsSerialize)(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
-    const item = await remoteApiDelete(url);
+    const item = await remoteApiDelete(url, getRemoteApiRequestOptions(token));
     return await this.decorateOne_(item, {});
   }
   async decorateOne_(item, params = {}) {
@@ -1790,19 +1838,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;
@@ -1812,20 +1881,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;
@@ -2407,7 +2496,6 @@ function varsHandler() {
   MockPageService,
   MockService,
   NextPhase,
-  REMOTE_API_SESSION,
   RemoteMenuService,
   RemotePageService,
   RemoteService,

package/dist/index.mjs

@@ -12,16 +12,13 @@ function getLocalApiRequestOptions() {
     headers: {}
   };
 }
-var REMOTE_API_SESSION = {
-  token: null
-};
-function getRemoteApiRequestOptions() {
-  if (REMOTE_API_SESSION.token) {
+function getRemoteApiRequestOptions(token) {
+  if (token) {
     return {
       // mode: 'cors',
       headers: {
-        Authorization: `Bearer ${REMOTE_API_SESSION.token}`
-        // Authorization: `JWT ${REMOTE_API_SESSION.token}`,
+        Authorization: `JWT ${token}`
+        // Authorization: `Bearer ${token}`,
       }
     };
   } else {
@@ -1327,6 +1324,19 @@ var CachedService = class extends JsonService3 {
   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);
   }
@@ -1388,14 +1398,14 @@ var RemoteService = class {
     this.key = key;
     this.store = store;
   }
-  async findOne(id, params = {}) {
+  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}`;
     try {
-      const item = await remoteApiGet(url);
+      const item = await remoteApiGet(url, getRemoteApiRequestOptions(token));
       if (item) {
         return await this.decorateOne_(item, params);
       }
@@ -1404,45 +1414,84 @@ var RemoteService = class {
     }
     return;
   }
-  async findMany(params = {}) {
+  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}` : "";
     const url = `/${this.key}${search}`;
-    const response = await remoteApiGet(url);
-    const items = Array.isArray(response.docs) ? response.docs : response;
+    const response = await remoteApiGet(url, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
     return await this.decorateMany_(items, params);
   }
-  async findPaged(params = {}) {
+  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}` : "";
     const url = `/${this.key}${search}`;
-    const response = await remoteApiGet(url);
+    const response = await remoteApiGet(url, getRemoteApiRequestOptions(token));
     let items = response.docs;
     items = await this.decorateMany_(items, params);
     return { ...response, docs: items };
   }
-  // !!! todo params
-  async create(payload) {
-    const url = `/${this.key}`;
-    const result = await remoteApiPost(url, payload);
+  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}`;
+    const result = await remoteApiPost(url, payload, getRemoteApiRequestOptions(token));
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
-  async update(payload) {
+  async updateOne(id, payload, params = {}, token) {
+    const query = qsSerialize2(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    const result = await remoteApiPatch(url, payload, getRemoteApiRequestOptions(token));
+    const item = result.doc ? result.doc : result;
+    return await this.decorateOne_(item, {});
+  }
+  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}` : "";
+    const url = `/${this.key}${search}`;
+    const response = await remoteApiPatch(url, payload, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  async deleteOne(id, params = {}, token) {
+    const query = qsSerialize2(params);
+    const search = query ? `?${query}` : "";
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    const item = await remoteApiDelete(url, getRemoteApiRequestOptions(token));
+    return await this.decorateOne_(item, {});
+  }
+  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}` : "";
+    const url = `/${this.key}${search}`;
+    const response = await remoteApiDelete(url, getRemoteApiRequestOptions(token));
+    const items = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+  // !!! old
+  async update(payload, params = {}, token) {
     const url = `/${this.key}`;
-    const result = await remoteApiPut(url, payload);
+    const result = await remoteApiPatch(url, payload, getRemoteApiRequestOptions(token));
     const item = result.doc ? result.doc : result;
     return await this.decorateOne_(item, {});
   }
-  // !!! todo params
-  async delete(id) {
+  async delete(id, token) {
     const params = {
       where: {
         id: {
@@ -1453,7 +1502,7 @@ var RemoteService = class {
     const query = qsSerialize2(params);
     const search = query ? `?${query}` : "";
     const url = `/${this.key}${search}`;
-    const item = await remoteApiDelete(url);
+    const item = await remoteApiDelete(url, getRemoteApiRequestOptions(token));
     return await this.decorateOne_(item, {});
   }
   async decorateOne_(item, params = {}) {
@@ -1684,19 +1733,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 = 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(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;
@@ -1706,20 +1776,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 = 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(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;
@@ -2300,7 +2390,6 @@ 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.4",
+  "version": "1.8.6",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",

package/src/api/api.ts

@@ -9,26 +9,18 @@ export function getLocalApiRequestOptions(): ApiRequestOptions {
   };
 }
 
-export const REMOTE_API_SESSION: { token: string | null } = {
-  token: null,
-};
-
-export function getRemoteApiRequestOptions(): ApiRequestOptions {
-  if (REMOTE_API_SESSION.token) {
-    /**
-     * authenticated end user JWT token bearer (end_users)
-     */
+export function getRemoteApiRequestOptions(token?: string): ApiRequestOptions {
+  if (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}`,
+        Authorization: `JWT ${token}`,
+        // Authorization: `Bearer ${token}`,
       },
     };
   } else {
-    /**
-     * guest user api key (users)
-     */
+    // guest user api key (users)
     return {
       // mode: 'cors',
       headers: {

package/src/cached/cached.service.ts

@@ -104,6 +104,24 @@ export class CachedService<T extends IEntity = IEntity> extends JsonService<T> {
     return await this.service_.create(payload);
   }
 
+  async updateOne<B extends T = T>(id: IEquatable, payload: Partial<B>, params: Omit<QueryParams, 'where'> = {}): Promise<B> {
+    return await this.service_.updateOne(id, payload, params);
+  }
+
+  async updateMany<B extends T = T>(payload: Partial<B>, params: QueryParams = {}): Promise<B[]> {
+    return await this.service_.updateMany(payload, params);
+  }
+
+  async deleteOne<B extends T = T>(id: IEquatable, params: Omit<QueryParams, 'where'> = {}): Promise<B | undefined> {
+    return await this.service_.deleteOne(id, params);
+  }
+
+  async deleteMany<B extends T = T>(params: QueryParams = {}): Promise<B[]> {
+    return await this.service_.deleteMany(params);
+  }
+
+  // !!! old
+
   async update<B extends T = T>(payload: Partial<B>): Promise<B> {
     return await this.service_.update(payload);
   }

package/src/remote/remote.service.ts

@@ -1,6 +1,7 @@
 import { IEntity, IEquatable, IPagedResult, IQuerable, IStore, qsSerialize, QueryParams } from '@websolutespa/bom-core';
+import { getRemoteApiRequestOptions } from '../api/api';
 import { decorateSchema_, decorateSchemas_ } from '../decorators';
-import { remoteApiDelete, remoteApiGet, remoteApiPost, remoteApiPut } from './remote.api';
+import { remoteApiDelete, remoteApiGet, remoteApiPatch, remoteApiPost } from './remote.api';
 
 export const RemoteServiceStrategy = {
   draft: false,
@@ -25,7 +26,7 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     this.store = store;
   }
 
-  async findOne<B extends T = T>(id: IEquatable, params: QueryParams = {}): Promise<B | undefined> {
+  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);
@@ -33,7 +34,7 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
     // console.log('RemoteService', this.key, 'findOne', url);
     try {
-      const item = await remoteApiGet<B>(url);
+      const item = await remoteApiGet<B>(url, getRemoteApiRequestOptions(token));
       if (item) {
         return await this.decorateOne_(item, params);
       }
@@ -43,7 +44,7 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     return;
   }
 
-  async findMany<B extends T = T>(params: QueryParams = {}): Promise<B[]> {
+  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;
@@ -51,12 +52,12 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     const search = query ? `?${query}` : '';
     const url = `/${this.key}${search}`;
     // console.log('RemoteService', this.key, 'findMany', url);
-    const response = await remoteApiGet(url) as any; // !!! todo pagination<B[]> | B[]
-    const items: B[] = Array.isArray(response.docs) ? response.docs : response;
+    const response = await remoteApiGet<B[] | { docs: B[] }>(url, getRemoteApiRequestOptions(token));
+    const items: B[] = Array.isArray(response) ? response : response.docs;
     return await this.decorateMany_(items, params);
   }
 
-  async findPaged<B extends T = T>(params: QueryParams = {}): Promise<IPagedResult<B>> {
+  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;
@@ -64,32 +65,80 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     const search = query ? `?${query}` : '';
     const url = `/${this.key}${search}`;
     // console.log('RemoteService', this.key, 'findPaged', url);
-    const response = await remoteApiGet<IPagedResult<B>>(url);
+    const response = await remoteApiGet<IPagedResult<B>>(url, getRemoteApiRequestOptions(token));
     let items: B[] = response.docs;
     items = await this.decorateMany_(items, params);
     return { ...response, docs: items };
   }
 
-  // !!! todo params
-  async create<B extends T = T>(payload: Omit<B, 'id'>): Promise<B> {
-    const url = `/${this.key}`;
+  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}`;
     // console.log('RemoteService', this.key, 'create', url);
-    const result = await remoteApiPost<B | { doc: B }>(url, payload);
+    const result = await remoteApiPost<B | { doc: B }>(url, payload, getRemoteApiRequestOptions(token));
     const item = (result.doc ? result.doc : result) as B;
     return await this.decorateOne_(item, {});
   }
 
-  // !!! todo params
-  async update<B extends T = T>(payload: Partial<B>): Promise<B> {
+  async updateOne<B extends T = T>(id: IEquatable, payload: Partial<B>, params: Omit<QueryParams, 'where'> = {}, token?: string): Promise<B> {
+    const query = qsSerialize(params);
+    const search = query ? `?${query}` : '';
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    // console.log('RemoteService', this.key, 'updateOne', url);
+    const result = await remoteApiPatch<B | { doc: B }>(url, payload, getRemoteApiRequestOptions(token));
+    const item = (result.doc ? result.doc : result) as B;
+    return await this.decorateOne_(item, {});
+  }
+
+  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}` : '';
+    const url = `/${this.key}${search}`;
+    // console.log('RemoteService', this.key, 'updateMany', url);
+    const response = await remoteApiPatch<B[] | { docs: B[] }>(url, payload, getRemoteApiRequestOptions(token));
+    const items: B[] = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+
+  async deleteOne<B extends T = T>(id: IEquatable, params: Omit<QueryParams, 'where'> = {}, token?: string): Promise<B | undefined> {
+    const query = qsSerialize(params);
+    const search = query ? `?${query}` : '';
+    const url = `/${this.key}/${encodeURIComponent(id)}${search}`;
+    // console.log('RemoteService', this.key, 'deleteOne', url);
+    const item = await remoteApiDelete<B>(url, getRemoteApiRequestOptions(token));
+    return await this.decorateOne_(item, {});
+  }
+
+  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}` : '';
+    const url = `/${this.key}${search}`;
+    // console.log('RemoteService', this.key, 'deleteMany', url);
+    const response = await remoteApiDelete<B[] | { docs: B[] }>(url, getRemoteApiRequestOptions(token));
+    const items: B[] = Array.isArray(response) ? response : response.docs;
+    return await this.decorateMany_(items, params);
+  }
+
+  // !!! old
+
+  async update<B extends T = T>(payload: Partial<B>, params: QueryParams = {}, token?: string): Promise<B> {
     const url = `/${this.key}`;
     // console.log('RemoteService', this.key, 'update', url);
-    const result = await remoteApiPut<B | { doc: B }>(url, payload);
+    const result = await remoteApiPatch<B | { doc: B }>(url, payload, getRemoteApiRequestOptions(token));
     const item = (result.doc ? result.doc : result) as B;
     return await this.decorateOne_(item, {});
   }
 
-  // !!! todo params
-  async delete<B extends T = T>(id: IEquatable): Promise<B | undefined> {
+  async delete<B extends T = T>(id: IEquatable, token?: string): Promise<B | undefined> {
     const params = {
       where: {
         id: {
@@ -101,7 +150,7 @@ export class RemoteService<T extends IEntity = IEntity> implements IQuerable<T>
     const search = query ? `?${query}` : '';
     const url = `/${this.key}${search}`;
     // console.log('RemoteService', this.key, 'delete', url);
-    const item = await remoteApiDelete<B>(url);
+    const item = await remoteApiDelete<B>(url, getRemoteApiRequestOptions(token));
     return await this.decorateOne_(item, {});
   }
 

package/src/session/session.service.ts

@@ -0,0 +1,25 @@
+
+import { isDevelopment } from '@websolutespa/bom-core';
+import * as http from 'http';
+import { getIronSession, IronSession, SessionOptions } from 'iron-session';
+
+export async function getSession<T extends object = Record<string, any>>(
+  request: (http.IncomingMessage | Request & { cookies: any }),
+  response?: Response | http.ServerResponse
+): Promise<IronSession<T>> {
+  const COOKIE_NAME = 'websolutespa-next-js';
+  const COOKIE_PASSWORD = process.env.SECRET_COOKIE_PASSWORD as string || 'SECRET_COOKIE_PASSWORD_32_CHARS_LONG';
+  const sessionOptions: SessionOptions = {
+    cookieName: COOKIE_NAME,
+    // secure: true should be used in production (HTTPS) but can't be used in development (HTTP)
+    cookieOptions: {
+      secure: !isDevelopment,
+    },
+    password: COOKIE_PASSWORD,
+  };
+  const session =
+    'cookies' in request ?
+      await getIronSession<T>(request.cookies, sessionOptions) :
+      await getIronSession<T>(request, response, sessionOptions);
+  return session;
+}

package/src/store/store.handler.ts

@@ -102,20 +102,45 @@ export function collectionPost<T extends IStore>(storePromise: () => Promise<T>)
 export function collectionPatch<T extends IStore>(storePromise: () => Promise<T>) {
   return async (request: NextApiRequest, response: NextApiResponse) => {
     try {
-      const params = request.query;
-      const { collections, ...query } = params;
+      const { collections, ...query } = request.query;
+      // console.log('query', 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: string = collections[0];
+      const id: string = collections[1];
+      const qs = Object.entries(query).map(kv => kv.join('=')).join('&');
+      const params = qsDeserialize(qs);
+      // console.log('params', params);
+      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');
       }
-      // !!! todo patch update
+      // update a specific document by id
+      if (id) {
+        // console.log('storeHandler.collectionUpdate', collection, id, params);
+        const item = await service.updateOne(asEquatable(id), params);
+        if (item) {
+          return response.status(200).json(item);
+        } else {
+          return response.status(404).send('not found');
+        }
+      } else {
+        // console.log('storeHandler.collectionUpdate', collection, params);
+        const items = await service.updateMany(params);
+        return response.status(200).json(items);
+      }
     } catch (error: any) {
       console.error('storeHandler.error.500', error);
       throw error;
@@ -127,21 +152,45 @@ export function collectionPatch<T extends IStore>(storePromise: () => Promise<T>
 export function collectionDelete<T extends IStore>(storePromise: () => Promise<T>) {
   return async (request: NextApiRequest, response: NextApiResponse) => {
     try {
-      const params = request.query;
-      const { collections, ...query } = params;
+      const { collections, ...query } = request.query;
+      // console.log('query', 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: string = collections[0];
       const id: string = collections[1];
+      const qs = Object.entries(query).map(kv => kv.join('=')).join('&');
+      const params = qsDeserialize(qs);
+      // console.log('params', params);
+      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');
       }
-      // !!! todo delete
+      // delete a specific document by id
+      if (id) {
+        // console.log('storeHandler.collectionDelete', collection, id, params);
+        const item = await service.deleteOne(asEquatable(id), params);
+        if (item) {
+          return response.status(200).json(item);
+        } else {
+          return response.status(404).send('not found');
+        }
+      } else {
+        // console.log('storeHandler.collectionDelete', collection, params);
+        const items = await service.deleteMany(params);
+        return response.status(200).json(items);
+      }
     } catch (error: any) {
       console.error('storeHandler.error.500', error);
       throw error;

package/src/vars/vars.handler.ts

@@ -1,7 +1,7 @@
 import { getHost, getOrigin, isDevelopment, isProduction } from '@websolutespa/bom-core';
 import { getLayout } from '@websolutespa/bom-mixer-models';
-import { apiHandler } from '@websolutespa/bom-mixer-store';
 import { NextApiRequest, NextApiResponse } from 'next';
+import { apiHandler } from '../api/api.handler';
 
 const DISALLOWED_KEYS = [
   '__NEXT_PRIVATE_STANDALONE_CONFIG',