c2-mongoose 2.1.234 → 2.1.239

package/dist/flow/SearcherFlow.d.ts

@@ -1,4 +1,4 @@
-import mongoose from "mongoose";
+import mongoose, { Schema } from "mongoose";
 import { SearchOptions, SearchResponse } from "../types/SearchResponse";
 export interface IPopulate {
     [key: string]: any;
@@ -22,6 +22,7 @@ declare class SearcherFlow<D> {
     prepareSearch(search: any): void;
     search(options: SearchOptions): Promise<SearchResponse<D>>;
     transformObject(originalObject: any): any;
+    extractFieldsOfType(schema: Schema, typing?: string, parent?: string): string[];
     buildDefaultFilters(objectSearch: any): any;
     isValidObjectId(value: string): boolean;
     buildOrdenation(): any;

package/dist/flow/SearcherFlow.js

@@ -46,6 +46,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -63,8 +72,8 @@ var SearcherFlow = /** @class */ (function () {
         this.page = 1;
         this.limit = 50;
         this.pageable = true;
-        this.select = [""];
-        this.populate = [""];
+        this.select = [];
+        this.populate = [];
         this.filters = undefined;
         this.model = repository;
     }
@@ -178,12 +187,25 @@ var SearcherFlow = /** @class */ (function () {
         var hasPagination = (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging) ? true : false;
         return __assign(__assign({}, transformedObject), { metadata: metadata, paging: hasPagination ? (originalObject === null || originalObject === void 0 ? void 0 : originalObject.paging[0]) || { total: 0, page: 1, limit: this.limit } : undefined });
     };
+    SearcherFlow.prototype.extractFieldsOfType = function (schema, typing, parent) {
+        var _this = this;
+        if (typing === void 0) { typing = 'String'; }
+        if (parent === void 0) { parent = ''; }
+        var fieldsTyped = [];
+        Object.keys(schema.paths).forEach(function (field) {
+            if (schema.paths[field].instance === typing) {
+                fieldsTyped.push("".concat(parent !== '' ? "".concat(parent, ".") : '').concat(field));
+            }
+            else if (schema.paths[field].instance === 'Embedded') {
+                fieldsTyped = __spreadArray(__spreadArray([], fieldsTyped, true), _this.extractFieldsOfType(schema.paths[field].schema, typing, field), true);
+            }
+        });
+        return fieldsTyped;
+    };
     SearcherFlow.prototype.buildDefaultFilters = function (objectSearch) {
         var _this = this;
         // Recuperar todos os campos do tipo String
-        var camposString = Object.keys(this.model.schema.paths).filter(function (campo) {
-            return _this.model.schema.paths[campo].instance === 'String';
-        });
+        var camposString = this.extractFieldsOfType(this.model.schema, 'String');
         var filters = { $and: [] };
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.234",
+  "version": "2.1.239",
   "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

@@ -1,5 +1,5 @@
 import moment from "moment"
-import mongoose, { ClientSession, Types } from "mongoose"
+import mongoose, { ClientSession, Schema, Types } from "mongoose"
 import { SearchOptions, SearchResponse } from "../types/SearchResponse"
 import { isNotEmpty } from "../utils/Utils"
 import BuildPopulateSingleFlowItem from "./item/BuildPopulateSingleFlowItem"
@@ -23,8 +23,8 @@ class SearcherFlow<D> {
     private limit: number = 50
     private pageable: boolean = true
 
-    private select: string[] = [""]
-    private populate: string[] = [""]
+    private select: string[] = []
+    private populate: string[] = []
     private filters: any = undefined
 
     constructor(repository: mongoose.Model<any>) {
@@ -152,12 +152,23 @@ class SearcherFlow<D> {
         };
     }
 
+    extractFieldsOfType(schema: Schema, typing = 'String', parent = ''): string[]{
+        let fieldsTyped: string[] = []
+        Object.keys(schema.paths).forEach((field: string) => {
+            if (schema.paths[field].instance === typing) {
+                fieldsTyped.push(`${parent !== '' ? `${parent}.` : ''}${field}`)
+            } else if (schema.paths[field].instance === 'Embedded') {
+                fieldsTyped = [...fieldsTyped, ...this.extractFieldsOfType(schema.paths[field].schema, typing, field)]
+            }
+        })
+
+        return fieldsTyped
+    }
+
     public buildDefaultFilters(objectSearch: any) {
 
         // Recuperar todos os campos do tipo String
-        const camposString = Object.keys(this.model.schema.paths).filter((campo: string) => {
-            return this.model.schema.paths[campo].instance === 'String';
-        });
+        const camposString = this.extractFieldsOfType(this.model.schema, 'String')
 
 
         let filters = { $and: [] } as any