@dnax/core 0.76.9 → 0.76.11

package/driver/mongo/rest.ts

@@ -2,7 +2,7 @@ import moment from "moment";
 import { sessionStorage } from "../../lib/asyncLocalStorage";
 import { getCollection, getKeyFields } from "../../lib/collection";
 import { getTenant } from "../../lib/tenant";
-import type { Actions, Collection, Tenant } from "./../../types/index";
+import type { Actions, Collection, Q, Tenant } from "./../../types/index";
 import { isArray } from "radash";
 import { omit } from "../../utils";
 import {
@@ -124,6 +124,7 @@ class useRest {
   #tenant_id: string;
   #session: ClientSession | null | undefined;
   #useCustomApi: boolean = true;
+  #events: Array<any> = [];
   /**
   Direct Api Mongo , use it with caution
    */
@@ -218,7 +219,51 @@ class useRest {
     } */
   }
 
-  validator(
+  // onEvents
+  on(
+    event: "change",
+    filter: {},
+    clb: (ctx: {
+      action:
+        | "insertOne"
+        | "insertMany"
+        | "updateOne"
+        | "updateMany"
+        | "deleteOne"
+        | "deleteMany"
+        | "findOneAndDelete"
+        | "findAndUpdate"
+        | "findAndDelete"
+        | "findOneAndUpdate";
+      collection: string;
+      data?: any;
+      result?: any;
+    }) => void
+  ) {
+    this.#events.push({
+      event: "change",
+      filter: filter || {},
+      clb: clb,
+    });
+  }
+
+  private disptachEvent(
+    event: "change",
+    opts: { action: Actions; collection: string; data?: any; result?: any }
+  ) {
+    this.#events?.forEach((e) => {
+      if (e.event == event) {
+        e.clb({
+          action: opts.action,
+          collection: opts.collection,
+          data: opts?.data,
+          result: opts?.result,
+        });
+      }
+    });
+  }
+
+  private validator(
     collection: string,
     data: any,
     options: { partial: boolean } = {
@@ -578,6 +623,13 @@ class useRest {
           });
         }
 
+        this.disptachEvent("change", {
+          action: "insertOne",
+          collection: collection,
+          data: data,
+          result: toJson(data),
+        });
+
         // if action done
         restActivity.save(this.#tenant, {
           operation: {
@@ -601,23 +653,6 @@ class useRest {
           ip: sessionStorage()?.get()?._v?.ip,
           state: sessionStorage()?.get()?.state,
           uuid: sessionStorage()?.get()?.uuid,
-          /*  collection: collection,
-          data: {
-            data: data,
-            _id: data?._id,
-            action: "insertOne",
-            collection: collection,
-            payload: data,
-          },
-          transaction: this.#session ? true : false,
-          action: "insertOne",
-          internal: sessionStorage()?.get() ? false : true,
-          ip: sessionStorage()?.get()?._v?.ip,
-          auth: sessionStorage()?.get()?._v?.isAuth ?? false,
-          role: sessionStorage()?.get()?.role!,
-          user: sessionStorage()?.get()?.state?.user,
-          state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid, */
         } as activityInput);
         if (col?.cache?.invalidate) {
           col.cache.invalidate({
@@ -633,6 +668,7 @@ class useRest {
             tags: [String(data?._id)],
           });
         }
+
         return resolve(toJson(data));
       } catch (err) {
         return reject(err);
@@ -779,6 +815,14 @@ class useRest {
           });
         }
 
+        // dispatchEvent
+        this.disptachEvent("change", {
+          action: "insertMany",
+          collection: collection,
+          data: data,
+          result: toJson(data),
+        });
+
         // if insertMany done
         restActivity.save(this.#tenant, {
           uuid: sessionStorage()?.get()?.uuid,
@@ -841,44 +885,6 @@ class useRest {
     });
   }
 
