@dnax/core 0.36.0 → 0.38.0

package/app/hono.ts

@@ -131,6 +131,7 @@ function HonoInstance(): typeof app {
           state: sessionData?.state || {},
           role: sessionData?.role || null,
           _v: { ...(_v || {}) },
+          isAuth: valid ? true : false,
         });
       } else {
         // no valid token
@@ -139,6 +140,7 @@ function HonoInstance(): typeof app {
           state: {},
           role: undefined,
           _v: { ...(_v || {}) },
+          isAuth: false,
         });
       }
 
@@ -564,33 +566,95 @@ function HonoInstance(): typeof app {
         }
       }
 
+      // if select is array
       if (
-        col?.api?.fields?.select?.length &&
+        col?.api?.fields?.select &&
+        typeof col?.api?.fields?.select == "object" &&
         Array.isArray(col?.api?.fields?.select)
       ) {
+        const selectedFields = [];
         if (body?.withMeta) {
-          try {
-            response.data = pick(response.data, col?.api?.fields?.select || []);
-          } catch (err) {}
+          response.data = pick(response.data, col?.api?.fields?.select);
         } else {
-          response = pick(response, col?.api?.fields?.select || []);
+          response = pick(response, col?.api?.fields?.select);
         }
       }
+      // if select is function
+      if (
+        col?.api?.fields?.select &&
+        typeof col?.api?.fields?.select == "function"
+      ) {
+        let selectedFields = [];
+        if (body?.withMeta) {
+          selectedFields = await col?.api?.fields?.select({
+            action: action,
+            c: c,
+            rest: rest,
+            session: sessionStorage() as any,
+          });
+          selectedFields = [...new Set(selectedFields)];
+          response.data = pick(response.data, selectedFields);
+        } else {
+          selectedFields = await col?.api?.fields?.select({
+            action: action,
+            c: c,
+            rest: rest,
+            session: sessionStorage() as any,
+          });
+          selectedFields = [...new Set(selectedFields)];
+          response = pick(response, selectedFields);
+        }
+      }
+
+      // hidden is array
       if (
         col?.api?.fields?.hidden?.length &&
         Array.isArray(col?.api?.fields?.hidden)
       ) {
         let privateFields = col?.api?.fields?.hidden || [];
         privateFields.push("password");
+        privateFields = [...new Set(privateFields)];
         if (body?.withMeta) {
           // If use Meta are included
           try {
             response.data = omit(response.data, privateFields);
           } catch (e) {}
+        } else {
+          response = omit(response, privateFields);
+        }
+      }
+
+      // hidden is function
+      if (
+        col?.api?.fields?.hidden?.length &&
+        typeof col?.api?.fields?.hidden == "function"
+      ) {
+        let privateFields = [];
+
+        if (body?.withMeta) {
+          // If use Meta are included
+          try {
+            privateFields = await col?.api?.fields?.hidden({
+              action: action,
+              c: c,
+              rest: rest,
+              session: sessionStorage() as any,
+            });
+            privateFields.push("password");
+            privateFields = [...new Set(privateFields)];
+            response.data = omit(response.data, privateFields);
+          } catch (e) {}
+        } else {
+          privateFields = await col?.api?.fields?.hidden({
+            action: action,
+            c: c,
+            rest: rest,
+            session: sessionStorage() as any,
+          });
+          privateFields.push("password");
+          privateFields = [...new Set(privateFields)];
+          response = omit(response, privateFields);
         }
-        response = omit(response, privateFields);
-      } else {
-        response = omit(response, ["password"]);
       }
 
       return c.json(response);

package/lib/asyncLocalStorage.ts

@@ -22,9 +22,14 @@ function isSetAsyncLocalStorage() {
 const sessionStorage = () => ({
   get(): {
     state: object;
-    _v: object;
+    _v: {
+      isAuth: boolean;
+      reqAt?: string;
+      setAt?: string;
+    };
     role: string | null | undefined;
     token?: string;
+    isAuth?: boolean;
   } {
     if (!isSetAsyncLocalStorage()) return { state: {}, _v: {}, role: null };
     let store = asyncLocalStorage?.getStore() as InstanceType<typeof Map>;

package/package.json

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

package/types/index.ts

@@ -51,6 +51,7 @@ export type Actions =
   | "updateMany"
   | "deleteOne"
   | "deleteMany"
+  | "authCollection"
   | "aggregate";
 
 export type Field = {
@@ -170,18 +171,30 @@ export type sessionCtx = {
       user?: object;
     };
     token?: string;
-    _v?: object;
+    _v?: {
+      ip: string;
+      isAuth: boolean;
+      reqAt?: string;
+      setAt?: string;
+    };
     role?: string | null | undefined;
     expiresIn?: string;
+    isAuth?: boolean;
   }) => void;
   get: () => {
     state: {
       [key: string]: any;
       user?: object;
     };
-    _v: object;
+    _v: {
+      ip: string;
+      isAuth: boolean;
+      reqAt?: string;
+      setAt?: string;
+    };
     role: string | null | undefined;
     token: string | null | undefined;
+    isAuth: boolean;
   };
 };
 
@@ -352,8 +365,22 @@ export type Collection = {
   api?: {
     //privateFields?: string[];
     fields: {
-      select?: string[];
-      hidden?: string[];
+      select?:
+        | string[]
+        | ((ctx: {
+            action: Actions;
+            c: Context;
+            rest: InstanceType<typeof useRest>;
+            session: sessionCtx;
+          }) => string[]);
+      hidden?:
+        | string[]
+        | ((ctx: {
+            action: Actions;
+            c: Context;
+            rest: InstanceType<typeof useRest>;
+            session: sessionCtx;
+          }) => string[]);
     };
   };
   allow?: ["dropCollection", "renameCollection"];