c2-mongoose 2.1.249 → 2.1.251

package/dist/flow/SearcherFlow.d.ts

@@ -7,16 +7,16 @@ export interface IPopulate {
     populate: IPopulate;
 }
 declare class SearcherFlow<D> {
-    private model;
+    model: mongoose.Model<any>;
     [key: string]: any;
-    private searchText;
-    private orderSense;
-    private orderBy;
-    private page;
-    private limit;
-    private pageable;
-    private select;
-    private populate;
+    searchText: string;
+    orderSense: string;
+    orderBy: string;
+    page: number;
+    limit: number;
+    pageable: boolean;
+    select: string[];
+    populate: string[];
     filters: any;
     constructor(repository: mongoose.Model<any>);
     prepareSearch(search: any): void;

package/dist/flow/SearcherFlow.js

@@ -92,6 +92,7 @@ var SearcherFlow = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         stagesItems = [];
+                        stagesPaging = [];
                         if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
                             stagesItems.push.apply(stagesItems, options.pipelines);
                         }
@@ -104,35 +105,34 @@ var SearcherFlow = /** @class */ (function () {
                                 stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(this.model, this.select) });
                             }
                             stagesItems.push({ $sort: this.buildOrdenation() });
+                            if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
+                                stagesPaging.push.apply(stagesPaging, options.pipelines);
+                            }
+                            if ((0, Utils_1.isNotEmpty)(options.unions)) {
+                                stagesPaging.push.apply(stagesPaging, options.unions);
+                            }
+                            stagesPaging.push({ $match: this.filters });
+                            stagesPaging.push({ $count: "total" });
+                            stagesPaging.push({
+                                $addFields: {
+                                    page: this.pageable === true ? this.page : 1,
+                                    limit: this.pageable === true ? this.limit : '$total',
+                                    totalPages: this.pageable === true ? {
+                                        $cond: {
+                                            if: { $eq: ['$total', 0] },
+                                            then: 0,
+                                            else: { $ceil: { $divide: ['$total', this.limit] } }
+                                        }
+                                    } : 1,
+                                    startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
+                                    endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
+                                }
+                            });
                         }
                         if (this.pageable === true) {
                             stagesItems.push({ $skip: ((this.page - 1) * this.limit) || 0 });
                             stagesItems.push({ $limit: this.limit });
                         }
