c2-mongoose 2.1.439 → 2.1.441

package/dist/flow/searcher/v3/SearcherV3Flow.js

@@ -74,7 +74,7 @@ var SearcherV3Flow = /** @class */ (function () {
                         if ((_c = params.preSteps) === null || _c === void 0 ? void 0 : _c.length) {
                             pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), params.preSteps, true);
                         }
-                        pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), GroupV3FlowItem_1.default.execute(params.groupBy, params.sumFields, params.groupDetailed, model), true);
+                        pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), GroupV3FlowItem_1.default.execute(params.groupBy, params.sumFields, params.groupDetailed, params, model), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), PopulateV3FlowItem_1.default.execute(params.populate, model), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), OneToManyV3FlowItem_1.default.execute(oneToMany, params.populate), true);
                         pipelineFacetItems = __spreadArray(__spreadArray([], pipelineFacetItems, true), MatchV3FlowItem_1.default.execute(params, model), true);
@@ -88,7 +88,7 @@ var SearcherV3Flow = /** @class */ (function () {
                                 { $skip: (params.page - 1) * (params.limit) },
                                 { $limit: params.limit }
                             ], false);
-                            pipelineFacetPaging = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], ((_e = params.preSteps) === null || _e === void 0 ? void 0 : _e.length) ? params.preSteps : [], true), GroupV3FlowItem_1.default.execute(params.groupBy, params.sumFields, params.groupDetailed, model), true), PopulateV3FlowItem_1.default.execute(params.populate, model), true), OneToManyV3FlowItem_1.default.execute(oneToMany, params.populate), true), MatchV3FlowItem_1.default.execute(params, model), true), ((_f = params.posSteps) === null || _f === void 0 ? void 0 : _f.length) ? params.posSteps : [], true), BuildPaginationDataV3FlowItem_1.default.execute(params.page, params.limit), true);
+                            pipelineFacetPaging = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], ((_e = params.preSteps) === null || _e === void 0 ? void 0 : _e.length) ? params.preSteps : [], true), GroupV3FlowItem_1.default.execute(params.groupBy, params.sumFields, params.groupDetailed, params, model), true), PopulateV3FlowItem_1.default.execute(params.populate, model), true), OneToManyV3FlowItem_1.default.execute(oneToMany, params.populate), true), MatchV3FlowItem_1.default.execute(params, model), true), ((_f = params.posSteps) === null || _f === void 0 ? void 0 : _f.length) ? params.posSteps : [], true), BuildPaginationDataV3FlowItem_1.default.execute(params.page, params.limit), true);
                             facet.paging = pipelineFacetPaging;
                         }
                         facet.items = pipelineFacetItems;

package/dist/flow/searcher/v3/item/BuildAndQueriesFlowItem.js

@@ -54,7 +54,8 @@ var BuildAndQueriesFlowItem = /** @class */ (function () {
                     'searchPageable',
                     'preSteps',
                     'posSteps',
-                    'metadata'
+                    'metadata',
+                    'docs.'
                 ].includes(key)) {
                     return;
                 }

package/dist/flow/searcher/v3/item/GroupV3FlowItem.d.ts

@@ -1,6 +1,6 @@
 import mongoose from "mongoose";
 declare class GroupV3FlowItem {
-    execute(fieldToGroup: string, sumFields: string, detailed: boolean, modelRoot: mongoose.Model<any>): any[];
+    execute(fieldToGroup: string, sumFields: string, detailed: boolean, filters: any, modelRoot: mongoose.Model<any>): any[];
 }
 declare const _default: GroupV3FlowItem;
 export default _default;

package/dist/flow/searcher/v3/item/GroupV3FlowItem.js

