@dnax/core 0.47.0 → 0.47.2

package/app/hono.ts

@@ -555,7 +555,10 @@ function HonoInstance(): typeof app {
           response = await rest.findOne(
             collection,
             body?.id || body._id,
-            body?.params || {}
+            body?.params || {},
+            {
+              withMeta: body?.withMeta || false,
+            }
           );
         }
         if (action == "insertOne") {
@@ -691,6 +694,15 @@ function HonoInstance(): typeof app {
         }
       }
 
+      if (
+        !col?.api?.fields?.hidden &&
+        !col?.api?.fields?.select &&
+        body?.withMeta
+      ) {
+        response.data = omit(response.data, ["password"]);
+        response.meta = response.meta || {};
+      }
+
       return c.json(response);
     } catch (err: any) {
       if (Cfg?.debug) console.log(err?.message | err);

package/driver/mongo/rest.ts

@@ -813,10 +813,14 @@ class useRest {
     collection: string,
     id: string,
     params?: findOneParam,
-    options?: Omit<optionCb, "elementAt" | "withMeta">
+    options?: Omit<optionCb, "elementAt">
   ): Promise<object | null> {
     return new Promise(async (resolve, reject) => {
       try {
+        let meta = {
+          total: 0,
+          count: 0,
+        };
         let sharedData = {};
         let docs: Array<any> | any = [];
         let useHook = options?.useHook ?? this.#useHook;
@@ -907,6 +911,7 @@ class useRest {
             params: params,
             session: sessionStorage(),
             result: docs,
+            meta: meta,
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
@@ -914,6 +919,15 @@ class useRest {
           });
         }
 
+        if (options?.withMeta) {
+          meta.count = docs?.length || 0;
+          meta.total = docs?.length || 0;
+          resolve({
+            data: docs?.length ? toJson(docs[0]) : null,
+            meta: meta,
+          });
+        }
+
         return resolve(docs?.length ? toJson(docs[0]) : null);
       } catch (err) {
         return reject(err);
@@ -932,6 +946,7 @@ class useRest {
         let result = {
           doc: null,
         };
+        let meta = {};
         let sharedData = {};
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
@@ -951,6 +966,7 @@ class useRest {
             driver: "mongodb",
             action: "updateOne",
             update: update,
+
             session: sessionStorage(),
             rest: new useRest({
               useHook: false,

package/package.json

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

package/types/index.ts

@@ -211,7 +211,7 @@ export type hooksCtx = (ctx: {
   sharedData?: any;
   action?: Actions;
   c?: Context;
-  meta?: { total: number; count: number; [key: string]: any };
+  meta?: { total?: number; count?: number; [key: string]: any };
   rest: InstanceType<typeof useRest>;
   session?: sessionCtx;
   io: socketIoType;