@atscript/db-mongo 0.1.146 → 0.1.147

package/dist/agg.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mongo_accumulator = require("./mongo-accumulator-BalE9LkU.cjs");
+const require_mongo_accumulator = require("./mongo-accumulator-BJcQs2OV.cjs");
 let _atscript_db_agg = require("@atscript/db/agg");
 let _uniqu_core = require("@uniqu/core");
 //#region src/agg.ts
@@ -9,11 +9,9 @@ function toAccumulator(expr) {
 }
 const DAY_MS = 864e5;
 const ISO_DATE = "%Y-%m-%d";
-/**
-* Units whose first day `$dateToString` renders straight from the instant in
-* the zone: the local day, then the literal `01` for day-of-month / month.
-*/
-const LOCAL_DATE_FORMATS = {
+/** Units `$dateToString` labels straight from the instant in the zone (literal `01` for day / month). */
+const LOCAL_LABEL_FORMATS = {
+	hour: "%Y-%m-%dT%H:00",
 	day: ISO_DATE,
 	month: "%Y-%m-01",
 	year: "%Y-01-01"
@@ -41,7 +39,8 @@ function naiveFirstDay(b) {
 }
 /**
 * The `$group._id` expression of a calendar bucket: the ISO local date
-* `YYYY-MM-DD` of the bucket's first day in `b.tz`, or `null`.
+* `YYYY-MM-DD` of the bucket's first day in `b.tz` (for `hour`, the local
+* `YYYY-MM-DDTHH:00`), or `null`.
 *
 * The only zone-aware step is instant → local date (`timezone` on
 * `$dateToString` / `$dateToParts`, never ambiguous). `$dateTrunc` is
@@ -58,7 +57,7 @@ function naiveFirstDay(b) {
 function bucketExpression(b) {
 	const source = `$${b.field}`;
 	const date = { $toDate: { $toLong: source } };
-	const format = LOCAL_DATE_FORMATS[b.unit];
+	const format = LOCAL_LABEL_FORMATS[b.unit];
 	const label = format ? { $dateToString: {
 		date,
 		format,
@@ -101,10 +100,11 @@ function bucketExpression(b) {
 * position in front of the filter `$match`. Resolving it needs adapter state,
 * so the caller passes it in and this module stays a pure translation.
 */
-function buildPrefix(query, searchStage) {
+function buildPrefix(query, searchStage, filterOptions) {
 	const controls = query.controls || {};
 	const groupBy = controls.$groupBy ?? [];
-	const pipeline = searchStage ? [searchStage, { $match: require_mongo_accumulator.buildMongoFilter(query.filter) }] : [{ $match: require_mongo_accumulator.buildMongoFilter(query.filter) }];
+	const filterStages = require_mongo_accumulator.mongoFilterStages(query.filter, filterOptions);
+	const pipeline = searchStage ? [searchStage, ...filterStages] : filterStages;
 	const groupId = {};
 	const groupKeys = [];
 	for (const [index, key] of groupBy.entries()) {
@@ -132,8 +132,8 @@ function buildPrefix(query, searchStage) {
 * (no accumulators, no `$project`, no `$having`) — the cheapest shape for a
 * plain group count, where no alias has to be resolvable.
 */
-function buildGroupedStages(query, { accumulators, searchStage }) {
-	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query, searchStage);
+function buildGroupedStages(query, { accumulators, searchStage, filterOptions }) {
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query, searchStage, filterOptions);
 	const groupStage = { _id: groupId };
 	if (!accumulators) {
 		pipeline.push({ $group: groupStage });
@@ -165,12 +165,14 @@ function buildGroupedStages(query, { accumulators, searchStage }) {
 *
 * `searchStage` is the resolved `$search` / `$text` stage (see
 * `buildAggregateSearchStage`); unlike the leaf runner this path adds no
-* relevance `$sort` and no default `$limit`.
+* relevance `$sort` and no default `$limit`. `filterOptions` renders a
+* filter with relational predicates (`mongoFilterStages`).
 */
-function buildAggregatePipeline(query, searchStage) {
+function buildAggregatePipeline(query, searchStage, filterOptions) {
 	const { pipeline, controls } = buildGroupedStages(query, {
 		accumulators: true,
-		searchStage
+		searchStage,
+		filterOptions
 	});
 	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
@@ -189,10 +191,11 @@ function buildAggregatePipeline(query, searchStage) {
 * `searchStage` must be the SAME stage handed to `buildAggregatePipeline` for
 * the same query — the counted groups are exactly the rows the search matched.
 */
-function buildCountPipeline(query, searchStage) {
+function buildCountPipeline(query, searchStage, filterOptions) {
 	const { pipeline } = buildGroupedStages(query, {
 		accumulators: Boolean(query.controls?.$having),
-		searchStage
+		searchStage,
+		filterOptions
 	});
 	pipeline.push({ $count: "count" });
 	return pipeline;

package/dist/agg.d.cts

@@ -1,10 +1,12 @@
+import { r as TMongoFilterOptions } from "./mongo-filter-CGd9ryOD.cjs";
 import { DbQuery, TResolvedBucket } from "@atscript/db";
 import { Document } from "mongodb";
 
 //#region src/agg.d.ts
 /**
  * The `$group._id` expression of a calendar bucket: the ISO local date
- * `YYYY-MM-DD` of the bucket's first day in `b.tz`, or `null`.
+ * `YYYY-MM-DD` of the bucket's first day in `b.tz` (for `hour`, the local
+ * `YYYY-MM-DDTHH:00`), or `null`.
  *
  * The only zone-aware step is instant → local date (`timezone` on
  * `$dateToString` / `$dateToParts`, never ambiguous). `$dateTrunc` is
@@ -27,9 +29,10 @@ declare function bucketExpression(b: TResolvedBucket): Document;
  *
  * `searchStage` is the resolved `$search` / `$text` stage (see
  * `buildAggregateSearchStage`); unlike the leaf runner this path adds no
- * relevance `$sort` and no default `$limit`.
+ * relevance `$sort` and no default `$limit`. `filterOptions` renders a
+ * filter with relational predicates (`mongoFilterStages`).
  */
-declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document): Document[];
+declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document, filterOptions?: TMongoFilterOptions): Document[];
 /**
  * Builds a count-only pipeline: the number of groups that survive `$having`
  * (all groups when there is none). With `$having` it runs the same grouped
@@ -42,6 +45,6 @@ declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document):
  * `searchStage` must be the SAME stage handed to `buildAggregatePipeline` for
  * the same query — the counted groups are exactly the rows the search matched.
  */
-declare function buildCountPipeline(query: DbQuery, searchStage?: Document): Document[];
+declare function buildCountPipeline(query: DbQuery, searchStage?: Document, filterOptions?: TMongoFilterOptions): Document[];
 //#endregion
 export { bucketExpression, buildAggregatePipeline, buildCountPipeline };

package/dist/agg.d.mts

@@ -1,10 +1,12 @@
+import { r as TMongoFilterOptions } from "./mongo-filter-CGd9ryOD.mjs";
 import { DbQuery, TResolvedBucket } from "@atscript/db";
 import { Document } from "mongodb";
 
 //#region src/agg.d.ts
 /**
  * The `$group._id` expression of a calendar bucket: the ISO local date
- * `YYYY-MM-DD` of the bucket's first day in `b.tz`, or `null`.
+ * `YYYY-MM-DD` of the bucket's first day in `b.tz` (for `hour`, the local
+ * `YYYY-MM-DDTHH:00`), or `null`.
  *
  * The only zone-aware step is instant → local date (`timezone` on
  * `$dateToString` / `$dateToParts`, never ambiguous). `$dateTrunc` is
@@ -27,9 +29,10 @@ declare function bucketExpression(b: TResolvedBucket): Document;
  *
  * `searchStage` is the resolved `$search` / `$text` stage (see
  * `buildAggregateSearchStage`); unlike the leaf runner this path adds no
- * relevance `$sort` and no default `$limit`.
+ * relevance `$sort` and no default `$limit`. `filterOptions` renders a
+ * filter with relational predicates (`mongoFilterStages`).
  */
-declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document): Document[];
+declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document, filterOptions?: TMongoFilterOptions): Document[];
 /**
  * Builds a count-only pipeline: the number of groups that survive `$having`
  * (all groups when there is none). With `$having` it runs the same grouped
@@ -42,6 +45,6 @@ declare function buildAggregatePipeline(query: DbQuery, searchStage?: Document):
  * `searchStage` must be the SAME stage handed to `buildAggregatePipeline` for
  * the same query — the counted groups are exactly the rows the search matched.
  */
-declare function buildCountPipeline(query: DbQuery, searchStage?: Document): Document[];
+declare function buildCountPipeline(query: DbQuery, searchStage?: Document, filterOptions?: TMongoFilterOptions): Document[];
 //#endregion
 export { bucketExpression, buildAggregatePipeline, buildCountPipeline };

package/dist/agg.mjs

@@ -1,4 +1,4 @@
-import { i as orNull, n as distinctCountExpr, r as buildMongoFilter, t as buildAccumulator } from "./mongo-accumulator-Dc0w4t0l.mjs";
+import { i as buildMongoFilter, n as distinctCountExpr, s as mongoFilterStages, t as buildAccumulator, u as orNull } from "./mongo-accumulator-Y_xVYo3C.mjs";
 import { resolveAlias } from "@atscript/db/agg";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/agg.ts
@@ -8,11 +8,9 @@ function toAccumulator(expr) {
 }
 const DAY_MS = 864e5;
 const ISO_DATE = "%Y-%m-%d";
-/**
-* Units whose first day `$dateToString` renders straight from the instant in
-* the zone: the local day, then the literal `01` for day-of-month / month.
-*/
-const LOCAL_DATE_FORMATS = {
+/** Units `$dateToString` labels straight from the instant in the zone (literal `01` for day / month). */
+const LOCAL_LABEL_FORMATS = {
+	hour: "%Y-%m-%dT%H:00",
 	day: ISO_DATE,
 	month: "%Y-%m-01",
 	year: "%Y-01-01"
@@ -40,7 +38,8 @@ function naiveFirstDay(b) {
 }
 /**
 * The `$group._id` expression of a calendar bucket: the ISO local date
-* `YYYY-MM-DD` of the bucket's first day in `b.tz`, or `null`.
+* `YYYY-MM-DD` of the bucket's first day in `b.tz` (for `hour`, the local
+* `YYYY-MM-DDTHH:00`), or `null`.
 *
 * The only zone-aware step is instant → local date (`timezone` on
 * `$dateToString` / `$dateToParts`, never ambiguous). `$dateTrunc` is
@@ -57,7 +56,7 @@ function naiveFirstDay(b) {
 function bucketExpression(b) {
 	const source = `$${b.field}`;
 	const date = { $toDate: { $toLong: source } };
-	const format = LOCAL_DATE_FORMATS[b.unit];
+	const format = LOCAL_LABEL_FORMATS[b.unit];
 	const label = format ? { $dateToString: {
 		date,
 		format,
@@ -100,10 +99,11 @@ function bucketExpression(b) {
 * position in front of the filter `$match`. Resolving it needs adapter state,
 * so the caller passes it in and this module stays a pure translation.
 */
-function buildPrefix(query, searchStage) {
+function buildPrefix(query, searchStage, filterOptions) {
 	const controls = query.controls || {};
 	const groupBy = controls.$groupBy ?? [];
-	const pipeline = searchStage ? [searchStage, { $match: buildMongoFilter(query.filter) }] : [{ $match: buildMongoFilter(query.filter) }];
+	const filterStages = mongoFilterStages(query.filter, filterOptions);
+	const pipeline = searchStage ? [searchStage, ...filterStages] : filterStages;
 	const groupId = {};
 	const groupKeys = [];
 	for (const [index, key] of groupBy.entries()) {
@@ -131,8 +131,8 @@ function buildPrefix(query, searchStage) {
 * (no accumulators, no `$project`, no `$having`) — the cheapest shape for a
 * plain group count, where no alias has to be resolvable.
 */
-function buildGroupedStages(query, { accumulators, searchStage }) {
-	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query, searchStage);
+function buildGroupedStages(query, { accumulators, searchStage, filterOptions }) {
+	const { pipeline, groupId, groupKeys, controls } = buildPrefix(query, searchStage, filterOptions);
 	const groupStage = { _id: groupId };
 	if (!accumulators) {
 		pipeline.push({ $group: groupStage });
@@ -164,12 +164,14 @@ function buildGroupedStages(query, { accumulators, searchStage }) {
 *
 * `searchStage` is the resolved `$search` / `$text` stage (see
 * `buildAggregateSearchStage`); unlike the leaf runner this path adds no
-* relevance `$sort` and no default `$limit`.
+* relevance `$sort` and no default `$limit`. `filterOptions` renders a
+* filter with relational predicates (`mongoFilterStages`).
 */
-function buildAggregatePipeline(query, searchStage) {
+function buildAggregatePipeline(query, searchStage, filterOptions) {
 	const { pipeline, controls } = buildGroupedStages(query, {
 		accumulators: true,
-		searchStage
+		searchStage,
+		filterOptions
 	});
 	if (controls.$sort) pipeline.push({ $sort: controls.$sort });
 	if (controls.$skip) pipeline.push({ $skip: controls.$skip });
@@ -188,10 +190,11 @@ function buildAggregatePipeline(query, searchStage) {
 * `searchStage` must be the SAME stage handed to `buildAggregatePipeline` for
 * the same query — the counted groups are exactly the rows the search matched.
 */
-function buildCountPipeline(query, searchStage) {
+function buildCountPipeline(query, searchStage, filterOptions) {
 	const { pipeline } = buildGroupedStages(query, {
 		accumulators: Boolean(query.controls?.$having),
-		searchStage
+		searchStage,
+		filterOptions
 	});
 	pipeline.push({ $count: "count" });
 	return pipeline;