@@ -7,8 +7,9 @@ var GetTypeOfFieldInModelFlowItem_1 = __importDefault(require("./GetTypeOfFieldI
 var GroupV3FlowItem = /** @class */ (function () {
     function GroupV3FlowItem() {
     }
-    GroupV3FlowItem.prototype.execute = function (fieldToGroup, sumFields, detailed, modelRoot) {
+    GroupV3FlowItem.prototype.execute = function (fieldToGroup, sumFields, detailed, filters, modelRoot) {
         var _a;
+        var _b;
         if (!fieldToGroup)
             return [];
         var sumField = sumFields ? sumFields[0] : undefined;
@@ -73,6 +74,34 @@ var GroupV3FlowItem = /** @class */ (function () {
             projectClause.$project["".concat(sumField, "Total")] = "$".concat(tempFieldName);
         }
         groupsClauses.push(projectClause);
+        if (detailed && (filters === null || filters === void 0 ? void 0 : filters.orderBy)) {
+            var orderBy = Array.isArray(filters.orderBy) ? filters.orderBy : [filters.orderBy];
+            var docOrderBy = orderBy.filter(function (o) { return typeof o === 'string' && o.startsWith('doc.'); });
+            var sortByFields = {};
+            for (var _i = 0, docOrderBy_1 = docOrderBy; _i < docOrderBy_1.length; _i++) {
+                var o = docOrderBy_1[_i];
+                sortByFields[o.replace(/^doc\./, '')] = filters.orderSense === 'desc' ? -1 : 1;
+            }
+            var remainingOrderBy = orderBy.filter(function (o) { return typeof o !== 'string' || !o.startsWith('doc.'); });
+            if (Array.isArray(filters.orderBy)) {
+                filters.orderBy = remainingOrderBy.length ? remainingOrderBy : undefined;
+            }
+            else {
+                filters.orderBy = (_b = remainingOrderBy[0]) !== null && _b !== void 0 ? _b : undefined;
+            }
+            if (Object.keys(sortByFields).length > 0) {
+                groupsClauses.push({
+                    $set: {
+                        docs: {
+                            $sortArray: {
+                                input: '$docs',
+                                sortBy: sortByFields
+                            }
+                        }
+                    }
+                });
+            }
+        }
         return groupsClauses;
     };
     return GroupV3FlowItem;

package/dist/flow/searcher/v3/item/SortV3FlowItem.d.ts

@@ -1,5 +1,5 @@
 declare class SortV3FlowItem {
-    execute(orderBy: string, orderSense: string): any[];
+    execute(orderBy: string | string[], orderSense: string): any[];
 }
 declare const _default: SortV3FlowItem;
 export default _default;

package/dist/flow/searcher/v3/item/SortV3FlowItem.js

@@ -4,6 +4,14 @@ var SortV3FlowItem = /** @class */ (function () {
     function SortV3FlowItem() {
     }
     SortV3FlowItem.prototype.execute = function (orderBy, orderSense) {
+        if (Array.isArray(orderBy)) {
+            return orderBy.map(function (order) {
+                var _a;
+                return _a = {},
+                    _a[order] = orderSense === "desc" ? -1 : 1,
+                    _a;
+            });
+        }
         var sort = {};
         sort[orderBy !== null && orderBy !== void 0 ? orderBy : "_id"] = orderSense === "desc" ? -1 : 1;
         return [{ $sort: sort }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.439",
+  "version": "2.1.441",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/flow/searcher/v3/SearcherV3Flow.ts

@@ -30,7 +30,8 @@ class SearcherV3Flow {
     if (params.preSteps?.length) {
       pipelineFacetItems = [...pipelineFacetItems, ...params.preSteps]
     }
-    pipelineFacetItems = [...pipelineFacetItems, ...GroupV3FlowItem.execute(params.groupBy, params.sumFields, params.groupDetailed, model)]
+    
+    pipelineFacetItems = [...pipelineFacetItems, ...GroupV3FlowItem.execute(params.groupBy, params.sumFields, params.groupDetailed, params, model)]
     pipelineFacetItems = [...pipelineFacetItems, ...PopulateV3FlowItem.execute(params.populate, model)]
     pipelineFacetItems = [...pipelineFacetItems, ...OneToManyV3FlowItem.execute(oneToMany, params.populate)]
     pipelineFacetItems = [...pipelineFacetItems, ...MatchV3FlowItem.execute(params, model)]
@@ -51,7 +52,7 @@ class SearcherV3Flow {
       pipelineFacetPaging = [
         ...params.preSteps?.length ? params.preSteps : [],
 
-        ...GroupV3FlowItem.execute(params.groupBy, params.sumFields, params.groupDetailed, model),
+        ...GroupV3FlowItem.execute(params.groupBy, params.sumFields, params.groupDetailed, params, model),
         ...PopulateV3FlowItem.execute(params.populate, model),
         ...OneToManyV3FlowItem.execute(oneToMany, params.populate),
         ...MatchV3FlowItem.execute(params, model),

package/src/flow/searcher/v3/item/BuildAndQueriesFlowItem.ts

@@ -35,7 +35,8 @@ class BuildAndQueriesFlowItem {
           'searchPageable',
           'preSteps',
           'posSteps',
-          'metadata'
+          'metadata',
+          'docs.'
         ].includes(key)) {
           return
         }

package/src/flow/searcher/v3/item/GroupV3FlowItem.ts

@@ -2,7 +2,7 @@ import mongoose from "mongoose";
 import GetTypeOfFieldInModelFlowItem from "./GetTypeOfFieldInModelFlowItem"
 
 class GroupV3FlowItem {
-  execute(fieldToGroup: string, sumFields: string, detailed: boolean, modelRoot: mongoose.Model<any>): any[] {
+  execute(fieldToGroup: string, sumFields: string, detailed: boolean, filters: any, modelRoot: mongoose.Model<any>): any[] {
     if (!fieldToGroup) return []
 
     const sumField = sumFields ? sumFields[0] : undefined
@@ -79,6 +79,35 @@ class GroupV3FlowItem {
 
     groupsClauses.push(projectClause)
 
+    if (detailed && filters?.orderBy) {
+      const orderBy = Array.isArray(filters.orderBy) ? filters.orderBy : [filters.orderBy]
+      const docOrderBy = orderBy.filter((o: string) => typeof o === 'string' && o.startsWith('doc.'))
+      const sortByFields: Record<string, 1 | -1> = {}
+      for (const o of docOrderBy) {
+        sortByFields[o.replace(/^doc\./, '')] = filters.orderSense === 'desc' ? -1 : 1
+      }
+
+      const remainingOrderBy = orderBy.filter((o: string) => typeof o !== 'string' || !o.startsWith('doc.'))
+      if (Array.isArray(filters.orderBy)) {
+        filters.orderBy = remainingOrderBy.length ? remainingOrderBy : undefined
+      } else {
+        filters.orderBy = remainingOrderBy[0] ?? undefined
+      }
+
+      if (Object.keys(sortByFields).length > 0) {
+        groupsClauses.push({
+          $set: {
+            docs: {
+              $sortArray: {
+                input: '$docs',
+                sortBy: sortByFields
+              }
+            }
+          }
+        })
+      }
+    }
+
     return groupsClauses
   }
 }

package/src/flow/searcher/v3/item/SortV3FlowItem.ts

@@ -1,5 +1,14 @@
 class SortV3FlowItem {
-  execute(orderBy: string, orderSense: string): any[] {
+  execute(orderBy: string | string[], orderSense: string): any[] {
+
+    if (Array.isArray(orderBy)) {
+      return orderBy.map((order: string) => {
+        return {
+          [order]: orderSense === "desc" ? -1 : 1
+        }
+      })
+    }
+
     let sort = {} as any
     sort[orderBy ?? "_id"] = orderSense === "desc" ? -1 : 1
     return [{ $sort: sort }]