@dnax/core 0.4.1 → 0.4.3

package/driver/mongo/rest.ts

@@ -118,7 +118,7 @@ class useRest {
         output = value;
         data = {
           ...data,
-          ...output,
+          ...(value || output),
         };
         //console.log(value);
       }
@@ -239,10 +239,6 @@ class useRest {
 
         var { valid, output, error } = this.validator(collection, data);
         if (!valid) fn.error(error, 400);
-        data = {
-          ...output,
-          ...data,
-        };
 
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
@@ -343,12 +339,7 @@ class useRest {
           d = await hashPasswordAuto(d, col);
           d = deepSetId(col, d);
           var { valid, output, error } = this.validator(collection, d);
-
           if (!valid) fn.error(error, 400);
-          d = {
-            ...output,
-            ...d,
-          };
         }
 
         if (col?.hooks?.beforeOperation && useHook) {
@@ -515,7 +506,7 @@ class useRest {
 
         let resultDocs = toJson(result.docs);
         if (typeof options?.elementAt == "number") {
-          resultDocs = resultDocs[options?.elementAt] || null;
+          resultDocs = resultDocs[options?.elementAt] ?? null;
         }
         return resolve(resultDocs);
       } catch (err) {

package/lib/collection.ts

@@ -93,18 +93,22 @@ async function syncCollectionDatabase() {
 
             var allIndexes = await t.database.db?.collection(c.slug).indexes();
 
+            // console.log('Allindex',allIndexes)
+
             for await (let dbIndex of allIndexes || []) {
               if (
                 dbIndex?.key?.createdAt ||
                 dbIndex?.key?.updatedAt ||
                 dbIndex?.key?._id
               ) {
-                break;
+                continue;
               }
 
+              // creation des indexes si n'existe in remote
               let findexIndexKey = c.fields?.map(
                 (field) => dbIndex.key[field.name]
               );
+
               if (!findexIndexKey)
                 await t.database.db
                   ?.collection(c?.slug)
@@ -118,6 +122,19 @@ async function syncCollectionDatabase() {
               .createIndex(["createdAt", "updatedAt"])
               .then((e) => {});
 
+            // 3- suppression des indexes
+            c.fields?.map((f) => {
+              if (!f?.unique && allIndexes?.find((e) => e?.key[f.name])) {
+                //@ts-expect-error
+                t.database.db
+                  ?.collection(c.slug)
+                  .dropIndex({
+                    [f.name]: 1,
+                  })
+                  .catch();
+              }
+            });
+
             // 2- Creation des indexes par champs unique/random
 
             c.fields?.map((f) => {

package/lib/schema.ts

@@ -118,7 +118,7 @@ function buildSchema(col: Collection) {
     if (f?.validate?.schema) {
       propertySchema[f.name] = f.validate.schema;
     }
-    if (f?.defaultValue) {
+    if (f?.defaultValue !== undefined && f?.defaultValue !== null) {
       propertySchema[f.name] = propertySchema[f.name]?.default(f.defaultValue);
     }
 

package/package.json

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