-  //on(event: restEventType, clb: Function) {}
-  /**
-   *
-   * @param queries
-   * @returns [{ [key: string]: any }]
-   */
-  async batch<T extends "findOne" | "find">(queries: QueryBatchType<T>[]) {
-    return new Promise(async (resolve, reject) => {
-      try {
-        let result = {} as any;
-        for await (let query of queries) {
-          let resultName = query.as || query.collection;
-          if (
-            query.action == "findOne" &&
-            (query?.filter?.id || query?.filter?._id)
-          ) {
-            result[resultName] = await this.findOne(
-              query.collection,
-              query?.filter?.id || query?.filter?._id,
-              query?.filter?.params || {},
-              query.options
-            );
-          }
-          if (query.action == "find") {
-            result[resultName] = await this.find(
-              query.collection,
-              query?.filter?.params || {},
-              query?.options || {}
-            );
-          }
-        }
-        return resolve(result);
-      } catch (err) {
-        return reject(err);
-      }
-    });
-  }
-
   /**
    *
    * @param collection - Collection name
@@ -1605,7 +1611,7 @@ class useRest {
             );
         }
 
-        if (col?.hooks?.afterUpdate && useHook) {
+        if (col?.hooks?.afterUpdate && useHook && result?.doc) {
           await col.hooks.afterUpdate({
             sharedData: sharedData,
             c: this.#c,
@@ -1615,7 +1621,7 @@ class useRest {
             action: "updateOne",
             update: update,
             session: sessionStorage(),
-            result: toJson(result.doc),
+            result: toJson(result?.doc),
             rest: new useRest({
               useCustomApi: false,
               session: this.#session,
@@ -1624,7 +1630,8 @@ class useRest {
             }),
           });
         }
-        if (col?.hooks?.afterOperation && useHook) {
+
+        if (col?.hooks?.afterOperation && useHook && result?.doc) {
           await col.hooks.afterOperation({
             sharedData: sharedData,
             c: this.#c,
@@ -1644,15 +1651,15 @@ class useRest {
           });
         }
 
-        if (
-          this.#tenant?.searchEngine?.meilisearch?.enabled &&
-          col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-        ) {
-          this.meilisearch.client
-            .index(col?.searchEngine?.meilisearch?.index)
-            .updateDocuments([{ ...toJson(result?.doc || {}) }])
-            .catch();
+        // dispatchEvent
+        if (result?.doc) {
+          this.disptachEvent("change", {
+            action: "updateOne",
+            collection: collection,
+            result: toJson(result?.doc),
+          });
         }
+
         // if updateOne done
         restActivity.save(this.#tenant, {
           operation: {
@@ -1814,16 +1821,14 @@ class useRest {
           })
           .toArray();
 
-        if (
-          this.#tenant?.searchEngine?.meilisearch?.enabled &&
-          col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-        ) {
-          this.meilisearch.client
-            .index(col?.searchEngine?.meilisearch?.index)
-            .updateDocuments(result.docs)
-            .catch();
+        // dispatchEvent
+        if (result?.docs) {
+          this.disptachEvent("change", {
+            action: "findAndUpdate",
+            collection: collection,
+            result: toJson(result?.docs),
+          });
         }
-        ``;
 
         restActivity.save(this.#tenant, {
           ip: sessionStorage()?.get()?._v?.ip,
@@ -1849,21 +1854,9 @@ class useRest {
               filter: filter,
             },
           },
-          /*    collection: collection,
-          data: {
-            update: update,
-            filter: filter,
-          },
-          transaction: this.#session ? true : false,
-          action: "findAndUpdate",
-          internal: sessionStorage()?.get() ? false : true,
-          ip: sessionStorage()?.get()?._v?.ip,
-          auth: sessionStorage()?.get()?._v?.isAuth ?? false,
-          role: sessionStorage()?.get()?.role!,
-          user: sessionStorage()?.get()?.state?.user,
-          state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid, */
         });
