@dnax/core 0.32.0 → 0.34.0

package/app/hono.ts

@@ -20,6 +20,7 @@ import {
   jwt,
   fn,
   omit,
+  pick,
   stringToBoolean,
 } from "../utils";
 import { getAction } from "./ctrl";
@@ -31,7 +32,7 @@ import { getService } from "../lib/service";
 import { bentoCache, bentoKey } from "../lib/bento";
 import { MediaDrive } from "../lib/media";
 import { isStudio } from "../lib/studio";
-import { pick } from "radash";
+
 import { secureHeaders } from "hono/secure-headers";
 import { getTenant } from "../lib/tenant";
 import { checkPermission, getPermission } from "../lib/permissions";
@@ -563,8 +564,21 @@ function HonoInstance(): typeof app {
         }
       }
 
-      if (col?.privateFields?.length) {
-        response = omit(response, col?.privateFields || []);
+      if (
+        col?.api?.fields?.select?.length &&
+        Array.isArray(col?.api?.fields?.select?.length)
+      ) {
+        response = pick(response, col?.api?.fields?.select || []);
+      }
+      if (
+        col?.api?.fields?.hidden?.length &&
+        Array.isArray(col?.api?.fields?.hidden?.length)
+      ) {
+        let privateFields = col?.api?.fields?.hidden || [];
+        privateFields.push("password");
+        response = omit(response, privateFields);
+      } else {
+        response = omit(response, ["password"]);
       }
 
       return c.json(response);

package/driver/mongo/rest.ts

@@ -1026,7 +1026,7 @@ class useRest {
                 _id: new ObjectId(id),
               },
               {
-                ...formatData(omit(transformAllDate(update), omitUpdate)),
+                ...formatData(omit(update, omitUpdate)),
                 $currentDate: {
                   updatedAt: true,
                 },

package/package.json

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

package/types/index.ts

@@ -349,7 +349,13 @@ export type Collection = {
   timestamps?: boolean;
   description?: string;
   fields?: Field[];
-  privateFields?: string[];
+  api?: {
+    //privateFields?: string[];
+    fields: {
+      select?: string[];
+      hidden?: string[];
+    };
+  };
   allow?: ["dropCollection", "renameCollection"];
   indexes?: Array<{
     [key: string]: any;

package/utils/index.ts

@@ -65,7 +65,7 @@ const jwt = {
       return jwto.sign({ session: payload }, JWT_SECRET, {
         ...options,
       });
-    } catch (err) {
+    } catch (err: any) {
       console.error(err?.message);
     }
   },
@@ -109,8 +109,17 @@ function isDate(date: string): boolean {
   const dateRegex3 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/;
   // le regex pour cette forme 2024-11-30T21:36:12+00:00
   const dateRegex4 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/;
+
+  // le regex pour cette forme 2024-11-30 21:36:12+00:00
   const dateRegex5 = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/;
   const dateRegex6 = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}$/;
+
+  // le regex pour cette forme 2024-11-30T21:36
+  const dateRegex7 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/;
+
+  // le regex pour cette forme 2024-11-30 21:36
+  const dateRegex8 = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/;
+
   let isDate_ =
     !isNaN(Date.parse(date)) &&
     (dateRegex.test(date) ||
@@ -118,7 +127,9 @@ function isDate(date: string): boolean {
       dateRegex4.test(date) ||
       dateRegex5.test(date) ||
       dateRegex6.test(date) ||
-      dateRegex3.test(date));
+      dateRegex3.test(date) ||
+      dateRegex7.test(date) ||
+      dateRegex8.test(date));
   if (isDate_) return true;
   try {
     isDate_ = moment(date, "YYYY-MM-DD", true).isValid();
@@ -151,7 +162,7 @@ async function verifyHashPassword(
   }
 }
 
-function toDate(data: object | string): object | string {
+function toDate(data: any | string): object | string {
   if (data) {
     if (typeof data == "string" && isDate(data)) {
       data = new Date(data);
@@ -284,9 +295,9 @@ function pick(data: object | object[], keys: string[]): object {
     return result;
   };
 
-  const setDeepValue = (obj, keys, value) => {
+  const setDeepValue = (obj: any, keys: string[], value: any) => {
     let current = obj;
-    keys.forEach((key, index) => {
+    keys.forEach((key: any, index: number) => {
       if (index === keys.length - 1) {
         current[key] = value;
       } else {