@feedmepos/zod-repo 1.0.13 → 1.0.14

package/dist/repo/mongodb.js

@@ -529,19 +529,19 @@ var MongodbRepositoryForType = exports.MongodbRepositoryForType = /*#__PURE__*/f
     key: "findAndPopulate",
     value: (function () {
       var _findAndPopulate = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(filter, opts, session) {
-        var pipeline, lookUps, result;
+        var pipeline, lookUps, hasGroupStage, result;
         return _regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
               pipeline = [];
+              if (filter) pipeline.push({
+                $match: opts !== null && opts !== void 0 && opts.ignoreConvertFields ? filter : this.convertRefinedFields(filter)
+              });
               if (opts !== null && opts !== void 0 && opts.sort) {
                 pipeline.push({
                   $sort: opts.sort
                 });
               }
-              if (filter) pipeline.push({
-                $match: opts !== null && opts !== void 0 && opts.ignoreConvertFields ? filter : this.convertRefinedFields(filter)
-              });
               if (opts !== null && opts !== void 0 && opts.skip && (opts === null || opts === void 0 ? void 0 : opts.skip) > 0) {
                 pipeline.push({
                   $skip: opts === null || opts === void 0 ? void 0 : opts.skip
@@ -555,14 +555,22 @@ var MongodbRepositoryForType = exports.MongodbRepositoryForType = /*#__PURE__*/f
               if (opts !== null && opts !== void 0 && opts.fields) {
                 lookUps = generateLookup(this.zodSchema, this.baseShape, (opts === null || opts === void 0 ? void 0 : opts.fields) || []);
                 if (lookUps.length) {
+                  // Determine if any of the generated lookup stages introduce a $group,
+                  // which would invalidate the earlier sort order.
+                  hasGroupStage = lookUps.some(function (stage) {
+                    return stage && _typeof(stage) === 'object' && '$group' in stage;
+                  });
                   pipeline.push.apply(pipeline, _toConsumableArray(lookUps));
+
+                  // Re-apply sort after lookups when a $group was introduced, so that
+                  // the final documents are deterministically ordered according to opts.sort.
+                  if (opts.sort && hasGroupStage) {
+                    pipeline.push({
+                      $sort: opts.sort
+                    });
+                  }
                 }
               }
-              if (opts !== null && opts !== void 0 && opts.sort) {
-                pipeline.push({
-                  $sort: opts.sort
-                });
-              }
               _context4.n = 1;
               return this.aggregate(pipeline, {
                 session: session

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feedmepos/zod-repo",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/feedmepos/core.git"