@atscript/db-mongo 0.1.152 → 0.1.153

package/dist/agg.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mongo_accumulator = require("./mongo-accumulator-BQBMx4GC.cjs");
+const require_mongo_accumulator = require("./mongo-accumulator-BW-RNFg0.cjs");
 let _atscript_db = require("@atscript/db");
-let _atscript_db_agg = require("@atscript/db/agg");
 let _uniqu_core = require("@uniqu/core");
+let _atscript_db_agg = require("@atscript/db/agg");
 //#region src/agg.ts
 /**
 * MongoDB aggregation pipeline builder.
@@ -156,7 +156,7 @@ function buildGroupedStages(query, { accumulators, searchStage, filterOptions })
 	}
 	const firstLast = controls.$select?.firstLast ?? [];
 	const rowOrder = controls.$select?.rowOrder ?? [];
-	if (firstLast.length > 0 && rowOrder.length > 0) pipeline.push({ $sort: Object.fromEntries(rowOrder.map((k) => [k.column, k.desc ? -1 : 1])) });
+	if (firstLast.length > 0 && rowOrder.length > 0) pipeline.push(...require_mongo_accumulator.rowOrderStages(rowOrder));
 	const project = { _id: 0 };
 	for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 	const nullWhenEmpty = (alias, nonNull) => {
@@ -212,9 +212,11 @@ function buildAggregatePipeline(query, searchStage, filterOptions) {
 		searchStage,
 		filterOptions
 	});
-	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
+	const { stages, cleanup } = require_mongo_accumulator.sortStages(controls);
+	pipeline.push(...stages);
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
+	if (cleanup) pipeline.push(cleanup);
 	return pipeline;
 }
 /**

package/dist/agg.mjs

@@ -1,7 +1,7 @@
-import { d as orNull, i as buildMongoFilter, l as exprToMongo, n as distinctCountExpr, s as mongoFilterStages, t as buildAccumulator, u as notNullExpr } from "./mongo-accumulator-DYhg8usT.mjs";
+import { d as rowOrderStages, f as sortStages, h as orNull, i as buildMongoFilter, m as notNullExpr, n as distinctCountExpr, p as exprToMongo, s as mongoFilterStages, t as buildAccumulator } from "./mongo-accumulator-DMPFOscc.mjs";
 import { evaluateExpr } from "@atscript/db";
-import { resolveAlias } from "@atscript/db/agg";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
+import { resolveAlias } from "@atscript/db/agg";
 //#region src/agg.ts
 /**
 * MongoDB aggregation pipeline builder.
@@ -155,7 +155,7 @@ function buildGroupedStages(query, { accumulators, searchStage, filterOptions })
 	}
 	const firstLast = controls.$select?.firstLast ?? [];
 	const rowOrder = controls.$select?.rowOrder ?? [];
-	if (firstLast.length > 0 && rowOrder.length > 0) pipeline.push({ $sort: Object.fromEntries(rowOrder.map((k) => [k.column, k.desc ? -1 : 1])) });
+	if (firstLast.length > 0 && rowOrder.length > 0) pipeline.push(...rowOrderStages(rowOrder));
 	const project = { _id: 0 };
 	for (const [field, idKey] of groupKeys) project[field] = `$_id.${idKey}`;
 	const nullWhenEmpty = (alias, nonNull) => {
@@ -211,9 +211,11 @@ function buildAggregatePipeline(query, searchStage, filterOptions) {
 		searchStage,
 		filterOptions
 	});
-	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
+	const { stages, cleanup } = sortStages(controls);
+	pipeline.push(...stages);
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
 	if (controls.$limit) pipeline.push({ $limit: controls.$limit });
+	if (cleanup) pipeline.push(cleanup);
 	return pipeline;
 }
 /**