@dnax/core 0.69.13 → 0.69.15

package/driver/mongo/@types.ts

@@ -18,7 +18,12 @@ export type findParam = {
   $skip?: number;
   $limit?: number;
   $include?: Array<string | Lookup>;
-  $project?: object;
+  $project?: {
+    [key: string]: 1 | 0;
+  };
+  $projectInclude?: {
+    [key: string]: 1 | 0;
+  };
   $matchInclude?: {
     _id?: string;
     [key: string]: any;

package/driver/mongo/rest.ts

@@ -804,7 +804,7 @@ class useRest {
             io: Cfg.io,
             driver: "mongodb",
             action: "find",
-            meta: meta,
+            meta: {},
             count: result?.docs?.length || 0,
             params: toJson(params),
             session: sessionStorage(),
@@ -837,7 +837,7 @@ class useRest {
     return new Promise(async (resolve, reject) => {
       try {
         let meta = {
-          ms: 0, // time duration
+          ts: 0, // time duration
         };
         let start = Date.now();
 
@@ -900,7 +900,7 @@ class useRest {
             }),
           })) as any;
           // Temp dexecution en ms
-          meta.ms = Date.now() - start;
+          meta.ts = Date.now() - start;
           return resolve({
             meta: meta,
             data: result,
@@ -916,7 +916,7 @@ class useRest {
             .toArray()) || [];
 
         result.docs = toJson(result.docs);
-        meta.ms = Date.now() - start;
+        meta.ts = Date.now() - start;
         if (col?.hooks?.afterFindWithMeta && useHook) {
           await col.hooks.afterFindWithMeta({
             sharedData: sharedData,
@@ -1201,7 +1201,6 @@ class useRest {
             params: params,
             session: sessionStorage(),
             result: docs,
-            meta: meta,
             rest: new useRest({
               useHook: false,
               tenant_id: this.#tenant_id,
@@ -1209,15 +1208,6 @@ 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);

package/driver/mongo/utils.ts

@@ -10,6 +10,20 @@ import { Cfg } from "../../config";
 function buildPipeline(params: findParam, col?: Collection | undefined | null) {
   let pipeline = [];
 
+  // $match
+  if (params?.$match) {
+    pipeline.push({
+      $match: params.$match,
+    });
+  }
+
+  // project
+  if (params?.$project) {
+    pipeline.push({
+      $project: params.$project,
+    });
+  }
+
   // sorted
   if (!params?.$sort?.createdAt) {
     pipeline.push({
@@ -20,14 +34,10 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
     });
   } else {
     pipeline.push({
-      $sort: params?.$sort,
-    });
-  }
-
-  // $match
-  if (params?.$match) {
-    pipeline.push({
-      $match: params.$match,
+      $sort: {
+        createdAt: -1,
+        ...(params?.$sort || {}),
+      },
     });
   }
 
@@ -129,10 +139,9 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
     });
   }
 
-  // project
-  if (params?.$project) {
+  if (params?.$projectInclude) {
     pipeline.push({
-      $project: params.$project,
+      $project: params.$projectInclude,
     });
   }
 

package/lib/collection.ts

@@ -190,16 +190,50 @@ async function syncCollectionDatabase() {
                 // console.error(err?.message);
               });
 
-            for await (let dbIndex of allIndexes || []) {
+            let foundTimeStamIndex = allIndexes?.find((el) => {
+              return deepEqual(el.key, {
+                createdAt: -1,
+                updatedAt: -1,
+              });
+            });
+
+            let foundTimeStampIndexDesc = allIndexes?.find((el) => {
+              return deepEqual(el.key, {
+                createdAt: 1,
+                updatedAt: 1,
+              });
+            });
+
+            if (foundTimeStampIndexDesc) {
+              await t.database.db
+                ?.collection(c.slug)
+                .dropIndex("createdAt_1_updatedAt_1")
+                .catch((err) => {
+                  // console.error(err?.message);
+                });
+            }
+
+            if (!foundTimeStamIndex) {
+              await t.database.db?.collection(c.slug).createIndex({
+                createdAt: -1,
+                updatedAt: -1,
+              });
+            }
+
+            /*  for await (let dbIndex of allIndexes || []) {
               // creation des indexes createdAt / updatedAt
+
               if (!dbIndex?.key?.createdAt && !dbIndex?.key?.updatedAt) {
                 await t.database.db
                   ?.collection(c.slug)
-                  .createIndex(["createdAt", "updatedAt"])
+                  .createIndex({
+                    createdAt: -1,
+                    updatedAt: -1,
+                  })
                   .then((e) => {})
                   .catch((err) => {});
               }
-            }
+            } */
 
             // 2- Creation des indexes par champs unique/random
             c.fields?.map((f) => {

package/package.json

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

package/types/index.ts

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