c2-mongoose 2.1.341 → 2.1.344

package/dist/flow/searcher/GetOneByFilterFlow.js

@@ -68,7 +68,7 @@ var GetOneByFilterFlow = /** @class */ (function () {
                                     locale: "pt",
                                     numericOrdering: true
                                 }
-                            })];
+                            }).read('secondaryPreferred')];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result[0]];

package/dist/flow/searcher/SearcherV2Flow.js

@@ -92,7 +92,7 @@ var SearcherV2Flow = /** @class */ (function () {
                                     locale: "pt",
                                     numericOrdering: true
                                 }
-                            })];
+                            }).read('secondaryPreferred')];
                     case 1:
                         result = _d.sent();
                         ret = {};

package/dist/flow/searcher/item/GetFieldDefinitionFlowItem.d.ts

@@ -0,0 +1,12 @@
+import mongoose from "mongoose";
+declare class GetFieldDefinitionFlowItem {
+    execute(modelRoot: mongoose.Model<any, {}, {}, {}, any, any>, first: string): mongoose.SchemaType<any, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+        [x: string]: any;
+    }>> & Omit<mongoose.FlatRecord<{
+        [x: string]: any;
+    }> & Required<{
+        _id: unknown;
+    }>, never>>;
+}
+declare const _default: GetFieldDefinitionFlowItem;
+export default _default;

package/dist/flow/searcher/item/GetFieldDefinitionFlowItem.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var GetFieldDefinitionFlowItem = /** @class */ (function () {
+    function GetFieldDefinitionFlowItem() {
+    }
+    GetFieldDefinitionFlowItem.prototype.execute = function (modelRoot, first) {
+        var fieldDefinition = modelRoot.schema.path(first);
+        if (!fieldDefinition && modelRoot.discriminators) {
+            for (var _i = 0, _a = Object.entries(modelRoot.discriminators); _i < _a.length; _i++) {
+                var _b = _a[_i], name_1 = _b[0], discriminatorModel = _b[1];
+                fieldDefinition = discriminatorModel.schema.path(first);
+                if (fieldDefinition)
+                    break;
+            }
+        }
+        return fieldDefinition;
+    };
+    return GetFieldDefinitionFlowItem;
+}());
+exports.default = new GetFieldDefinitionFlowItem;

package/dist/flow/searcher/item/PopulateFlowItem.js

@@ -8,7 +8,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var GetFieldDefinitionFlowItem_1 = __importDefault(require("./GetFieldDefinitionFlowItem"));
 var PopulateFlowItem = /** @class */ (function () {
     function PopulateFlowItem() {
     }
@@ -18,26 +22,18 @@ var PopulateFlowItem = /** @class */ (function () {
         populate.forEach(function (populateField) {
             var _a, _b;
             var _c = populateField.split('.'), first = _c[0], rest = _c.slice(1);
-            var fieldDefinition = modelRoot.schema.path(first);
+            var fieldDefinition = GetFieldDefinitionFlowItem_1.default.execute(modelRoot, first);
             if (!fieldDefinition)
                 return;
             var typeFirst = fieldDefinition.instance;
             while ((typeFirst === 'Array' || typeFirst === 'Embedded') && (rest === null || rest === void 0 ? void 0 : rest.length)) {
                 first = [first, rest[0]].join(".");
                 rest.splice(0, 1);
-                fieldDefinition = modelRoot.schema.path(first);
+                fieldDefinition = GetFieldDefinitionFlowItem_1.default.execute(modelRoot, first);
                 if (!fieldDefinition)
                     return;
                 typeFirst = fieldDefinition.instance;
             }
-            // let typeFirst = fieldDefinition.instance
-            // if (typeFirst === 'Array' || typeFirst === 'Embedded') {
-            //   if (rest?.length) {
-            //     first = [first, rest[0]].join(".")
-            //     rest.splice(0, 1)
-            //     fieldDefinition = modelRoot.schema.path(first);
-            //   }
-            // }
             if (!fieldDefinition || !fieldDefinition.options || !fieldDefinition.options.ref) {
                 throw new Error("[1]No reference found for populate field: ".concat(populateField));
             }

package/dist/index.d.ts

@@ -10,10 +10,11 @@ import BuildPopulateSingleFlowItem from "./flow/item/BuildPopulateSingleFlowItem
 import BuildSelectSingleFlowItem from "./flow/item/BuildSelectSingleFlowItem";
 import ConvertToSearchResponseFlowItem from "./flow/item/ConvertToSearchResponseFlowItem";
 import GetHighestNumberFlow from "./flow/searcher/GetHighestNumberFlow";
+import GetOneByFilterFlow from "./flow/searcher/GetOneByFilterFlow";
 import SearcherV2Flow from "./flow/searcher/SearcherV2Flow";
 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 { GetHighestNumberFlow, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, BuildPopulateSingleFlowItem, BuildSelectSingleFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, SearcherFlow, TypeOfOperation, initialize, SearcherV2Flow };
+export { GetHighestNumberFlow, AddStagePaginationFlowItem, AddStageSortFlowItem, BuildPipelineToCountJoinFlowItem, BuildPipelineToJoinFlowItem, BuildPopulateSingleFlowItem, BuildSelectSingleFlowItem, C2Flow, ConvertToSearchResponseFlowItem, CrudFlow, IFacet, ILogger, LoggerModel, LoggerSearch, Options, Pagination, SearchFlow, SearchResponse, SearcherFlow, TypeOfOperation, initialize, SearcherV2Flow, GetOneByFilterFlow };

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.SearcherV2Flow = exports.initialize = exports.TypeOfOperation = exports.SearcherFlow = exports.SearchFlow = exports.LoggerSearch = exports.LoggerModel = exports.CrudFlow = exports.ConvertToSearchResponseFlowItem = exports.C2Flow = exports.BuildSelectSingleFlowItem = exports.BuildPopulateSingleFlowItem = exports.BuildPipelineToJoinFlowItem = exports.BuildPipelineToCountJoinFlowItem = exports.AddStageSortFlowItem = exports.AddStagePaginationFlowItem = exports.GetHighestNumberFlow = void 0;
+exports.GetOneByFilterFlow = exports.SearcherV2Flow = exports.initialize = exports.TypeOfOperation = exports.SearcherFlow = exports.SearchFlow = exports.LoggerSearch = exports.LoggerModel = exports.CrudFlow = exports.ConvertToSearchResponseFlowItem = exports.C2Flow = exports.BuildSelectSingleFlowItem = exports.BuildPopulateSingleFlowItem = exports.BuildPipelineToJoinFlowItem = exports.BuildPipelineToCountJoinFlowItem = exports.AddStageSortFlowItem = exports.AddStagePaginationFlowItem = exports.GetHighestNumberFlow = void 0;
 var C2Flow_1 = __importDefault(require("./flow/C2Flow"));
 exports.C2Flow = C2Flow_1.default;
 var CrudFlow_1 = __importDefault(require("./flow/CrudFlow"));
@@ -28,6 +28,8 @@ var ConvertToSearchResponseFlowItem_1 = __importDefault(require("./flow/item/Con
 exports.ConvertToSearchResponseFlowItem = ConvertToSearchResponseFlowItem_1.default;
 var GetHighestNumberFlow_1 = __importDefault(require("./flow/searcher/GetHighestNumberFlow"));
 exports.GetHighestNumberFlow = GetHighestNumberFlow_1.default;
+var GetOneByFilterFlow_1 = __importDefault(require("./flow/searcher/GetOneByFilterFlow"));
+exports.GetOneByFilterFlow = GetOneByFilterFlow_1.default;
 var SearcherV2Flow_1 = __importDefault(require("./flow/searcher/SearcherV2Flow"));
 exports.SearcherV2Flow = SearcherV2Flow_1.default;
 var Logger_1 = require("./model/Logger");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.341",
+  "version": "2.1.344",
   "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/GetOneByFilterFlow.ts

@@ -20,7 +20,7 @@ class GetOneByFilterFlow {
         locale: "pt",
         numericOrdering: true
       }
-    })
+    }).read('secondaryPreferred')
 
     return result[0]
   }

package/src/flow/searcher/SearcherV2Flow.ts

@@ -55,7 +55,7 @@ class SearcherV2Flow {
         locale: "pt",
         numericOrdering: true
       }
-    })
+    }).read('secondaryPreferred')
 
     const ret: any = {}
     ret.items = result[0].items

