@dnax/core 0.41.0 → 0.43.0

package/app/hono.ts

@@ -412,16 +412,35 @@ function HonoInstance(): typeof app {
           if (col?.slug && col?.media?.enabled) {
             let data = JSON.parse(parseBody?.data) || {};
             // rest.startTransaction();
+
+            let files = [];
+            if (Array.isArray(parseBody.file)) {
+              files = parseBody.file;
+            } else {
+              files.push(parseBody.file);
+            }
+
+            if (col?.hooks?.beforeUpload) {
+              await col?.hooks?.beforeUpload({
+                io: Cfg.io,
+                data: data,
+                c: c,
+                rest: rest,
+                action: "upload",
+                session: sessionStorage(),
+                error: fn.error,
+                files: files,
+              });
+            }
             const drive = new MediaDrive({
               location: col?.media?.overwriteFolderName ?? col?.slug,
               visibility: col?.media?.visibility ?? "public",
             });
 
-            if (Array.isArray(parseBody?.file)) {
+            if (Array.isArray(files)) {
               let insertedFiles = [];
-
               let indexedData = 0;
-              let allFiles = parseBody?.file;
+              let allFiles = files;
               for await (let file of allFiles) {
                 let d;
                 if (Array.isArray(data) && data.length) {
@@ -430,13 +449,28 @@ function HonoInstance(): typeof app {
                   d = data;
                 }
                 let insertedFile = await drive.write(file.name, file);
+
                 insertedFiles.push({
                   ...d,
                   _file: insertedFile,
                 });
                 indexedData++;
               }
+
               response = await rest.insertMany(col?.slug, insertedFiles);
+              if (col?.hooks?.afterUpload) {
+                await col?.hooks?.afterUpload({
+                  io: Cfg.io,
+                  data: data,
+                  c: c,
+                  rest: rest,
+                  action: "upload",
+                  session: sessionStorage(),
+                  error: fn.error,
+                  files: files,
+                  result: response,
+                });
+              }
             } else if (typeof parseBody?.file == "object") {
               let insertedFile = await drive.write(
                 parseBody.file?.name,

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 {
@@ -1081,53 +1088,20 @@ class useRest {
     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: "findAndUpdate",
-            update: update,
-            session: sessionStorage(),
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
-        }
-
-        if (col?.hooks?.beforeUpdate && useHook) {
-          await col.hooks.beforeUpdate({
-            sharedData: sharedData,
-            c: this.#c,
-            filter: filter || {},
-            driver: "mongodb",
-            io: Cfg.io,
-            action: "findAndUpdate",
-            update: update,
-            session: sessionStorage(),
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
-        }
-
         //@ts-expect-error
         update = omit(update, omitUpdate);
         if (update.$set) {
@@ -1146,7 +1120,7 @@ class useRest {
           if (!valid) fn.error(error, 400);
         }
 
-        result.doc = await this.#tenant.database.db
+        let up_ = await this.#tenant.database.db
           ?.collection(collection)
           .updateMany(
             {
@@ -1166,25 +1140,18 @@ class useRest {
             }
           );
 
-        if (col?.hooks?.afterUpdate && useHook) {
-          await col.hooks.afterUpdate({
-            sharedData: sharedData,
-            c: this.#c,
-            driver: "mongodb",
-            filter: filter,
-            action: "findAndUpdate",
-            update: update,
-            session: sessionStorage(),
-            result: result.doc,
-            io: Cfg.io,
-            rest: new useRest({
-              useHook: false,
-              tenant_id: this.#tenant_id,
-            }),
-          });
-        }
-
-        return resolve(result.doc);
+        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);
       }
@@ -1195,8 +1162,11 @@ class useRest {
     collection: string,
     filter: object,
     update: updateParams,
-    options?: optionCb
-  ): Promise<object> {
+    options?: Omit<
+      optionCb,
+      "useHook" | "useCustomApi" | "elementAt" | "withMeta"
+    >
+  ): Promise<object | null> {
     return new Promise(async (resolve, reject) => {
       try {
         let result = {
@@ -1206,41 +1176,6 @@ class useRest {
         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,
-            }),
-          });
-        }
-
-        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,
-            }),
-          });
-        }
 
         //@ts-expect-error
         update = omit(update, omitUpdate);
@@ -1284,24 +1219,6 @@ class useRest {
             }
           );
 
-        if (col?.hooks?.afterUpdate && useHook) {
-          await col.hooks.afterUpdate({
-            sharedData: sharedData,
-            c: this.#c,
-            driver: "mongodb",
-            filter: filter,
-            action: "findOneAndUpdate",
-            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);
@@ -1482,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 {
@@ -1587,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.41.0",
+  "version": "0.43.0",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -53,7 +53,8 @@ export type Actions =
   | "deleteOne"
   | "deleteMany"
   | "authCollection"
-  | "aggregate";
+  | "aggregate"
+  | "upload";
 
 export type Field = {
   name: string;
@@ -212,6 +213,7 @@ export type hooksCtx = (ctx: {
   rest: InstanceType<typeof useRest>;
   session?: sessionCtx;
   io: socketIoType;
+  files: Array<any> | Object;
   error: typeof fn.error;
 }) => any;
 
@@ -334,6 +336,8 @@ export type Collection = {
     afterAggregate?: hooksCtx;
     beforeCount?: hooksCtx;
     afterCount?: hooksCtx;
+    beforeUpload?: hooksCtx;
+    afterUpload?: hooksCtx;
   };
   access?: {
     "*"?: accessCtx;