-                        stagesPaging = [];
-                        if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
-                            stagesPaging.push.apply(stagesPaging, options.pipelines);
-                        }
-                        if ((0, Utils_1.isNotEmpty)(options.unions)) {
-                            stagesPaging.push.apply(stagesPaging, options.unions);
-                        }
-                        stagesPaging.push({ $match: this.filters });
-                        stagesPaging.push({ $count: "total" });
-                        stagesPaging.push({
-                            $addFields: {
-                                page: this.pageable === true ? this.page : 1,
-                                limit: this.pageable === true ? this.limit : '$total',
-                                totalPages: this.pageable === true ? {
-                                    $cond: {
-                                        if: { $eq: ['$total', 0] },
-                                        then: 0,
-                                        else: { $ceil: { $divide: ['$total', this.limit] } }
-                                    }
-                                } : 1,
-                                startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
-                                endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
-                            }
-                        });
                         stagesMetadata = [];
                         if ((0, Utils_1.isNotEmpty)(options.metadata)) {
                             stagesMetadata.push.apply(stagesMetadata, options.metadata);

package/dist/index.d.ts

@@ -6,10 +6,11 @@ import AddStagePaginationFlowItem from "./flow/item/AddStagePaginationFlowItem";
 import AddStageSortFlowItem from "./flow/item/AddStageSortFlowItem";
 import BuildPipelineToCountJoinFlowItem from "./flow/item/BuildPipelineToCountJoinFlowItem";
 import BuildPipelineToJoinFlowItem from "./flow/item/BuildPipelineToJoinFlowItem";
+import BuildSelectSingleFlowItem from "./flow/item/BuildSelectSingleFlowItem";
 import ConvertToSearchResponseFlowItem from "./flow/item/ConvertToSearchResponseFlowItem";
 import { IFacet } from "./model/Facet";
 import { ILogger, LoggerModel, LoggerSearch, TypeOfOperation } from "./model/Logger";
 import { Options } from "./types/Options";
 import { Pagination, SearchResponse } from "./types/SearchResponse";
 import { initialize } from "./utils/Utils";
-export { SearcherFlow, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, TypeOfOperation, initialize };
+export { SearcherFlow, BuildSelectSingleFlowItem, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, TypeOfOperation, initialize };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialize = exports.TypeOfOperation = exports.SearchFlow = exports.LoggerSearch = exports.LoggerModel = exports.CrudFlow = exports.ConvertToSearchResponseFlowItem = exports.C2Flow = exports.BuildPipelineToJoinFlowItem = exports.BuildPipelineToCountJoinFlowItem = exports.AddStageSortFlowItem = exports.AddStagePaginationFlowItem = exports.SearcherFlow = void 0;
+exports.initialize = exports.TypeOfOperation = exports.SearchFlow = exports.LoggerSearch = exports.LoggerModel = exports.CrudFlow = exports.ConvertToSearchResponseFlowItem = exports.C2Flow = exports.BuildPipelineToJoinFlowItem = exports.BuildPipelineToCountJoinFlowItem = exports.AddStageSortFlowItem = exports.AddStagePaginationFlowItem = exports.BuildSelectSingleFlowItem = exports.SearcherFlow = void 0;
 var C2Flow_1 = __importDefault(require("./flow/C2Flow"));
 exports.C2Flow = C2Flow_1.default;
 var CrudFlow_1 = __importDefault(require("./flow/CrudFlow"));
@@ -20,6 +20,8 @@ var BuildPipelineToCountJoinFlowItem_1 = __importDefault(require("./flow/item/Bu
 exports.BuildPipelineToCountJoinFlowItem = BuildPipelineToCountJoinFlowItem_1.default;
 var BuildPipelineToJoinFlowItem_1 = __importDefault(require("./flow/item/BuildPipelineToJoinFlowItem"));
 exports.BuildPipelineToJoinFlowItem = BuildPipelineToJoinFlowItem_1.default;
+var BuildSelectSingleFlowItem_1 = __importDefault(require("./flow/item/BuildSelectSingleFlowItem"));
+exports.BuildSelectSingleFlowItem = BuildSelectSingleFlowItem_1.default;
 var ConvertToSearchResponseFlowItem_1 = __importDefault(require("./flow/item/ConvertToSearchResponseFlowItem"));
 exports.ConvertToSearchResponseFlowItem = ConvertToSearchResponseFlowItem_1.default;
 var Logger_1 = require("./model/Logger");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.249",
+  "version": "2.1.251",
   "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/SearcherFlow.ts

@@ -13,18 +13,18 @@ export interface IPopulate {
 
 class SearcherFlow<D> {
 
-    private model: mongoose.Model<any>
+    public model: mongoose.Model<any>
 
     [key: string]: any
-    private searchText: string = ""
-    private orderSense: string = "desc"
-    private orderBy: string = "_id"
-    private page: number = 1
-    private limit: number = 50
-    private pageable: boolean = true
-
-    private select: string[] = []
-    private populate: string[] = []
+    public searchText: string = ""
+    public orderSense: string = "desc"
+    public orderBy: string = "_id"
+    public page: number = 1
+    public limit: number = 50
+    public pageable: boolean = true
+
+    public select: string[] = []
+    public populate: string[] = []
     public filters: any = undefined
 
     constructor(repository: mongoose.Model<any>) {
@@ -44,7 +44,7 @@ class SearcherFlow<D> {
     async search(options: SearchOptions): Promise<SearchResponse<D>> {
 
         let stagesItems: any[] = []
-
+        let stagesPaging: any[] = []
         if (isNotEmpty(options.pipelines)) {
             stagesItems.push(...options.pipelines)
         }
@@ -52,13 +52,38 @@ class SearcherFlow<D> {
             stagesItems.push(...options.unions)
         }
 
-        if (isEmpty(options.pipelines)){
+        if (isEmpty(options.pipelines)) {
             stagesItems.push({ $match: this.filters })
-    
+
             if (isNotEmpty(this.select)) {
                 stagesItems.push({ $project: BuildSelectSingleFlowItem.build(this.model, this.select) })
             }
             stagesItems.push({ $sort: this.buildOrdenation() })
+
+            if (isNotEmpty(options.pipelines)) {
+                stagesPaging.push(...options.pipelines)
+            }
+            if (isNotEmpty(options.unions)) {
+                stagesPaging.push(...options.unions)
+            }
+
+            stagesPaging.push({ $match: this.filters })
+            stagesPaging.push({ $count: "total" })
+            stagesPaging.push({
+                $addFields: {
+                    page: this.pageable === true ? this.page : 1,
+                    limit: this.pageable === true ? this.limit : '$total',
+                    totalPages: this.pageable === true ? {
+                        $cond: {
+                            if: { $eq: ['$total', 0] },
+                            then: 0,
+                            else: { $ceil: { $divide: ['$total', this.limit] } }
+                        }
+                    } : 1,
+                    startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
+                    endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
+                }
+            })
         }
 
         if (this.pageable === true) {
@@ -66,33 +91,6 @@ class SearcherFlow<D> {
             stagesItems.push({ $limit: this.limit })
         }
 
-
-        let stagesPaging: any[] = []
-        if (isNotEmpty(options.pipelines)) {
-            stagesPaging.push(...options.pipelines)
-        }
-        if (isNotEmpty(options.unions)) {
-            stagesPaging.push(...options.unions)
-        }
-
-        stagesPaging.push({ $match: this.filters })
-        stagesPaging.push({ $count: "total" })
-        stagesPaging.push({
-            $addFields: {
-                page: this.pageable === true ? this.page : 1,
-                limit: this.pageable === true ? this.limit : '$total',
-                totalPages: this.pageable === true ? {
-                    $cond: {
-                        if: { $eq: ['$total', 0] },
-                        then: 0,
-                        else: { $ceil: { $divide: ['$total', this.limit] } }
-                    }
-                } : 1,
-                startIndex: this.pageable === true ? { $subtract: [{ $multiply: [this.page, this.limit] }, this.limit - 1] } : 1,
-                endIndex: this.pageable === true ? { $multiply: [this.page, this.limit] } : '$total'
-            }
-        })
-
         let stagesMetadata: any[] = []
         if (isNotEmpty(options.metadata)) {
             stagesMetadata.push(...options.metadata)
@@ -154,7 +152,7 @@ class SearcherFlow<D> {
         };
     }
 
-    extractFieldsOfType(schema: Schema, typing = 'String', parent = ''): string[]{
+    extractFieldsOfType(schema: Schema, typing = 'String', parent = ''): string[] {
         let fieldsTyped: string[] = []
         Object.keys(schema.paths).forEach((field: string) => {
             if (schema.paths[field].instance === typing) {

package/src/index.ts

@@ -6,6 +6,7 @@ import AddStagePaginationFlowItem from "./flow/item/AddStagePaginationFlowItem"
 import AddStageSortFlowItem from "./flow/item/AddStageSortFlowItem"
 import BuildPipelineToCountJoinFlowItem from "./flow/item/BuildPipelineToCountJoinFlowItem"
 import BuildPipelineToJoinFlowItem from "./flow/item/BuildPipelineToJoinFlowItem"
+import BuildSelectSingleFlowItem from "./flow/item/BuildSelectSingleFlowItem"
 import ConvertToSearchResponseFlowItem from "./flow/item/ConvertToSearchResponseFlowItem"
 import { IFacet } from "./model/Facet"
 import { ILogger, LoggerModel, LoggerSearch, TypeOfOperation } from "./model/Logger"
@@ -15,5 +16,5 @@ import { initialize } from "./utils/Utils"
 
 (global as any).LoggerRepository = undefined
 
-export { SearcherFlow, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, TypeOfOperation, initialize }
+export { SearcherFlow, BuildSelectSingleFlowItem, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, TypeOfOperation, initialize }