c2-mongoose 2.1.456 → 2.1.458

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

@@ -25,8 +25,8 @@ var PopulateV3FlowItem = /** @class */ (function () {
         var populateClauses = [];
         populatesFields === null || populatesFields === void 0 ? void 0 : populatesFields.forEach(function (populateField) {
             var _a, _b;
-            var _c, _d, _e, _f, _g, _h;
-            var _j = populateField.split('.'), first = _j[0], rest = _j.slice(1);
+            var _c, _d, _e, _f, _g, _h, _j, _k;
+            var _l = populateField.split('.'), first = _l[0], rest = _l.slice(1);
             var fieldDefinition = GetFieldDefinitionFlowItem_1.default.execute(modelRoot, first);
             if (!fieldDefinition)
                 return;
@@ -74,6 +74,7 @@ var PopulateV3FlowItem = /** @class */ (function () {
             }
             if ((rest === null || rest === void 0 ? void 0 : rest.length) > 0) {
                 var pathRelativeCurrent_1 = first;
+                // let typeFirst = fieldDefinition.instance
                 for (var _i = 0, rest_1 = rest; _i < rest_1.length; _i++) {
                     var nextField = rest_1[_i];
                     pathRelativeCurrent_1 += ".".concat(nextField);
@@ -84,7 +85,10 @@ var PopulateV3FlowItem = /** @class */ (function () {
                     if (!fieldDefinition || !fieldDefinition.options || !((_h = fieldDefinition.options.type[0]) === null || _h === void 0 ? void 0 : _h.ref)) {
                         throw new Error("[1]No reference found for populate field: ".concat(populateField));
                     }
-                    modelName = fieldDefinition.options.ref;
+                    if (!fieldDefinition)
+                        return;
+                    typeFirst = fieldDefinition.instance;
+                    modelName = (_j = fieldDefinition.options.ref) !== null && _j !== void 0 ? _j : (_k = fieldDefinition.options.type[0]) === null || _k === void 0 ? void 0 : _k.ref;
                     refModel = global.connectionMongoose.model(modelName);
                     collectionName = refModel.collection.name;
                     var populateClauseLookup = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.456",
+  "version": "2.1.458",
   "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/item/PopulateV3FlowItem.ts

@@ -73,6 +73,7 @@ class PopulateV3FlowItem {
 
       if (rest?.length > 0) {
         let pathRelativeCurrent = first
+        // let typeFirst = fieldDefinition.instance
         for (const nextField of rest) {
           pathRelativeCurrent += `.${nextField}`
           if (populateClauses.some((populateClause: any) => populateClause?.$lookup?.localField.startsWith(pathRelativeCurrent))) {
@@ -83,7 +84,11 @@ class PopulateV3FlowItem {
           if (!fieldDefinition || !fieldDefinition.options || !fieldDefinition.options.type[0]?.ref) {
             throw new Error(`[1]No reference found for populate field: ${populateField}`);
           }
-          modelName = fieldDefinition.options.ref;
+
+          if (!fieldDefinition) return;
+          typeFirst = fieldDefinition.instance
+          
+          modelName = fieldDefinition.options.ref ?? fieldDefinition.options.type[0]?.ref;
           refModel = (global as any).connectionMongoose.model(modelName);
           collectionName = refModel.collection.name;