+
+        // Cache
         if (col?.cache?.invalidate) {
           col.cache.invalidate({
             operationType: "update",
@@ -1929,7 +1922,7 @@ class useRest {
               )
             )
           );
-          update.$set = transformAllDate(update.$set);
+          update.$set = transformAllDate(update?.$set || {});
           update.$set = await hashPasswordAuto(update.$set, col);
           var { valid, output, error } = this.validator(
             collection,
@@ -1982,19 +1975,16 @@ class useRest {
               session: this.#session ? this.#session : undefined,
             }
           );
-        if (
-          this.#tenant?.searchEngine?.meilisearch?.enabled &&
-          col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-        ) {
-          this.meilisearch.client
-            .index(col?.searchEngine?.meilisearch?.index)
-            .updateDocuments([
-              {
-                ...toJson(result.doc || {}),
-              },
-            ])
-            .catch();
+
+        // dispatchEvent
+        if (result?.doc) {
+          this.disptachEvent("change", {
+            action: "findOneAndUpdate",
+            collection: collection,
+            result: toJson(result?.doc),
+          });
         }
+
         // if findOneAndUpdate
         restActivity.save(this.#tenant, {
           ip: sessionStorage()?.get()?._v?.ip,
@@ -2020,21 +2010,9 @@ class useRest {
               filter: filter,
             },
           },
-          /*  collection: collection,
-          data: {
-            update: update,
-            filter: filter,
-          },
-          transaction: this.#session ? true : false,
-          action: "findOneAndUpdate",
-          internal: sessionStorage()?.get() ? false : true,
-          ip: sessionStorage()?.get()?._v?.ip,
-          auth: sessionStorage()?.get()?._v?.isAuth ?? false,
-          role: sessionStorage()?.get()?.role!,
-          user: sessionStorage()?.get()?.state?.user,
-          state: sessionStorage()?.get()?.state,
-          uuid: sessionStorage()?.get()?.uuid, */
         });
+
+        //
         if (col?.cache?.invalidate) {
           col.cache.invalidate({
             operationType: "update",
@@ -2045,8 +2023,8 @@ class useRest {
               tenant_id: this.#tenant_id,
             }),
             action: "findOneAndUpdate",
-            ids: [doc?._id],
-            tags: [doc?._id],
+            ids: [result?.doc?._id],
+            tags: [result?.doc?._id],
           });
         }
         return resolve(toJson(result?.doc || {}));
@@ -2155,11 +2133,11 @@ class useRest {
               )
             )
           );
-          update.$set = transformAllDate(update.$set);
+          update.$set = transformAllDate(update?.$set || {});
           update.$set = await hashPasswordAuto(update.$set, col);
           var { valid, output, error } = this.validator(
             collection,
-            dotJson.object(update?.$set),
+            dotJson.object(update?.$set || {}),
             {
               partial: true,
             }
@@ -2247,15 +2225,15 @@ class useRest {
             });
           }
 
-          if (
-            this.#tenant?.searchEngine?.meilisearch?.enabled &&
-            col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-          ) {
-            this.meilisearch.client
-              .index(col?.searchEngine?.meilisearch?.index)
-              .updateDocuments(result.docs)
-              .catch();
+          // dispatchEvent
+          if (result?.docs) {
+            this.disptachEvent("change", {
+              action: "updateMany",
+              collection: collection,
+              result: toJson(result?.docs),
+            });
           }
+
           // if updateMany done
           restActivity.save(this.#tenant, {
             ip: sessionStorage()?.get()?._v?.ip,
@@ -2312,7 +2290,7 @@ class useRest {
           }
           return resolve(result.docs);
         } else {
-          throw new contextError("List of id required", 400);
+          throw new contextError("List of ids required", 400);
         }
       } catch (err) {
         return reject(err);
@@ -2402,7 +2380,7 @@ class useRest {
             }
           );
 
-        if (col?.hooks?.afterDelete && useHook) {
+        if (col?.hooks?.afterDelete && useHook && doc) {
           await col.hooks.afterDelete({
             sharedData: sharedData,
             id: id,
@@ -2420,7 +2398,7 @@ class useRest {
             }),
           });
         }
