@uniqu/core 0.1.0 → 0.1.1

package/dist/index.cjs

@@ -72,6 +72,14 @@ function isPrimitive(x) {
 	else capture(entry.$field, entry.$fn);
 	else for (const field of Object.keys(controls.$select)) capture(field, "$select");
 	if (controls?.$groupBy) for (const field of controls.$groupBy) capture(field, "$groupBy");
+	if (controls?.$having) walkFilter(controls.$having, {
+		comparison(field) {
+			capture(field, "$having");
+		},
+		and() {},
+		or() {},
+		not() {}
+	});
 	if (controls?.$sort) for (const field of Object.keys(controls.$sort)) capture(field, "$order");
 	if (controls?.$with) for (const entry of controls.$with) {
 		if (typeof entry === "string") {

package/dist/index.d.ts

@@ -67,14 +67,14 @@ type LogicalNode<T = Record<string, unknown>> = {
 };
 /** Known aggregate function names. Consumers may support additional functions via the (string & {}) escape hatch. */
 type AggregateFn = 'sum' | 'count' | 'avg' | 'min' | 'max';
-/** A single aggregate function call within $select. */
-interface AggregateExpr {
+/** A single aggregate function call within $select. Generic params preserve literal types for result inference. */
+interface AggregateExpr<Fn extends string = AggregateFn | (string & {}), Field extends string = string, Alias extends string = string> {
     /** Function name (sum, count, avg, min, max, or custom). */
-    $fn: AggregateFn | (string & {});
+    $fn: Fn;
     /** Field to aggregate. '*' for count(*). */
-    $field: string;
+    $field: Field;
     /** Alias for the result. Auto-generated by URL parser if omitted. */
-    $as?: string;
+    $as?: Alias;
 }
 /**
  * Projection definition.
@@ -92,6 +92,8 @@ interface UniqueryControls<T = Record<string, unknown>, Nav extends Record<strin
     $select?: SelectExpr<T>;
     /** Fields to group by for aggregate queries. */
     $groupBy?: (keyof T & string)[];
+    /** Post-aggregation filter. Operates on aggregate aliases and dimension fields. */
+    $having?: FilterExpr;
     /** Relations to populate alongside the query. */
     $with?: TypedWithRelation<Nav>[];
     /** Pass-through for unknown $-prefixed keywords. */
@@ -145,9 +147,46 @@ type WithRelation = {
  * Insight operator includes comparison ops, control ops ($-prefixed),
  * and aggregate function names (bare, e.g. 'sum', 'avg').
  */
-type InsightOp = ComparisonOp | '$select' | '$order' | '$with' | '$groupBy' | AggregateFn | (string & {});
+type InsightOp = ComparisonOp | '$select' | '$order' | '$with' | '$groupBy' | '$having' | AggregateFn | (string & {});
 /** Map of field names to the set of operators used on that field. */
 type UniqueryInsights = Map<string, Set<InsightOp>>;
+/** Aggregate query controls. Separate from UniqueryControls: $groupBy is required, $with is forbidden. */
+interface AggregateControls<T = Record<string, unknown>, D extends keyof T & string = keyof T & string, M extends keyof T & string = keyof T & string> {
+    $groupBy: D[];
+    $select?: (D | AggregateExpr<AggregateFn, M | '*'>)[];
+    $having?: FilterExpr;
+    $sort?: Record<string, 1 | -1>;
+    $skip?: number;
+    $limit?: number;
+    $count?: boolean;
+    [key: `$${string}`]: unknown;
+}
+/** Aggregate query — no name (can't nest), no Nav (no $with). */
+interface AggregateQuery<T = Record<string, unknown>, D extends keyof T & string = keyof T & string, M extends keyof T & string = keyof T & string> {
+    filter?: FilterExpr<T>;
+    controls: AggregateControls<T, D, M>;
+    insights?: UniqueryInsights;
+}
+/** Resolve the output alias of an AggregateExpr. Uses $as if provided, otherwise generates {fn}_{field}. */
+type ResolveAlias<A extends AggregateExpr> = A extends {
+    $as: infer Alias extends string;
+} ? Alias : A extends {
+    $fn: infer Fn extends string;
+    $field: infer F extends string;
+} ? `${Fn}_${F}` : string;
+/**
+ * Infer the result row type from an aggregate query's $select.
+ * Dimension fields preserve their original type from T.
+ * Aggregate expressions: min/max preserve original type, others → number.
+ */
+type AggregateResult<T, Select extends readonly (string | AggregateExpr)[]> = {
+    [K in Extract<Select[number], string> & keyof T]: T[K];
+} & {
+    [A in Extract<Select[number], AggregateExpr> as ResolveAlias<A>]: A extends {
+        $fn: 'min' | 'max';
+        $field: infer F extends keyof T & string;
+    } ? T[F] : number;
+};
 
 /**
  * Visitor callbacks for controlling how filter nodes are processed.
@@ -188,4 +227,4 @@ declare function computeInsights(filter?: FilterExpr, controls?: UniqueryControl
 declare function getInsights(query: Uniquery): UniqueryInsights;
 
 export { computeInsights, getInsights, isPrimitive, walkFilter };
-export type { AggregateExpr, AggregateFn, ComparisonNode, ComparisonOp, FieldOps, FieldOpsFor, FieldValue, FilterExpr, FilterVisitor, InsightOp, LogicalNode, NavTarget, Primitive, SelectExpr, TypedWithRelation, Uniquery, UniqueryControls, UniqueryInsights, WithRelation };
+export type { AggregateControls, AggregateExpr, AggregateFn, AggregateQuery, AggregateResult, ComparisonNode, ComparisonOp, FieldOps, FieldOpsFor, FieldValue, FilterExpr, FilterVisitor, InsightOp, LogicalNode, NavTarget, Primitive, ResolveAlias, SelectExpr, TypedWithRelation, Uniquery, UniqueryControls, UniqueryInsights, WithRelation };

package/dist/index.mjs

@@ -70,6 +70,14 @@ function isPrimitive(x) {
 	else capture(entry.$field, entry.$fn);
 	else for (const field of Object.keys(controls.$select)) capture(field, "$select");
 	if (controls?.$groupBy) for (const field of controls.$groupBy) capture(field, "$groupBy");
+	if (controls?.$having) walkFilter(controls.$having, {
+		comparison(field) {
+			capture(field, "$having");
+		},
+		and() {},
+		or() {},
+		not() {}
+	});
 	if (controls?.$sort) for (const field of Object.keys(controls.$sort)) capture(field, "$order");
 	if (controls?.$with) for (const entry of controls.$with) {
 		if (typeof entry === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqu/core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Canonical query format types, tree walker, and utilities for Uniqu",
   "license": "MIT",
   "author": "Artem Maltsev",