@dnax/core 0.19.5 → 0.19.7

package/driver/mongo/rest.ts

@@ -1,11 +1,11 @@
 import moment from "moment";
 import { sessionStorage } from "../../lib/asyncLocalStorage";
-import { getCollection } from "../../lib/collection";
+import { getCollection, getKeyFields } from "../../lib/collection";
 import { getTenant } from "../../lib/tenant";
 import type { Actions, Collection, Tenant } from "./../../types/index";
 import { isArray, omit } from "radash";
 import { ChangeStream, ClientSession, MongoClient, ObjectId } from "mongodb";
-import { contextError, fn, toJson, dotJson } from "../../utils";
+import { contextError, fn, toJson, dotJson, getEntryBykeys } from "../../utils";
 import v, { type Schema } from "joi";
 import type { Context } from "hono";
 
@@ -916,6 +916,9 @@ class useRest {
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let col = getCollection(collection, this.#tenant_id);
+        if (!col) return;
+        let allFieldKeys = getKeyFields(col);
+
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
 
         if (col?.hooks?.beforeOperation && useHook) {
@@ -971,12 +974,14 @@ class useRest {
         update = omit(update, omitUpdate);
 
         if (update?.$set) {
+          update.$set = getEntryBykeys(update.$set, allFieldKeys);
           update.$set = deepSetId(
             col,
             omit(update.$set, ["createdAt", "updatedAt", "_id"])
           );
           update.$set = transformAllDate(update.$set);
           update.$set = await hashPasswordAuto(update.$set, col);
+
           //   data = transformAllDate(data);
           //update.$set = deepSetId(col, update.$set);
           var { valid, output, error } = this.validator(
@@ -1186,6 +1191,7 @@ class useRest {
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        let allFieldKeys = getKeyFields(col);
 
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
@@ -1240,6 +1246,8 @@ class useRest {
         update = omit(update, omitUpdate);
 
         if (update.$set) {
+          update.$set = getEntryBykeys(update.$set, allFieldKeys);
+
           update.$set = deepSetId(
             col,
             omit(update.$set, ["createdAt", "updatedAt", "_id"])

package/index.ts

@@ -10,6 +10,7 @@ import { dataCache } from "./lib/bento";
 import { FilesystemSftpAdapter } from "./lib/media";
 import { crypt } from "./lib/crypto";
 import { contextStorage } from "./lib/asyncLocalStorage";
+import { Cron as Task } from "croner";
 
 // Adapter
 
@@ -31,6 +32,7 @@ export {
   useRest,
   v,
   dataCache,
+  Task,
   crypt,
   $,
   contextStorage,

package/lib/collection.ts

@@ -220,10 +220,14 @@ async function syncCollectionDatabase() {
 }
 
 function getKeyFields(col: Collection) {
-  let keyFields: string[] = [];
+  let keyFields: string[] = ["_id", "createdAt", "updatedAt"];
+  if (col?.type == "media") {
+    keyFields.push("_file");
+  }
   col?.fields?.map((f) => {
-    keyFields.push(f.name);
+    if (f?.name) keyFields.push(f?.name);
   });
+
   return keyFields;
 }
 
@@ -232,4 +236,5 @@ export {
   getCollection,
   getFieldCollection,
   syncCollectionDatabase,
+  getKeyFields,
 };

package/package.json

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

package/utils/index.ts

@@ -311,6 +311,31 @@ function stringToBoolean(
   return defaultValue;
 }
 
+function getEntryBykeys(obj: object = {}, keys: string[] = []) {
+  if (!keys && !obj) return {};
+  // Vérifie si l'entrée est valide
+  let clesConservees = keys;
+  if (
+    !Array.isArray(clesConservees) ||
+    typeof obj !== "object" ||
+    obj === null
+  ) {
+    /* throw new Error(
+      "Paramètres invalides : un tableau et un objet sont requis."
+    ); */
+  }
+
+  // Crée un nouvel objet avec uniquement les clés spécifiées
+  let resultat = {};
+  for (const cle of clesConservees) {
+    if (obj?.hasOwnProperty(cle)) {
+      resultat[cle] = obj[cle];
+    }
+  }
+
+  return resultat;
+}
+
 class contextError extends Error {
   constructor(message: string, code: number) {
     super(message);
@@ -330,8 +355,6 @@ const password = {
   verify: verifyHashPassword,
 };
 
-
-
 export {
   dotJson,
   uuid,
@@ -345,6 +368,7 @@ export {
   toDate, // transform to date
   toJson, //  to Json
   hashPassword,
+  getEntryBykeys,
   verifyHashPassword,
   cleanPath,
   freeze, // Lock object properties