@dnax/core 0.40.2 → 0.42.0

package/driver/mongo/rest.ts

@@ -188,7 +188,7 @@ class useRest {
   async aggregate(
     collection: string,
     pipeline: Array<object>,
-    options?: optionCb
+    options?: Omit<optionCb, "withMeta" | "elementAt">
   ) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -264,7 +264,11 @@ class useRest {
       }
     });
   }
-  async insertOne(collection: string, data: object, options?: optionCb) {
+  async insertOne(
+    collection: string,
+    data: object,
+    options?: Omit<optionCb, "withMeta" | "elementAt">
+  ) {
     return new Promise(async (resolve, reject) => {
       try {
         let sharedData = {};
@@ -388,7 +392,7 @@ class useRest {
   async insertMany(
     collection: string,
     data: Array<object>,
-    options?: optionCb
+    options?: Omit<optionCb, "withMeta" | "elementAt">
   ) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -689,7 +693,10 @@ class useRest {
   async count(
     collection: string,
     params: findParam,
-    options?: optionCb
+    options?: Omit<
+      optionCb,
+      "useCustomApi" | "withMeta" | "elementAt" | "useHook"
+    >
   ): Promise<number> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -806,7 +813,7 @@ class useRest {
     collection: string,
     id: string,
     params?: findOneParam,
-    options?: optionCb
+    options?: Omit<optionCb, "elementAt" | "withMeta">
   ): Promise<object | null> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -918,7 +925,7 @@ class useRest {
     collection: string,
     id: string,
     update: updateParams,
-    options?: optionCb
+    options?: Omit<optionCb, "withMeta" | "elementAt" | "withMeta">
   ): Promise<object> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -1077,56 +1084,98 @@ class useRest {
     });
   }
 
-  async findOneAndUpdate(
+  async findAndUpdate(
     collection: string,
     filter: object,
     update: updateParams,
-    options?: optionCb
-  ): Promise<object> {
+    options?: Omit<
+      optionCb,
+      "useHook" | "useCustomApi" | "elementAt" | "withMeta"
+    >
+  ): Promise<{ docs: object[]; matchedCount: number; modifiedCount: number }> {
     return new Promise(async (resolve, reject) => {
       try {
         let result = {
-          doc: null,
+          docs: [] as Array<object>,
         };
         let col = getCollection(collection, this.#tenant_id);
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
         update = toJson(update);
         let sharedData = {};
-        let useHook = options?.useHook ?? this.#useHook;
-        if (col?.hooks?.beforeOperation && useHook) {
-          await col.hooks.beforeOperation({
-            sharedData: sharedData,
-            filter: filter || {},
-            c: this.#c,
-            error: fn.error,
-            io: Cfg.io,
-            driver: "mongodb",
-            action: "findOneAndUpdate",
-            update: update,
-            session: sessionStorage(),
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
+        //@ts-expect-error
+        update = omit(update, omitUpdate);
+        if (update.$set) {
+          //  update.$set = deepSetId(col, update.$set);
+          update.$set = deepSetId(col, update.$set);
+          update.$set = transformAllDate(update.$set);
+          update.$set = await hashPasswordAuto(update.$set, col);
+          var { valid, output, error } = this.validator(
+            collection,
+            update.$set,
+            {
+              partial: true,
+            }
+          );
+          //  update.$set = output;
+          if (!valid) fn.error(error, 400);
         }
 
-        if (col?.hooks?.beforeUpdate && useHook) {
-          await col.hooks.beforeUpdate({
-            sharedData: sharedData,
-            c: this.#c,
-            filter: filter || {},
-            driver: "mongodb",
-            io: Cfg.io,
-            action: "findOneAndUpdate",
-            update: update,
-            session: sessionStorage(),
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
-        }
+        let up_ = await this.#tenant.database.db
+          ?.collection(collection)
+          .updateMany(
+            {
+              ...(formatData(filter) || {}),
+            },
+            {
+              ...formatData(omit(update, omitUpdate), {
+                collection: collection,
+                tenant_id: this.#tenant_id,
+              }),
+              $currentDate: {
+                updatedAt: true,
+              },
+            },
+            {
+              session: this.#session ? this.#session : undefined,
+            }
+          );
+
+        result.docs = await this.#tenant.database.db
+          .collection(collection)
+          .find(filter, {
+            session: this.#session ? this.#session : undefined,
+            allowDiskUse: true,
+          })
+          .toArray();
+        return resolve({
+          docs: result.docs,
+          matchedCount: up_?.matchedCount || 0,
+          modifiedCount: up_?.modifiedCount || 0,
+        });
+      } catch (err) {
+        return reject(err);
+      }
+    });
+  }
+
+  async findOneAndUpdate(
+    collection: string,
+    filter: object,
+    update: updateParams,
+    options?: Omit<
+      optionCb,
+      "useHook" | "useCustomApi" | "elementAt" | "withMeta"
+    >
+  ): Promise<object | null> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let result = {
+          doc: null,
+        };
+        let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        update = toJson(update);
+        let sharedData = {};
 
         //@ts-expect-error
         update = omit(update, omitUpdate);
@@ -1170,24 +1219,6 @@ class useRest {
             }
           );
 
-        if (col?.hooks?.afterUpdate && useHook) {
-          await col.hooks.afterUpdate({
-            sharedData: sharedData,
-            c: this.#c,
-            driver: "mongodb",
-            filter: filter,
-            action: "updateOne",
-            update: update,
-            session: sessionStorage(),
-            result: result.doc,
-            io: Cfg.io,
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
-        }
-
         return resolve(result.doc);
       } catch (err) {
         return reject(err);
@@ -1368,7 +1399,7 @@ class useRest {
   async deleteOne(
     collection: string,
     id: string,
-    options?: optionCb
+    options?: Omit<optionCb, "useCustomApi" | "withMeta" | "elementAt">
   ): Promise<object> {
     return new Promise(async (resolve, reject) => {
       try {
@@ -1473,7 +1504,11 @@ class useRest {
       }
     });
   }
-  async deleteMany(collection: string, ids: Array<string>, options?: optionCb) {
+  async deleteMany(
+    collection: string,
+    ids: Array<string>,
+    options?: Omit<optionCb, "useCustomApi" | "withMeta" | "elementAt">
+  ) {
     return new Promise(async (resolve, reject) => {
       try {
         let useHook = options?.useHook ?? this.#useHook;

package/package.json

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

package/types/index.ts

@@ -42,6 +42,7 @@ export type Tenant = {
   };
 };
 export type Actions =
+  | "findAndUpdate"
   | "findOneAndUpdate"
   | "find"
   | "findOne"