@omgbase/oqx 0.23.0 → 0.25.0

package/dist/parser.js

@@ -13,7 +13,7 @@
 // consumer block — each clause appears at most once, in exactly this order:
 //
 //   select <projection>  from <source>  where <predicate>  follow <dest>, … {…}
-//   order by …  limit N  offset N
+//   flatten <expr> [{…}] [as <name>] …  group by …  having …  order by …  limit N  offset N
 //
 // A `follow` destination is a relation of the current row (a receiver, never
 // an outer reference) or a destination block — a receiver (which MAY be an
@@ -79,6 +79,7 @@
 // misreads.
 import { lexTemplate, lexString } from "./lexer.js";
 import { OqxError } from "./errors.js";
+import { AGGREGATE_NAMES, isAggregateName } from "./ast.js";
 import { resolveSelect, resolveWhere } from "./resolve.js";
 import { printTemplate } from "./print.js";
 const CONSUMERS = new Set(["collect", "exists", "none", "count", "first", "single"]);
@@ -86,8 +87,13 @@ const CONSUMERS = new Set(["collect", "exists", "none", "count", "first", "singl
 // `frontier` is a clause of every body that has a `follow` (a destination
 // block's marks the occurrences it reaches, any other body's its seeds — 0.20);
 // `depth` is legal only in a follow destination block, and the order sentence
-// names it only there.
-const CLAUSE_ORDER = ["select", "from", "where", "frontier", "depth", "follow", "order by", "limit", "offset"];
+// names it only there. `group by` and `having` (0.24) sit after `follow`: the
+// rows a body yields — the walk's occurrences, when it has one — are what gets
+// grouped, and the bound and the ordering then apply to the groups. `flatten`
+// (0.25) sits between them: it fans the rows a body yields — the occurrences,
+// after a walk — out per element, and is the one clause that may repeat (each
+// `flatten` fans out the rows the previous produced, SEMANTICS §25).
+const CLAUSE_ORDER = ["select", "from", "where", "frontier", "depth", "follow", "flatten", "group by", "having", "order by", "limit", "offset"];
 const DESTINATION_ONLY = new Set(["depth"]);
 // The clauses a body may hold, in order.
 function clausesOf(ctx) {
@@ -98,8 +104,11 @@ function clausesOf(ctx) {
 const CLAUSE_WORDS = new Set([
     "collect", "exists", "none", "count", "first", "single",
     "order", "by", "asc", "desc", "follow", "distinct", "frontier", "depth", "in", "values",
-    "limit", "offset",
+    "limit", "offset", "group", "having", "flatten", "as",
 ]);
+// The names a group scope resolves besides its keys (SEMANTICS §24): the
+// group's rows, the key record itself, and its identity.
+const GROUP_SCOPE_NAMES = new Set(["rows", "$it", "$key"]);
 const RELOPS = new Set(["==", "!=", "<", "<=", ">", ">="]);
 // The comparison level (GRAMMAR §4): the six relational operators and, since
 // 0.22, the four regex operators — sugar over `matches`, non-associative like
@@ -235,6 +244,9 @@ class Parser {
             consumer: "collect",
             follow: body.follow,
             frontier: body.frontier,
+            flatten: body.flatten,
+            groupBy: body.groupBy,
+            having: body.having,
             distinct: body.distinct,
             values: body.values,
             limit: body.limit,
@@ -246,8 +258,8 @@ class Parser {
     queryFromOp(e, start) {
         return {
             kind: "query", span: this.sp(start), source: e.receiver, from: e.sub.from, where: e.sub.where, select: e.sub.select,
-            orderBy: e.sub.orderBy, consumer: e.op, follow: e.sub.follow, frontier: e.sub.frontier, distinct: e.distinct, values: e.sub.values,
-            limit: e.sub.limit, offset: e.sub.offset,
+            orderBy: e.sub.orderBy, consumer: e.op, follow: e.sub.follow, frontier: e.sub.frontier, flatten: e.sub.flatten, groupBy: e.sub.groupBy, having: e.sub.having,
+            distinct: e.distinct, values: e.sub.values, limit: e.sub.limit, offset: e.sub.offset,
         };
     }
     tokDesc() {
@@ -267,6 +279,9 @@ class Parser {
         let follow = null;
         let frontier = null;
         let depth = null;
+        const flatten = [];
+        let groupBy = null;
+        let having = null;
         let distinct = false;
         let values = false;
         let limit = null;
@@ -278,7 +293,9 @@ class Parser {
         const rowDepth = ctx.top ? 1 : this.depth;
         const enter = (clause) => {
             const idx = CLAUSE_ORDER.indexOf(clause);
-            if (idx === stage)
+            // `flatten` is the one clause that may repeat (0.25): each fans out the
+            // rows the previous produced.
+            if (idx === stage && clause !== "flatten")
                 this.fail(`duplicate \`${clause}\` clause`);
             if (idx < stage) {
                 this.fail(`\`${clause}\` must come before \`${CLAUSE_ORDER[stage]}\` — OQX clause order is ${clausesOf(ctx).join(", ")}`);
@@ -335,6 +352,28 @@ class Parser {
                 follow = this.atDepth(rowDepth, () => this.parseFollow());
                 continue;
             }
+            // `flatten <expr> [{ … }] [as <name>]` (0.25): the value is read on each
+            // row, like `where`; a brace after a receiver is the receiver-block sugar
+            // (the `collect` op), so the block needs no slot of its own.
+            if (this.atFlatten()) {
+                enter("flatten");
+                flatten.push(this.atDepth(rowDepth, () => this.parseFlatten(flatten)));
+                continue;
+            }
+            // `group by k, name: expr` (0.24): the keys are read on the rows, like `where`.
+            if (this.atGroupBy()) {
+                enter("group by");
+                groupBy = this.atDepth(rowDepth, () => this.parseGroupBy());
+                continue;
+            }
+            // `having P` (0.24): a predicate over each GROUP, read at the row depth
+            // (the group scope sits where the rows did).
+            if (this.atHaving()) {
+                enter("having");
+                this.next();
+                having = this.atDepth(rowDepth, () => this.parseWhere());
+                continue;
+            }
             if (this.atOrderBy()) {
                 enter("order by");
                 this.next();
@@ -379,15 +418,314 @@ class Parser {
         // Validate the alias references of this body (cycles, a block alias inside a
         // `where` expression, a `select` item naming an item to its right); the
         // surface form is kept. `where` first: its cycle report follows its own path.
-        if (where)
-            resolveWhere(select, where, (msg) => this.fail(msg));
-        resolveSelect(select, (msg) => this.fail(msg));
+        // A grouped body without a projection yields its keys and a count (0.24);
+        // the items are synthesized before the alias validation sees the select.
+        if (groupBy && select.length === 0)
+            select = defaultGroupProjection(groupBy, (msg) => this.failAt(groupBy.span[0], msg));
+        const resolvedWhere = where ? resolveWhere(select, where, (msg) => this.fail(msg)) : null;
+        const resolvedHaving = having ? resolveWhere(select, having, (msg) => this.fail(msg)) : null;
+        // The resolved items: an aggregate reached through an alias (`n: count(),
+        // xs: collect(n)`) is judged where it will be evaluated.
+        const resolvedSelect = resolveSelect(select, (msg) => this.fail(msg));
         // Outside a destination block `frontier` marks the seeds of this body's walk,
         // so it needs one.
         if (frontier && !follow && !ctx.destination) {
             this.fail("`frontier` needs a `follow` — a body's `frontier <expr>` marks which of its rows (the walk's seeds) are frontiers; a destination block's marks the occurrences reached through it");
         }
-        return { froms, where, select, orderBy, follow, frontier, depth, distinct, values, limit, offset };
+        // Grouping (0.24): `having` needs a `group by`; `distinct` is redundant with
+        // one; aggregates may stand only in the post-group clauses; and every bare
+        // name read at the group scope must be a key, an alias, or the group's rows.
+        if (having && !groupBy) {
+            this.failAt(having.span[0], "`having` needs a `group by` — `having <pred>` filters the groups a body yields; a per-row filter is `where`");
+        }
+        if (groupBy) {
+            if (distinct)
+                this.failAt(groupBy.span[0], DISTINCT_WITH_GROUP);
+            this.checkGroupedBody({ select, resolvedSelect, having, resolvedHaving, orderBy, froms, where: resolvedWhere, frontier, flatten, limit, offset, groupBy });
+        }
+        else {
+            this.rejectAggregates({ select, resolvedSelect, having: null, resolvedHaving: null, orderBy, froms, where: resolvedWhere, frontier, flatten, limit, offset, groupBy: null });
+        }
+        return { froms, where, select, orderBy, follow, frontier, depth, flatten, groupBy, having, distinct, values, limit, offset };
+    }
+    // ---- flatten (0.25) -------------------------------------------------------
+    // `flatten` is a clause when a value can follow the word; otherwise it is a
+    // field name (`select flatten from r`).
+    atFlatten() {
+        if (!this.at("ident", "flatten"))
+            return false;
+        const nx = this.peekAt(1);
+        // A value start — or an aggregate call whose name is a consumer word
+        // (`flatten collect(x)`), admitted so the aggregate check can name it.
+        return this.startsValue(nx) || (nx?.type === "ident" && isAggregateName(nx.value) && this.peekAt(2)?.type === "lparen");
+    }
+    // `flatten <expr> [as <name>]`. The expression is any value — a block after a
+    // receiver is read by the postfix grammar as the implicit `collect` op (0.20),
+    // which is exactly the block over the coerced collection SEMANTICS §25 wants.
+    // The name defaults to a plain navigation's last segment (as a select item's
+    // or a group key's does); anything else needs `as`. Names are unique within
+    // the body, never a `$`-name (the language's), a keyword or a literal word.
+    parseFlatten(earlier) {
+        const start = this.start();
+        this.next(); // `flatten`
+        const expr = this.parseValueExpr();
+        let name;
+        if (this.at("ident", "as")) {
+            this.next();
+            const t = this.peek();
+            if (t.type !== "ident")
+                this.fail("expected a name after `as` (`flatten <expr> as <name>`)");
+            if (LITERAL_WORDS.has(t.value))
+                this.fail(`\`${t.value}\` is a literal and cannot name a flattened value (\`flatten <expr> as <name>\`)`);
+            if (t.value.startsWith("$"))
+                this.fail(`a flattened value cannot be bound to a \`$\`-name (\`${t.value}\`) — \`$\` belongs to the language; choose another name`);
+            name = this.next().value;
+        }
+        else {
+            const key = navKey(expr);
+            if (key === null) {
+                this.failAt(start, `\`flatten ${describe(expr)}\` needs a name (\`flatten ${describe(expr)} as <name>\`) — only a plain navigation names itself by its last segment`);
+            }
+            name = key;
+        }
+        if (earlier.some((f) => f.name === name))
+            this.failAt(start, `duplicate flatten name '${name}' — each flatten binds its own name (\`flatten <expr> as <other>\`)`);
+        return { kind: "flatten", span: this.sp(start), expr, name };
+    }
+    // ---- grouping (0.24) ------------------------------------------------------
+    // `group by` is a clause only as the two-word sequence (a field named `group`
+    // stays a name: `select group from r`).
+    atGroupBy() {
+        const t = this.peek();
+        const nx = this.peekAt(1);
+        return t.type === "ident" && t.value === "group" && !!nx && nx.type === "ident" && nx.value === "by";
+    }
+    // `having` is a clause when a predicate can follow it — a value start, or an
+    // aggregate call whose name is a consumer word (`having count() > 1`:
+    // `count` alone cannot begin a value, `count(` can); otherwise a field name.
+    atHaving() {
+        if (!this.at("ident", "having"))
+            return false;
+        const nx = this.peekAt(1);
+        return this.startsValue(nx) || (nx?.type === "ident" && isAggregateName(nx.value) && this.peekAt(2)?.type === "lparen");
+    }
+    parseGroupBy() {
+        const start = this.start();
+        this.next();
+        this.next(); // `group` `by`
+        const keys = [this.parseGroupKey()];
+        while (this.at("comma")) {
+            this.next();
+            keys.push(this.parseGroupKey());
+        }
+        const seen = new Set();
+        for (const k of keys) {
+            if (seen.has(k.name))
+                this.failAt(k.span[0], `duplicate group key '${k.name}' — each key needs its own name (alias one: \`other: expr\`)`);
+            seen.add(k.name);
+        }
+        return { kind: "groupBy", span: this.sp(start), keys };
+    }
+    // One key, shaped like a select item: `name: expr`, or an unaliased navigation
+    // keyed by its last segment; any other expression needs the alias, because the
+    // alias is how the post-group clauses refer to the key.
+    parseGroupKey() {
+        const start = this.start();
+        if (this.at("ident") && this.peekAt(1)?.type === "colon") {
+            const name = this.next().value;
+            this.next(); // ':'
+            const expr = this.parseValueExpr();
+            return { kind: "key", span: this.sp(start), name, expr };
+        }
+        if (!this.canStartValue())
+            this.fail("expected a group key after `group by` (`group by <name>` or `group by <alias>: <expr>`)");
+        const expr = this.parseValueExpr();
+        const name = navKey(expr);
+        if (name === null) {
+            this.failAt(start, `a group key that is not a plain name needs an alias (\`group by key: ${describe(expr)}\`) — the alias is the name the select, \`having\` and \`order by\` read it by`);
+        }
+        return { kind: "key", span: this.sp(start), name, expr };
+    }
+    // `name(` where `name` is an aggregate: `count()`, `sum(e)`, `collect(distinct
+    // e)`. The cursor is at the `(`. Arity and the `distinct` modifier are checked
+    // here; WHERE the aggregate may stand is the body's business (`checkGroupedBody`).
+    parseAggregate(name, start) {
+        this.next(); // '('
+        let distinct = false;
+        if (this.at("ident", "distinct") && this.startsValue(this.peekAt(1))) {
+            this.next();
+            distinct = true;
+        }
+        let arg = null;
+        if (!this.at("rparen")) {
+            arg = this.parseValueExpr();
+            if (this.at("comma"))
+                this.fail(`\`${name}(…)\` takes one argument — an aggregate reduces one expression over the group's rows`);
+        }
+        if (!this.at("rparen"))
+            this.fail(`expected ')' to close \`${name}(…)\``);
+        this.next();
+        if (arg === null && name !== "count")
+            this.fail(`\`${name}()\` needs an argument (\`${name}(<expr>)\`) — only \`count()\` counts the group's rows without one`);
+        if (distinct && (name === "any" || name === "all")) {
+            this.fail(`\`${name}(distinct …)\`: \`distinct\` applies to a value aggregate (count, sum, min, max, avg, collect, first, last), not to a predicate aggregate`);
+        }
+        return { kind: "aggregate", span: [start, this.end()], name, arg, distinct };
+    }
+    // A free call: an aggregate node for an aggregate name (reserved since 0.24),
+    // an ordinary `call` otherwise. The cursor is at the `(`.
+    parseFreeCall(name, start) {
+        if (isAggregateName(name))
+            return this.parseAggregate(name, start);
+        const args = this.parseArgs();
+        return { kind: "call", span: this.sp(start), recv: null, name, args };
+    }
+    // The clauses an aggregate may NOT stand in — every clause read before the
+    // rows are grouped (`from`, `where`, `frontier`, the keys, the bound) — and,
+    // in a body without `group by`, every clause. The `where` is the alias-resolved
+    // one, so an aggregate reached through a select alias is caught too.
+    rejectAggregates(b) {
+        const found = [];
+        const collect = (exprs, clause) => {
+            const out = [];
+            for (const e of exprs)
+                if (e)
+                    aggregatesIn(e, out);
+            for (const a of out)
+                found.push([a, clause]);
+        };
+        const where = [];
+        if (b.where)
+            whereAggregates(b.where, where);
+        for (const a of where)
+            found.push([a, "`where`"]);
+        collect(b.froms, "`from`");
+        collect([b.frontier], "`frontier`");
+        collect(b.flatten.map((f) => f.expr), "`flatten`");
+        collect([b.limit], "`limit`");
+        collect([b.offset], "`offset`");
+        if (b.groupBy)
+            collect(b.groupBy.keys.map((k) => k.expr), "a `group by` key");
+        if (!b.groupBy) {
+            collect(b.resolvedSelect.filter((it) => it.kind === "field").map((it) => it.expr), "a select item");
+            if (b.orderBy)
+                collect(b.orderBy.map((o) => o.expr), "`order by`");
+        }
+        const hit = found[0];
+        if (!hit)
+            return;
+        const [agg, clause] = hit;
+        if (!b.groupBy) {
+            this.failAt(agg.span[0], `\`${describe(agg)}\` is an aggregate: it is read after grouping and may stand only in a select item, \`having\` or \`order by\` of a body with \`group by\` — this body has none`);
+        }
+        this.failAt(agg.span[0], `\`${describe(agg)}\` is an aggregate and cannot be read in ${clause}${clause === "`where`" ? " (a select alias standing for one included)" : ""} — the rows are not grouped yet there; aggregates stand in a select item, \`having\` or \`order by\``);
+    }
+    // A grouped body: aggregates only after the grouping (and never nested), and
+    // every bare name at the group scope a key, an alias, or the group's rows.
+    checkGroupedBody(b) {
+        this.rejectAggregates(b);
+        // An aggregate's argument is read on the group's rows, where there is no
+        // group to aggregate: `sum(count())` is an error, not a double reduction.
+        const post = [];
+        for (const it of b.resolvedSelect)
+            if (it.kind === "field")
+                aggregatesIn(it.expr, post);
+        if (b.resolvedHaving)
+            whereAggregates(b.resolvedHaving, post);
+        if (b.orderBy)
+            for (const o of b.orderBy)
+                aggregatesIn(o.expr, post);
+        const nested = nestedAggregate(post);
+        if (nested)
+            this.failAt(nested.span[0], `\`${describe(nested)}\`: an aggregate cannot nest — its argument is read on each of the group's rows, where there is no group to reduce`);
+        const keys = new Set(b.groupBy.keys.map((k) => k.name));
+        const valid = (aliases) => new Set([...keys, ...GROUP_SCOPE_NAMES, ...aliases]);
+        const aliases = [];
+        for (const it of b.select) {
+            const names = valid(aliases);
+            if (it.kind === "field")
+                this.checkGroupExpr(it.expr, names, "a select item");
+            else
+                this.checkGroupExpr(it.op.receiver, names, "a select item");
+            const own = it.kind === "collect" ? (it.name === "" ? null : it.name) : it.lift === 0 && it.name !== "" ? it.name : null;
+            if (own !== null)
+                aliases.push(own);
+        }
+        if (b.having)
+            this.checkGroupWhere(b.having, valid(aliases), "`having`");
+        if (b.orderBy)
+            for (const o of b.orderBy)
+                this.checkGroupExpr(o.expr, valid([]), "`order by`");
+    }
+    checkGroupWhere(w, valid, where) {
+        switch (w.kind) {
+            case "and":
+            case "or":
+                w.parts.forEach((p) => this.checkGroupWhere(p, valid, where));
+                return;
+            case "not":
+                this.checkGroupWhere(w.expr, valid, where);
+                return;
+            case "scalar":
+                this.checkGroupExpr(w.expr, valid, where);
+                return;
+            case "op":
+                this.checkGroupExpr(w.receiver, valid, where);
+                return; // the block is its own scope
+        }
+    }
+    // Every bare name `e` reads at the group scope (an aggregate's argument reads
+    // the group's rows and is not checked; a nested block is its own scope, only
+    // its receiver is read here). `inCall` names the enclosing non-aggregate free
+    // call, for the "not an aggregate" hint.
+    checkGroupExpr(e, valid, where, inCall = null) {
+        switch (e.kind) {
+            case "ident":
+                if (!valid.has(e.name)) {
+                    const hint = inCall === null ? "" : `; \`${inCall}(…)\` is not an aggregate — the aggregates are ${[...AGGREGATE_NAMES].join(", ")}`;
+                    this.failAt(e.span[0], `\`${e.name}\` is not a group key or aggregate — ${where} of a grouped body reads the group: a key (\`group by ${e.name}\`), an aggregate over its rows (\`collect(${e.name})\`), or the rows themselves (\`rows collect { select ${e.name} }\`)${hint}`);
+                }
+                return;
+            case "lit":
+            case "binding":
+            case "outer":
+            case "aggregate": return;
+            case "member":
+                this.checkGroupExpr(e.recv, valid, where, inCall);
+                return;
+            case "call":
+                if (e.recv)
+                    this.checkGroupExpr(e.recv, valid, where, inCall);
+                for (const a of e.args)
+                    this.checkGroupExpr(a, valid, where, e.recv === null ? e.name : inCall);
+                return;
+            case "unary":
+            case "required":
+                this.checkGroupExpr(e.expr, valid, where, inCall);
+                return;
+            case "binary":
+            case "logical":
+            case "in":
+                this.checkGroupExpr(e.left, valid, where, inCall);
+                this.checkGroupExpr(e.right, valid, where, inCall);
+                return;
+            case "range":
+                if (e.lo)
+                    this.checkGroupExpr(e.lo, valid, where, inCall);
+                if (e.hi)
+                    this.checkGroupExpr(e.hi, valid, where, inCall);
+                return;
+            case "tuple":
+                e.items.forEach((x) => this.checkGroupExpr(x, valid, where, inCall));
+                return;
+            case "template":
+                e.parts.forEach((p) => { if (typeof p !== "string")
+                    this.checkGroupExpr(p, valid, where, inCall); });
+                return;
+            case "op":
+                this.checkGroupExpr(e.receiver, valid, where, inCall);
+                return;
+        }
     }
     // The keyword-less run that opens a body. At the top level it is always the
     // projection. In a block it is a `where`-first body when the leading expression
@@ -472,6 +810,12 @@ class Parser {
                 this.fail("expected an integer after `depth` (`depth 1`..`depth 8`)");
             if (t.value === "frontier")
                 this.fail(`unexpected 'frontier' after \`${last}\` — \`frontier\` takes an expression (\`frontier <expr>\`) and belongs to a body that has a \`follow\``);
+            if (t.value === "flatten")
+                this.fail(`unexpected 'flatten' after \`${last}\` — \`flatten\` takes a value to split into rows (\`flatten <expr> [{ … }] [as <name>]\`)`);
+            if (t.value === "group")
+                this.fail(`unexpected 'group' after \`${last}\` — a grouping is written \`group by <key>[, <key>…]\` (a key is a name or \`alias: <expr>\`)`);
+            if (t.value === "having")
+                this.fail(`unexpected 'having' after \`${last}\` — \`having\` takes a predicate over each group (\`having count() > 1\`) and belongs to a body that has a \`group by\``);
         }
         if (last === "from" && t.type === "ident" && CONSUMERS.has(t.value)) {
             this.fail(`unexpected \`${t.value}\` after \`from\` — a whole-query consumer is written \`<collection> ${t.value} { … }\`; to project a field named ${t.value} write \`select ${t.value} from …\`; a predicate needs \`where\``);
@@ -640,10 +984,8 @@ class Parser {
             ? { kind: "outer", span: [start, head.end], levels, name: head.value }
             : { kind: "ident", span: [start, head.end], name: head.value };
         let name = head.value;
-        if (levels === 0 && this.at("lparen")) {
-            const args = this.parseArgs();
-            expr = { kind: "call", span: this.sp(start), recv: null, name: head.value, args };
-        }
+        if (levels === 0 && this.at("lparen"))
+            expr = this.parseFreeCall(head.value, start);
         while (this.at("dot")) {
             this.next();
             if (!this.at("ident"))
@@ -719,8 +1061,8 @@ class Parser {
                 // `name: jobs first { }.pay`: the directive is the head of a longer value.
                 if (this.atScalarContinuation() || this.atValueDirective())
                     return this.finishItem(name, this.parseOr(op), lift, start);
-                if (op.op !== "collect" && op.op !== "first" && op.op !== "single") {
-                    this.fail(`projection '${name}' must use collect/first/single, not ${op.op} (exists/none/count are where-position tests)`);
+                if (op.op !== "collect" && op.op !== "first" && op.op !== "single" && op.op !== "count") {
+                    this.fail(`projection '${name}' must use collect/first/single/count, not ${op.op} (exists/none are where-position tests; \`count { … }\` is a value since 0.24)`);
                 }
                 return this.finishItem(name, op, lift, start);
             }
@@ -1049,6 +1391,10 @@ class Parser {
         if (!this.at("rbrace"))
             this.fail(`expected '}' to close the ${op} { … } block`);
         this.next();
+        // `x collect distinct { group by k }`: the directive's distinct is as
+        // redundant as the body's own (checked in parseBody).
+        if (distinct && body.groupBy)
+            this.failAt(body.groupBy.span[0], DISTINCT_WITH_GROUP);
         const sub = {
             kind: "subquery",
             span: this.sp(lbrace),
@@ -1059,6 +1405,9 @@ class Parser {
             follow: body.follow,
             frontier: body.frontier,
             depth: body.depth,
+            flatten: body.flatten,
+            groupBy: body.groupBy,
+            having: body.having,
             values: body.values,
             limit: body.limit,
             offset: body.offset,
@@ -1130,7 +1479,7 @@ class Parser {
         this.next();
         const subSpan = [lbracket, this.end()];
         const sub = (parts) => ({
-            kind: "subquery", span: subSpan, from: [], where: null, select: [], orderBy: null, follow: null, frontier: null, depth: null, values: false, limit: null, offset: null, ...parts,
+            kind: "subquery", span: subSpan, from: [], where: null, select: [], orderBy: null, follow: null, frontier: null, depth: null, flatten: [], groupBy: null, having: null, values: false, limit: null, offset: null, ...parts,
         });
         const bang = this.atOp("!") ? this.next() : null;
         if (index) {
@@ -1291,9 +1640,9 @@ class Parser {
                 }
             }
             else if (this.at("lparen") && left === undefined && expr.kind === "ident") {
-                // free function call: name(args) — a bare name read here, not `(f)(x)`
-                const args = this.parseArgs();
-                expr = { kind: "call", span: this.sp(start), recv: null, name: expr.name, args };
+                // free function call: name(args) — a bare name read here, not `(f)(x)`;
+                // an aggregate name makes it an `aggregate` node (0.24)
+                expr = this.parseFreeCall(expr.name, start);
             }
             else if (this.at("lbracket")) {
                 expr = this.parseBracket(expr);
@@ -1320,9 +1669,12 @@ class Parser {
         }
         return expr;
     }
+    // The directives that have a value form: collect/first/single, and since 0.24
+    // `count { … }` (the number of rows the block yields). exists/none are
+    // predicates only.
     atValueDirective() {
         const op = this.atConsumerBlock();
-        return op === "collect" || op === "first" || op === "single";
+        return op === "collect" || op === "first" || op === "single" || op === "count";
     }
     parseArgs() {
         this.next(); // '('
@@ -1440,6 +1792,99 @@ class Parser {
         return { kind: "template", span: [open.pos, this.end()], parts };
     }
 }
+// ---- grouping helpers (0.24) --------------------------------------------------
+const DISTINCT_WITH_GROUP = "`distinct` is redundant with `group by` — a grouped body already yields one row per distinct key tuple; drop `distinct`";
+// The projection of a grouped body that writes none (SEMANTICS §24): every key
+// by its name, then `count: count()`. Synthesized here so the tree shows what
+// the body projects and the engine has no grouped "row itself" to define; the
+// nodes carry the empty span (they did not come from source).
+function defaultGroupProjection(groupBy, fail) {
+    if (groupBy.keys.some((k) => k.name === "count")) {
+        fail("a group key named `count` needs an explicit `select` — the default projection of a grouped body is its keys plus `count: count()`");
+    }
+    const items = groupBy.keys.map((k) => ({ kind: "field", span: [0, 0], name: k.name, expr: { kind: "ident", span: [0, 0], name: k.name }, lift: 0 }));
+    items.push({ kind: "field", span: [0, 0], name: "count", expr: { kind: "aggregate", span: [0, 0], name: "count", arg: null, distinct: false }, lift: 0 });
+    return items;
+}
+// Every aggregate node in `e` read at THIS scope (a nested block's body is its
+// own scope and is not entered; a block's receiver is). An aggregate's argument
+// is entered too, so a nested aggregate is found by `nestedAggregate`.
+function aggregatesIn(e, out) {
+    switch (e.kind) {
+        case "aggregate":
+            out.push(e);
+            if (e.arg)
+                aggregatesIn(e.arg, out);
+            return;
+        case "lit":
+        case "ident":
+        case "outer":
+        case "binding": return;
+        case "member":
+            aggregatesIn(e.recv, out);
+            return;
+        case "call":
+            if (e.recv)
+                aggregatesIn(e.recv, out);
+            e.args.forEach((a) => aggregatesIn(a, out));
+            return;
+        case "unary":
+        case "required":
+            aggregatesIn(e.expr, out);
+            return;
+        case "binary":
+        case "logical":
+        case "in":
+            aggregatesIn(e.left, out);
+            aggregatesIn(e.right, out);
+            return;
+        case "range":
+            if (e.lo)
+                aggregatesIn(e.lo, out);
+            if (e.hi)
+                aggregatesIn(e.hi, out);
+            return;
+        case "tuple":
+            e.items.forEach((x) => aggregatesIn(x, out));
+            return;
+        case "template":
+            e.parts.forEach((p) => { if (typeof p !== "string")
+                aggregatesIn(p, out); });
+            return;
+        case "op":
+            aggregatesIn(e.receiver, out);
+            return;
+    }
+}
+function whereAggregates(w, out) {
+    switch (w.kind) {
+        case "and":
+        case "or":
+            w.parts.forEach((p) => whereAggregates(p, out));
+            return;
+        case "not":
+            whereAggregates(w.expr, out);
+            return;
+        case "scalar":
+            aggregatesIn(w.expr, out);
+            return;
+        case "op":
+            aggregatesIn(w.receiver, out);
+            return;
+    }
+}
+// The first aggregate whose argument holds another (`sum(count())`), if any.
+function nestedAggregate(found) {
+    for (const a of found) {
+        if (a.kind !== "aggregate" || !a.arg)
+            continue;
+        const inner = [];
+        aggregatesIn(a.arg, inner);
+        if (inner.length > 0)
+            return a;
+    }
+    return null;
+}
 // The default key of an unaliased projection item: the last segment of a bare /
 // dotted / outer navigation (`name`, `meta.slug` → "slug", `^name`), else null.
 function navKey(e) {