package/src/flow/searcher/item/GetFieldDefinitionFlowItem.ts

@@ -0,0 +1,17 @@
+import mongoose from "mongoose";
+
+class GetFieldDefinitionFlowItem {
+  execute(modelRoot: mongoose.Model<any, {}, {}, {}, any, any>, first: string) {
+    let fieldDefinition = modelRoot.schema.path(first);
+
+    if (!fieldDefinition && modelRoot.discriminators) {
+      for (const [name, discriminatorModel] of Object.entries(modelRoot.discriminators)) {
+        fieldDefinition = discriminatorModel.schema.path(first);
+        if (fieldDefinition) break;
+      }
+    }
+    return fieldDefinition;
+  }
+}
+
+export default new GetFieldDefinitionFlowItem

package/src/flow/searcher/item/PopulateFlowItem.ts

@@ -1,4 +1,5 @@
 import mongoose from "mongoose";
+import GetFieldDefinitionFlowItem from "./GetFieldDefinitionFlowItem";
 
 class PopulateFlowItem {
   exec(populate = [], modelRoot: mongoose.Model<any>): any[] {
@@ -7,26 +8,22 @@ class PopulateFlowItem {
       let [first, ...rest] = populateField.split('.')
 
 
-      let fieldDefinition = modelRoot.schema.path(first);
+      let fieldDefinition = GetFieldDefinitionFlowItem.execute(modelRoot, first);
+
       if (!fieldDefinition) return
 
       let typeFirst = fieldDefinition.instance
+
       while ((typeFirst === 'Array' || typeFirst === 'Embedded') && rest?.length) {
         first = [first, rest[0]].join(".")
         rest.splice(0, 1)
-        fieldDefinition = modelRoot.schema.path(first);
+        
+        fieldDefinition = GetFieldDefinitionFlowItem.execute(modelRoot, first);
+
         if (!fieldDefinition) return;
         typeFirst = fieldDefinition.instance
       }
-      // let typeFirst = fieldDefinition.instance
-
-      // if (typeFirst === 'Array' || typeFirst === 'Embedded') {
-      //   if (rest?.length) {
-      //     first = [first, rest[0]].join(".")
-      //     rest.splice(0, 1)
-      //     fieldDefinition = modelRoot.schema.path(first);
-      //   }
-      // }
+
 
       if (!fieldDefinition || !fieldDefinition.options || !fieldDefinition.options.ref) {
         throw new Error(`[1]No reference found for populate field: ${populateField}`);

package/src/index.ts

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