-        if (col?.hooks?.afterOperation && useHook) {
+        if (col?.hooks?.afterOperation && useHook && doc) {
           await col.hooks.afterOperation({
             sharedData: sharedData,
             id: id,
@@ -2439,14 +2417,13 @@ class useRest {
           });
         }
 
-        if (
-          this.#tenant?.searchEngine?.meilisearch?.enabled &&
-          col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-        ) {
-          this.meilisearch.client
-            .index(col?.searchEngine?.meilisearch?.index)
-            .deleteDocument(id)
-            .catch();
+        // Dispatch events
+        if (doc) {
+          this.disptachEvent("change", {
+            action: "deleteOne",
+            collection: collection,
+            result: toJson(doc),
+          });
         }
 
         // if deleteOne done
@@ -2619,6 +2596,7 @@ class useRest {
         }
 
         let deletedIds: any = ids || [];
+        let contentIds: any = [];
 
         if (!ids)
           return reject({
@@ -2626,7 +2604,14 @@ class useRest {
             message: "Ids required",
           });
 
-        if (Array.isArray(ids)) {
+        if (Array.isArray(ids) && ids?.length) {
+          contentIds = await this.#tenant.database.db
+            ?.collection(collection)
+            .find({
+              _id: { $in: formatData(ids.map((d) => d?._id || d)) },
+            })
+            .toArray();
+
           await this.#tenant.database.db?.collection(collection).deleteMany(
             {
               _id: { $in: formatData(ids.map((d) => d?._id || d)) },
@@ -2637,7 +2622,7 @@ class useRest {
           );
         }
 
-        if (col?.hooks?.afterDelete && useHook) {
+        if (col?.hooks?.afterDelete && useHook && ids?.length) {
           await col.hooks.afterDelete({
             sharedData: sharedData,
             ids: ids,
@@ -2645,7 +2630,7 @@ class useRest {
             driver: "mongodb",
             io: Cfg.io,
             action: "deleteMany",
-            result: deletedIds,
+            result: contentIds,
             session: sessionStorage(),
             rest: new useRest({
               session: this.#session,
@@ -2656,7 +2641,7 @@ class useRest {
           });
         }
 
-        if (col?.hooks?.afterOperation && useHook) {
+        if (col?.hooks?.afterOperation && useHook && deletedIds) {
           await col.hooks.afterOperation({
             sharedData: sharedData,
             ids: ids,
@@ -2664,7 +2649,7 @@ class useRest {
             driver: "mongodb",
             io: Cfg.io,
             action: "deleteMany",
-            result: deletedIds,
+            result: contentIds,
             session: sessionStorage(),
             rest: new useRest({
               session: this.#session,
@@ -2675,15 +2660,15 @@ class useRest {
           });
         }
 
-        if (
-          this.#tenant?.searchEngine?.meilisearch?.enabled &&
-          col?.searchEngine?.meilisearch?.dispatchAction == "auto"
-        ) {
-          this.meilisearch.client
-            .index(col?.searchEngine?.meilisearch?.index)
-            .deleteDocuments(deletedIds)
-            .catch();
+        // Dispatch events
+        if (deletedIds) {
+          this.disptachEvent("change", {
+            action: "deleteMany",
+            collection: collection,
+            result: contentIds,
+          });
         }
+
         // if deleteMany done
         restActivity.save(this.#tenant, {
           ip: sessionStorage()?.get()?._v?.ip,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.76.9",
+  "version": "0.76.11",
   "module": "index.ts",
   "type": "module",
   "bin": {},

package/types/index.ts

@@ -227,9 +227,9 @@ export type hooksCtx = (ctx: {
   filter?: any;
   result?: any | null | object | undefined;
   driver?: "mongodb" | "postgres";
-  data?: object;
+  data?: any;
   params?: findParam;
-  options?: {};
+  options?: object;
   count?: number;
   id?: string;
   ids?: string[];
@@ -250,7 +250,7 @@ export type beforeOperationCtx = (ctx: {
   filter?: any;
   result?: any | null | object | undefined;
   driver?: "mongodb" | "postgres";
-  data?: object;
+  data?: any;
   params?: findParam;
   options?: {};
   count?: number;