@atscript/db-mongo 0.1.135 → 0.1.137

package/dist/agg.cjs

@@ -1,27 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mongo_filter = require("./mongo-filter-Bf5rWV4P.cjs");
+const require_mongo_accumulator = require("./mongo-accumulator-BalE9LkU.cjs");
 let _atscript_db_agg = require("@atscript/db/agg");
 let _uniqu_core = require("@uniqu/core");
 //#region src/agg.ts
-/** `$group` accumulator per value aggregate (`count` is built below). */
-const ACCUMULATORS = {
-	sum: "$sum",
-	avg: "$avg",
-	min: "$min",
-	max: "$max"
-};
-/**
-* Maps an AggregateExpr to a MongoDB $group accumulator expression.
-*/
+/** Maps an AggregateExpr to its MongoDB `$group` accumulator (see `buildAccumulator`). */
 function toAccumulator(expr) {
-	(0, _atscript_db_agg.assertAggregateFn)(expr.$fn);
-	if (expr.$fn !== "count") return { [ACCUMULATORS[expr.$fn]]: `$${expr.$field}` };
-	if (expr.$field === "*") return { $sum: 1 };
-	return { $sum: { $cond: [
-		{ $ne: [`$${expr.$field}`, null] },
-		1,
-		0
-	] } };
+	return require_mongo_accumulator.buildAccumulator(expr.$fn, expr.$field === "*" ? "*" : `$${expr.$field}`);
 }
 const DAY_MS = 864e5;
 const ISO_DATE = "%Y-%m-%d";
@@ -120,13 +104,13 @@ function bucketExpression(b) {
 function buildPrefix(query, searchStage) {
 	const controls = query.controls || {};
 	const groupBy = controls.$groupBy ?? [];
-	const pipeline = searchStage ? [searchStage, { $match: require_mongo_filter.buildMongoFilter(query.filter) }] : [{ $match: require_mongo_filter.buildMongoFilter(query.filter) }];
+	const pipeline = searchStage ? [searchStage, { $match: require_mongo_accumulator.buildMongoFilter(query.filter) }] : [{ $match: require_mongo_accumulator.buildMongoFilter(query.filter) }];
 	const groupId = {};
 	const groupKeys = [];
 	for (const [index, key] of groupBy.entries()) {
 		const idKey = `k${index}`;
 		const bucket = controls.$select?.bucketByAlias(key);
-		groupId[idKey] = bucket ? bucketExpression(bucket) : { $ifNull: [`$${key}`, null] };
+		groupId[idKey] = bucket ? bucketExpression(bucket) : require_mongo_accumulator.orNull(`$${key}`);
 		groupKeys.push([key, idKey]);
 	}
 	return {
@@ -163,11 +147,11 @@ function buildGroupedStages(query, { accumulators, searchStage }) {
 	for (const expr of controls.$select?.aggregates ?? []) {
 		const alias = (0, _atscript_db_agg.resolveAlias)(expr);
 		groupStage[alias] = toAccumulator(expr);
-		project[alias] = 1;
+		project[alias] = expr.$fn === "countDistinct" ? require_mongo_accumulator.distinctCountExpr(`$${alias}`) : 1;
 	}
 	pipeline.push({ $group: groupStage });
 	pipeline.push({ $project: project });
-	if (controls.$having) pipeline.push({ $match: require_mongo_filter.buildMongoFilter(controls.$having) });
+	if (controls.$having) pipeline.push({ $match: require_mongo_accumulator.buildMongoFilter(controls.$having) });
 	return {
 		pipeline,
 		controls

package/dist/agg.mjs

@@ -1,26 +1,10 @@
-import { t as buildMongoFilter } from "./mongo-filter-CtyITmZM.mjs";
-import { assertAggregateFn, resolveAlias } from "@atscript/db/agg";
+import { i as orNull, n as distinctCountExpr, r as buildMongoFilter, t as buildAccumulator } from "./mongo-accumulator-Dc0w4t0l.mjs";
+import { resolveAlias } from "@atscript/db/agg";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/agg.ts
-/** `$group` accumulator per value aggregate (`count` is built below). */
-const ACCUMULATORS = {
-	sum: "$sum",
-	avg: "$avg",
-	min: "$min",
-	max: "$max"
-};
-/**
-* Maps an AggregateExpr to a MongoDB $group accumulator expression.
-*/
+/** Maps an AggregateExpr to its MongoDB `$group` accumulator (see `buildAccumulator`). */
 function toAccumulator(expr) {
-	assertAggregateFn(expr.$fn);
-	if (expr.$fn !== "count") return { [ACCUMULATORS[expr.$fn]]: `$${expr.$field}` };
-	if (expr.$field === "*") return { $sum: 1 };
-	return { $sum: { $cond: [
-		{ $ne: [`$${expr.$field}`, null] },
-		1,
-		0
-	] } };
+	return buildAccumulator(expr.$fn, expr.$field === "*" ? "*" : `$${expr.$field}`);
 }
 const DAY_MS = 864e5;
 const ISO_DATE = "%Y-%m-%d";
@@ -125,7 +109,7 @@ function buildPrefix(query, searchStage) {
 	for (const [index, key] of groupBy.entries()) {
 		const idKey = `k${index}`;
 		const bucket = controls.$select?.bucketByAlias(key);
-		groupId[idKey] = bucket ? bucketExpression(bucket) : { $ifNull: [`$${key}`, null] };
+		groupId[idKey] = bucket ? bucketExpression(bucket) : orNull(`$${key}`);
 		groupKeys.push([key, idKey]);
 	}
 	return {
@@ -162,7 +146,7 @@ function buildGroupedStages(query, { accumulators, searchStage }) {
 	for (const expr of controls.$select?.aggregates ?? []) {
 		const alias = resolveAlias(expr);
 		groupStage[alias] = toAccumulator(expr);
-		project[alias] = 1;
+		project[alias] = expr.$fn === "countDistinct" ? distinctCountExpr(`$${alias}`) : 1;
 	}
 	pipeline.push({ $group: groupStage });
 	pipeline.push({ $project: project });