@dnax/core 0.62.2 → 0.63.1

package/driver/mongo/@types.ts

@@ -15,6 +15,10 @@ export type findParam = {
   $include?: Array<string | Lookup>;
   $project?: object;
   $matchInclude?: object;
+  $group?: {
+    _id: any;
+    [key: string]: any;
+  };
   $sample?: {
     size: number;
   };

package/driver/mongo/rest.ts

@@ -1258,7 +1258,9 @@ class useRest {
     filter: object,
     update: updateParams,
     options?: Omit<
-      optionCb,
+      optionCb & {
+        upsert: boolean;
+      },
       "useHook" | "useCustomApi" | "elementAt" | "withMeta"
     >
   ): Promise<{ docs: object[]; matchedCount: number; modifiedCount: number }> {
@@ -1305,6 +1307,7 @@ class useRest {
               },
             },
             {
+              upsert: options?.upsert ?? false,
               session: this.#session ? this.#session : undefined,
             }
           );
@@ -1361,7 +1364,9 @@ class useRest {
     filter: object,
     update: updateParams,
     options?: Omit<
-      optionCb,
+      optionCb & {
+        upsert: boolean;
+      },
       "useHook" | "useCustomApi" | "elementAt" | "withMeta"
     >
   ): Promise<object | null> {
@@ -1410,9 +1415,8 @@ class useRest {
               },
             },
             {
-              upsert: true,
+              upsert: options?.upsert ?? false,
               returnDocument: "after",
-
               session: this.#session ? this.#session : undefined,
             }
           );

package/driver/mongo/utils.ts

@@ -54,7 +54,6 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
   if (params?.$include?.length) {
     params.$include.map((inc) => {
       // AutoInclue by string
-
       if (typeof inc === "string" && col) {
         let field = getFieldCollection(inc, col);
         if (field) {
@@ -66,7 +65,7 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
               as: inc,
             },
           });
-          if (!field.relation?.hasMany) {
+          if (!field?.relation?.hasMany) {
             pipeline.push({
               $unwind: {
                 path: `$${inc}`,
@@ -109,6 +108,15 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
               preserveNullAndEmptyArrays: true,
             },
           });
+        } else {
+          if (!field?.relation?.hasMany) {
+            pipeline.push({
+              $unwind: {
+                path: `$${inc}`,
+                preserveNullAndEmptyArrays: true,
+              },
+            });
+          }
         }
       }
     });
@@ -134,6 +142,13 @@ function buildPipeline(params: findParam, col?: Collection | undefined | null) {
       $sample: params.$sample,
     });
   }
+
+  if (params?.$group?._id) {
+    pipeline.push({
+      $group: params?.$group,
+    });
+  }
+
   return pipeline || [];
 }
 

package/package.json

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