@uniqu/url 0.1.0 → 0.1.2

package/README.md

@@ -152,6 +152,7 @@ Control keywords start with `$` and are separated from filter expressions:
 | `$skip` | — | `$skip=40` | `{ $skip: 40 }` |
 | `$count` | — | `$count` | `{ $count: true }` |
 | `$groupBy` | — | `$groupBy=currency,region` | `{ $groupBy: ['currency', 'region'] }` |
+| `$having` | — | `$having=total>1000` | `{ $having: { total: { $gt: 1000 } } }` |
 | `$with` | — | `$with=posts,author` | `{ $with: [{ name: 'posts', filter: {}, controls: {} }, ...] }` |
 | `$<custom>` | — | `$search=term` | `{ $search: 'term' }` |
 
@@ -220,6 +221,31 @@ Aggregates and `$groupBy` work inside `$with` sub-queries too:
 $with=orders($select=sum(total):revenue&$groupBy=status)
 ```
 
+### Post-Aggregation Filter (`$having`)
+
+`$having` filters groups after aggregation (SQL `HAVING`). It accepts the same filter expression syntax as the main query:
+
+```
+$having=total>1000                          → { $having: { total: { $gt: 1000 } } }
+$having=total>1000&$having=count_star>=5    → { $having: { $and: [...] } }   (AND-merged)
+$having=total>1000^avg_price<50             → { $having: { $or: [...] } }    (OR via ^)
+$having=!(total<100)                        → { $having: { $not: {...} } }   (NOT via !())
+```
+
+For multi-condition `$having` with AND, either use multiple `$having` params (AND-merged automatically) or wrap in parentheses:
+
+```
+$having=(total>1000&count_star>=5)
+```
+
+`$having` works inside `$with` sub-queries:
+
+```
+$with=orders($select=sum(total):revenue&$groupBy=status&$having=revenue>500)
+```
+
+Insights track `$having` fields with the `'$having'` op.
+
 ### Relation Loading (`$with`)
 
 `$with` declares which relations to populate alongside the primary query. Relations are comma-separated:
@@ -432,7 +458,7 @@ Accepts a `Uniquery` object and returns a URL query string (without leading `?`)
 
 All features are supported:
 - Filter expressions (comparisons, `$and`/`$or`/`$not`, `$in`/`$nin`, `$exists`, `$regex`)
-- Controls (`$select`, `$sort`, `$limit`, `$skip`, `$count`, `$groupBy`, `$with`)
+- Controls (`$select`, `$sort`, `$limit`, `$skip`, `$count`, `$groupBy`, `$having`, `$with`)
 - Aggregates in `$select` (`sum(amount):total`)
 - Nested `$with` sub-queries
 - Pass-through custom `$`-prefixed controls

package/dist/builder.cjs

@@ -91,6 +91,7 @@ function serializeValue(value) {
 const KNOWN_CONTROL_KEYS = new Set([
 	"$select",
 	"$groupBy",
+	"$having",
 	"$sort",
 	"$limit",
 	"$skip",
@@ -122,6 +123,13 @@ function serializeControls(controls) {
 		const part = `$groupBy=${seg}`;
 		result = result ? result + "&" + part : part;
 	}
+	if (controls.$having) {
+		const havingStr = serializeFilter(controls.$having);
+		if (havingStr) {
+			const part = "$and" in controls.$having ? `$having=(${havingStr})` : `$having=${havingStr}`;
+			result = result ? result + "&" + part : part;
+		}
+	}
 	if (controls.$sort) {
 		let seg = "";
 		for (const [field, dir] of Object.entries(controls.$sort)) {

package/dist/builder.mjs

@@ -90,6 +90,7 @@ function serializeValue(value) {
 const KNOWN_CONTROL_KEYS = new Set([
 	"$select",
 	"$groupBy",
+	"$having",
 	"$sort",
 	"$limit",
 	"$skip",
@@ -121,6 +122,13 @@ function serializeControls(controls) {
 		const part = `$groupBy=${seg}`;
 		result = result ? result + "&" + part : part;
 	}
+	if (controls.$having) {
+		const havingStr = serializeFilter(controls.$having);
+		if (havingStr) {
+			const part = "$and" in controls.$having ? `$having=(${havingStr})` : `$having=${havingStr}`;
+			result = result ? result + "&" + part : part;
+		}
+	}
 	if (controls.$sort) {
 		let seg = "";
 		for (const [field, dir] of Object.entries(controls.$sort)) {

package/dist/index.cjs

@@ -310,9 +310,10 @@ function unescapeString(str) {
 				merged.push(currentMerge);
 				currentMerge = {};
 			} else {
-				currentMerge[key] = {};
-				for (const op of currentOps) currentMerge[key][op] = (0, _uniqu_core.isPrimitive)(currentVal) ? currentVal : currentVal[op];
-				for (const op of otherOps) currentMerge[key][op] = (0, _uniqu_core.isPrimitive)(val) ? val : val[op];
+				const m = {};
+				for (const op of currentOps) m[op] = (0, _uniqu_core.isPrimitive)(currentVal) ? currentVal : currentVal[op];
+				for (const op of otherOps) m[op] = (0, _uniqu_core.isPrimitive)(val) ? val : val[op];
+				currentMerge[key] = m;
 			}
 		} else currentMerge[key] = val;
 	}
@@ -350,9 +351,9 @@ function buildExists(fields, positive) {
 	let filter = {};
 	let parser;
 	if (exprParts.length) {
-		parser = new Parser(lex(exprParts.join("&")));
-		filter = parser.parseExpression();
-		parser.expectEof();
+		const parsed = parseFilterExpr(exprParts.join("&"));
+		parser = parsed.parser;
+		filter = parsed.expr;
 	} else parser = new Parser([]);
 	for (const [field, op] of controlInsights) parser.captureInsight(field, op);
 	return {
@@ -374,6 +375,15 @@ function buildExists(fields, positive) {
 	parts.push(str.slice(start));
 	return parts;
 }
+/** Lex + parse a raw filter expression string. */ function parseFilterExpr(raw) {
+	const parser = new Parser(lex(raw));
+	const expr = parser.parseExpression();
+	parser.expectEof();
+	return {
+		expr,
+		parser
+	};
+}
 /** Parse a single `$with` segment like `posts` or `posts($sort=-createdAt&status=active)`. */ function parseWithSegment(seg) {
 	if (!seg) return null;
 	const parenIdx = seg.indexOf("(");
@@ -402,6 +412,7 @@ function buildExists(fields, positive) {
 function handleControls(parts) {
 	const controls = {};
 	const controlInsights = [];
+	const aliasToField = /* @__PURE__ */ new Map();
 	for (const raw of parts) {
 		const eqIdx = raw.indexOf("=");
 		const key = eqIdx === -1 ? raw : raw.slice(0, eqIdx);
@@ -454,6 +465,7 @@ function handleControls(parts) {
 							$field: field,
 							$as: alias
 						});
+						aliasToField.set(alias, field);
 						controlInsights.push([field, fn]);
 					}
 					controls.$select = arr;
@@ -500,6 +512,14 @@ function handleControls(parts) {
 					controlInsights.push([f, "$groupBy"]);
 				}
 				break;
+			case "$having": {
+				if (!value) break;
+				const { expr, parser: hp } = parseFilterExpr(value);
+				if (controls.$having) controls.$having = { $and: [controls.$having, expr] };
+				else controls.$having = expr;
+				for (const [field] of hp.getInsights()) controlInsights.push([field, "$having"]);
+				break;
+			}
 			case "$limit":
 			case "$top":
 				controls.$limit = Number(value);
@@ -513,6 +533,13 @@ function handleControls(parts) {
 			default: controls[key] = value;
 		}
 	}
+	if (aliasToField.size) for (let i = 0; i < controlInsights.length; i++) {
+		const [field, op] = controlInsights[i];
+		if (op === "$order") {
+			const real = aliasToField.get(field);
+			if (real) controlInsights[i] = [real, op];
+		}
+	}
 	return {
 		controls,
 		controlInsights

package/dist/index.mjs

@@ -309,9 +309,10 @@ function unescapeString(str) {
 				merged.push(currentMerge);
 				currentMerge = {};
 			} else {
-				currentMerge[key] = {};
-				for (const op of currentOps) currentMerge[key][op] = isPrimitive(currentVal) ? currentVal : currentVal[op];
-				for (const op of otherOps) currentMerge[key][op] = isPrimitive(val) ? val : val[op];
+				const m = {};
+				for (const op of currentOps) m[op] = isPrimitive(currentVal) ? currentVal : currentVal[op];
+				for (const op of otherOps) m[op] = isPrimitive(val) ? val : val[op];
+				currentMerge[key] = m;
 			}
 		} else currentMerge[key] = val;
 	}
@@ -349,9 +350,9 @@ function buildExists(fields, positive) {
 	let filter = {};
 	let parser;
 	if (exprParts.length) {
-		parser = new Parser(lex(exprParts.join("&")));
-		filter = parser.parseExpression();
-		parser.expectEof();
+		const parsed = parseFilterExpr(exprParts.join("&"));
+		parser = parsed.parser;
+		filter = parsed.expr;
 	} else parser = new Parser([]);
 	for (const [field, op] of controlInsights) parser.captureInsight(field, op);
 	return {
@@ -373,6 +374,15 @@ function buildExists(fields, positive) {
 	parts.push(str.slice(start));
 	return parts;
 }
+/** Lex + parse a raw filter expression string. */ function parseFilterExpr(raw) {
+	const parser = new Parser(lex(raw));
+	const expr = parser.parseExpression();
+	parser.expectEof();
+	return {
+		expr,
+		parser
+	};
+}
 /** Parse a single `$with` segment like `posts` or `posts($sort=-createdAt&status=active)`. */ function parseWithSegment(seg) {
 	if (!seg) return null;
 	const parenIdx = seg.indexOf("(");
@@ -401,6 +411,7 @@ function buildExists(fields, positive) {
 function handleControls(parts) {
 	const controls = {};
 	const controlInsights = [];
+	const aliasToField = /* @__PURE__ */ new Map();
 	for (const raw of parts) {
 		const eqIdx = raw.indexOf("=");
 		const key = eqIdx === -1 ? raw : raw.slice(0, eqIdx);
@@ -453,6 +464,7 @@ function handleControls(parts) {
 							$field: field,
 							$as: alias
 						});
+						aliasToField.set(alias, field);
 						controlInsights.push([field, fn]);
 					}
 					controls.$select = arr;
@@ -499,6 +511,14 @@ function handleControls(parts) {
 					controlInsights.push([f, "$groupBy"]);
 				}
 				break;
+			case "$having": {
+				if (!value) break;
+				const { expr, parser: hp } = parseFilterExpr(value);
+				if (controls.$having) controls.$having = { $and: [controls.$having, expr] };
+				else controls.$having = expr;
+				for (const [field] of hp.getInsights()) controlInsights.push([field, "$having"]);
+				break;
+			}
 			case "$limit":
 			case "$top":
 				controls.$limit = Number(value);
@@ -512,6 +532,13 @@ function handleControls(parts) {
 			default: controls[key] = value;
 		}
 	}
+	if (aliasToField.size) for (let i = 0; i < controlInsights.length; i++) {
+		const [field, op] = controlInsights[i];
+		if (op === "$order") {
+			const real = aliasToField.get(field);
+			if (real) controlInsights[i] = [real, op];
+		}
+	}
 	return {
 		controls,
 		controlInsights

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqu/url",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "URL query string parser producing the Uniqu canonical query format",
   "license": "MIT",
   "author": "Artem Maltsev",
@@ -45,7 +45,7 @@
     "dist"
   ],
   "dependencies": {
-    "@uniqu/core": "^0.1.0"
+    "@uniqu/core": "^0.1.2"
   },
   "scripts": {
     "pub": "pnpm publish --access public",