happy-sql 2.1.0 → 2.1.1

package/ChangeLog

@@ -1,3 +1,15 @@
+2026.08.22, v2.1.1
+
+feature:
+- e2feb52 happy-sql: ctx -> printer
+- 515f571 happy-sql: generate_series — table-valued function in FROM
+- 39f51e3 parser/printer: where: between: add + test: happy-sql: roundtrip: full groupBy integration test
+- 6a22942 parser/printer: where: not-in: add
+- c1461ac parser/printer: distinct: add
+- 8885f47 parser/printer: limit, offset: add
+- 48f567c parser/printer: order-by: add
+- 33a852e parser/printer: aggregate functions: sum, avg, min, max, count(col)
+
 2026.08.22, v2.1.0
 
 feature:

package/lib/parser/visitors/clause/count/count.js

@@ -27,7 +27,11 @@ export const convertCount = (column) => {
         if (isNumericLiteral(item)) {
             const {value} = item;
             args.push(numericLiteral(value));
+            continue;
         }
+        
+        // column reference: COUNT(id)
+        args.push(identifier(item.name));
     }
     
     return callExpression(identifier('count'), args);

package/lib/parser/visitors/clause/delete/fixture/delete-where-between-fix.js

@@ -0,0 +1,14 @@
+[
+    deleteFrom(
+        from(
+            t,
+        ),
+        where(
+            between(
+                id,
+                10,
+                20,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/delete/fixture/delete-where-between.sql

@@ -0,0 +1 @@
+DELETE FROM t WHERE id BETWEEN 10 AND 20

package/lib/parser/visitors/clause/from/fixture/generate-series-fix.js

@@ -0,0 +1,12 @@
+[
+    select(
+        '*',
+        from(
+            generateSeries(
+                1,
+                10,
+                2,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/generate-series.sql

@@ -0,0 +1 @@
+SELECT * FROM generate_series(1, 10, 2)

package/lib/parser/visitors/clause/from/fixture/group-by-order-by-fix.js

@@ -0,0 +1,17 @@
+[
+    select(
+        dept,
+        count(
+            '*',
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+            orderBy(
+                dept,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-order-by.sql

@@ -0,0 +1 @@
+SELECT dept, COUNT(*) FROM emp GROUP BY dept ORDER BY dept

package/lib/parser/visitors/clause/from/fixture/group-by-sum-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        dept,
+        sum(
+            salary,
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-sum-having-fix.js

@@ -0,0 +1,19 @@
+[
+    select(
+        dept,
+        sum(
+            salary,
+        ),
+        from(
+            emp,
+            groupBy(
+                dept,
+            ),
+            having(
+                sum(
+                    salary,
+                ) > 1000,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/group-by-sum-having.sql

@@ -0,0 +1 @@
+SELECT dept, SUM(salary) FROM emp GROUP BY dept HAVING SUM(salary) > 1000

package/lib/parser/visitors/clause/from/fixture/group-by-sum.sql

@@ -0,0 +1 @@
+SELECT dept, SUM(salary) FROM emp GROUP BY dept

package/lib/parser/visitors/clause/from/fixture/json-each-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        '*',
+        from(
+            jsonEach(
+                '[1,2]',
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/json-each.sql

@@ -0,0 +1 @@
+SELECT * FROM json_each('[1,2]')

package/lib/parser/visitors/clause/from/fixture/limit-fix.js

@@ -0,0 +1,11 @@
+[
+    select(
+        id,
+        from(
+            users,
+            limit(
+                10,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/limit-offset-fix.js

@@ -0,0 +1,12 @@
+[
+    select(
+        id,
+        from(
+            users,
+            limit(
+                10,
+                5,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/limit-offset.sql

@@ -0,0 +1 @@
+SELECT id FROM users LIMIT 10 OFFSET 5

package/lib/parser/visitors/clause/from/fixture/limit.sql

@@ -0,0 +1 @@
+SELECT id FROM users LIMIT 10

package/lib/parser/visitors/clause/from/fixture/order-by-desc-fix.js

@@ -0,0 +1,13 @@
+[
+    select(
+        id,
+        from(
+            users,
+            orderBy(
+                desc(
+                    name,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/order-by-desc.sql

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name DESC

package/lib/parser/visitors/clause/from/fixture/order-by-fix.js

@@ -0,0 +1,11 @@
+[
+    select(
+        id,
+        from(
+            users,
+            orderBy(
+                name,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/order-by-multi-fix.js

@@ -0,0 +1,14 @@
+[
+    select(
+        id,
+        from(
+            users,
+            orderBy(
+                name,
+                desc(
+                    id,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/order-by-multi.sql

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name ASC, id DESC

package/lib/parser/visitors/clause/from/fixture/order-by.sql

@@ -0,0 +1 @@
+SELECT id FROM users ORDER BY name

package/lib/parser/visitors/clause/from/fixture/unnest-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        '*',
+        from(
+            unnest(
+                arr,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/from/fixture/unnest.sql

@@ -0,0 +1 @@
+SELECT * FROM unnest(arr)

package/lib/parser/visitors/clause/from/from.js

@@ -1,7 +1,11 @@
 import {types} from '@putout/babel';
 import {convertOperand} from '#parser/clause/operand';
+import {convertBetween} from '#parser/clause/where';
 import {convertGroupBy} from './group-by.js';
 import {convertHaving} from './having.js';
+import {convertOrderBy} from './order-by.js';
+import {convertLimit} from './limit.js';
+import {convertTableFunc} from './table-func.js';
 
 const isString = (a) => typeof a === 'string';
 
@@ -64,6 +68,15 @@ const convertBinary = (node) => {
         ]);
     }
     
+    if (op === 'NOT IN') {
+        const items = node.right.expr.items.map(convertOperand);
+        
+        return callExpression(identifier('notInList'), [
+            convertOperand(node.left),
+            ...items,
+        ]);
+    }
+    
     const jsOp = SQL_TO_JS_OP[op] ?? '===';
     
     return binaryExpression(
@@ -80,6 +93,9 @@ const convertCondition = (node) => {
     if (node.operator?.name === 'OR')
         return logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
     
+    if (node.type === 'between_expr')
+        return convertBetween(node);
+    
     return convertBinary(node);
 };
 
@@ -110,7 +126,7 @@ const flattenJoins = (node, joins = []) => {
     return joins;
 };
 
-export const convertFrom = ({expr, whereClause, groupByClause, havingClause}) => {
+export const convertFrom = ({expr, whereClause, groupByClause, havingClause, orderByClause, limitClause}) => {
     const fromArgs = [];
     
     if (whereClause)
@@ -124,6 +140,12 @@ export const convertFrom = ({expr, whereClause, groupByClause, havingClause}) =>
     if (havingClause)
         fromArgs.push(convertHaving(havingClause));
     
+    if (orderByClause)
+        fromArgs.push(convertOrderBy(orderByClause));
+    
+    if (limitClause)
+        fromArgs.push(convertLimit(limitClause));
+    
     if (expr.type === 'join_expr') {
         const parts = flattenJoins(expr);
         return callExpression(identifier('from'), parts);
@@ -135,6 +157,12 @@ export const convertFrom = ({expr, whereClause, groupByClause, havingClause}) =>
             ...fromArgs,
         ]);
     
+    if (expr.type === 'func_call')
+        return callExpression(identifier('from'), [
+            convertTableFunc(expr),
+            ...fromArgs,
+        ]);
+    
     return callExpression(identifier('from'), [
         identifier(expr.name),
         ...fromArgs,

package/lib/parser/visitors/clause/from/limit.js

@@ -0,0 +1,18 @@
+import {types} from '@putout/babel';
+
+const {
+    callExpression,
+    identifier,
+    numericLiteral,
+} = types;
+
+export const convertLimit = (limitClause) => {
+    const args = [
+        numericLiteral(limitClause.count.value),
+    ];
+    
+    if (limitClause.offset)
+        args.push(numericLiteral(limitClause.offset.value));
+    
+    return callExpression(identifier('limit'), args);
+};

package/lib/parser/visitors/clause/from/order-by.js

@@ -0,0 +1,20 @@
+import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
+
+const {callExpression, identifier} = types;
+
+const convertOrderItem = (item) => {
+    if (item.type !== 'sort_specification')
+        return convertOperand(item);
+    
+    const col = convertOperand(item.expr);
+    const {direction} = item;
+    
+    if (direction.type === 'sort_direction_desc')
+        return callExpression(identifier('desc'), [col]);
+    
+    // ASC is default — no wrapper
+    return col;
+};
+
+export const convertOrderBy = (clause) => callExpression(identifier('orderBy'), clause.specifications.items.map(convertOrderItem));

package/lib/parser/visitors/clause/from/table-func.js

@@ -0,0 +1,28 @@
+import {types} from '@putout/babel';
+
+const {
+    callExpression,
+    identifier,
+    numericLiteral,
+    stringLiteral,
+} = types;
+
+const SNAKE_RE = /_([a-z])/g;
+const toCamel = (s) => s.replace(SNAKE_RE, (_, c) => c.toUpperCase());
+
+const convertArg = (arg) => {
+    if (arg.type === 'number_literal')
+        return numericLiteral(arg.value);
+    
+    if (arg.type === 'string_literal')
+        return stringLiteral(arg.value);
+    
+    return identifier(arg.name);
+};
+
+export const convertTableFunc = (expr) => {
+    const name = toCamel(expr.name.name);
+    const args = expr.args.expr.args.items.map(convertArg);
+    
+    return callExpression(identifier(name), args);
+};

package/lib/parser/visitors/clause/operand.js

@@ -8,12 +8,22 @@ const {
     booleanLiteral,
     nullLiteral,
     memberExpression,
+    callExpression,
 } = types;
 
+const isFuncCall = ({type}) => type === 'func_call';
+
 export const convertOperand = (node) => {
     if (isCount(node))
         return convertCount(node);
     
+    if (isFuncCall(node)) {
+        const lower = node.name.name.toLowerCase();
+        const {items} = node.args.expr.args;
+        
+        return callExpression(identifier(lower), items.map(convertOperand));
+    }
+    
     if (node.type === 'member_expr')
         return memberExpression(identifier(node.object.name), identifier(node.property.name));
     

package/lib/parser/visitors/clause/select/fixture/select-abs-fix.js

@@ -0,0 +1,8 @@
+[
+    select(
+        ABS(),
+        from(
+            t,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-abs.sql

@@ -0,0 +1 @@
+SELECT ABS(x) FROM t

package/lib/parser/visitors/clause/select/fixture/select-avg-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        avg(
+            score,
+        ),
+        from(
+            results,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-avg.sql

@@ -0,0 +1 @@
+SELECT AVG(score) FROM results

package/lib/parser/visitors/clause/select/fixture/select-count-col-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        count(
+            id,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-count-col.sql

@@ -0,0 +1 @@
+SELECT COUNT(id) FROM users

package/lib/parser/visitors/clause/select/fixture/select-distinct-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        distinct(
+            name,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-distinct-multi-fix.js

@@ -0,0 +1,11 @@
+[
+    select(
+        distinct(
+            name,
+            age,
+        ),
+        from(
+            users,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-distinct-multi.sql

@@ -0,0 +1 @@
+SELECT DISTINCT name, age FROM users

package/lib/parser/visitors/clause/select/fixture/select-distinct.sql

@@ -0,0 +1 @@
+SELECT DISTINCT name FROM users

package/lib/parser/visitors/clause/select/fixture/select-min-max-fix.js

@@ -0,0 +1,13 @@
+[
+    select(
+        min(
+            price,
+        ),
+        max(
+            price,
+        ),
+        from(
+            products,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-min-max.sql

@@ -0,0 +1 @@
+SELECT MIN(price), MAX(price) FROM products

package/lib/parser/visitors/clause/select/fixture/select-sum-fix.js

@@ -0,0 +1,10 @@
+[
+    select(
+        sum(
+            amount,
+        ),
+        from(
+            orders,
+        ),
+    ),
+];

package/lib/parser/visitors/clause/select/fixture/select-sum.sql

@@ -0,0 +1 @@
+SELECT SUM(amount) FROM orders

package/lib/parser/visitors/clause/select/select.js

@@ -47,13 +47,31 @@ const convertColumn = (column) => {
     return identifier(column.name);
 };
 
+const AGGREGATE_NAMES = new Set([
+    'sum',
+    'avg',
+    'min',
+    'max',
+]);
+
 const convertFuncCall = (column) => {
     const {name} = column.name;
+    const lower = name.toLowerCase();
     
     if (name === 'last_insert_rowid')
         return callExpression(identifier('lastInsertRowid'), []);
     
-    return callExpression(identifier('lastval'), []);
+    if (name === 'lastval')
+        return callExpression(identifier('lastval'), []);
+    
+    if (AGGREGATE_NAMES.has(lower)) {
+        const {items} = column.args.expr.args;
+        const args = items.map(convertOperand);
+        
+        return callExpression(identifier(lower), args);
+    }
+    
+    return callExpression(identifier(name), []);
 };
 
 const convertColumns = (columns) => {
@@ -65,20 +83,31 @@ const convertColumns = (columns) => {
     return columns.items.map(convertColumn);
 };
 
+const isDistinct = (selectClause) => selectClause.modifiers.some(({type}) => type === 'select_distinct');
+
 export const convertSelect = ({clauses}) => {
     const selectClause = findClause(clauses, 'select_clause');
     const fromClause = findClause(clauses, 'from_clause');
     const whereClause = findClause(clauses, 'where_clause');
     const groupByClause = findClause(clauses, 'group_by_clause');
     const havingClause = findClause(clauses, 'having_clause');
+    const orderByClause = findClause(clauses, 'order_by_clause');
+    const limitClause = findClause(clauses, 'limit_clause');
+    
+    const cols = convertColumns(selectClause.columns);
+    const selectArgs = isDistinct(selectClause) ? [
+        callExpression(identifier('distinct'), cols),
+    ] : cols;
     
     const args = [
-        ...convertColumns(selectClause.columns),
+        ...selectArgs,
         fromClause && convertFrom({
             expr: fromClause.expr,
             whereClause,
             groupByClause,
             havingClause,
+            orderByClause,
+            limitClause,
         }),
     ].filter(Boolean);
     

package/lib/parser/visitors/clause/update/fixture/update-where-not-in-fix.js

@@ -0,0 +1,16 @@
+[
+    update(
+        t,
+        set(
+            x === 1,
+        ),
+        where(
+            notInList(
+                y,
+                1,
+                2,
+                3,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/update/fixture/update-where-not-in.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE y NOT IN (1, 2, 3)

package/lib/parser/visitors/clause/where/fixture/where-between-fix.js

@@ -0,0 +1,15 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where(
+                between(
+                    age,
+                    18,
+                    65,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-between.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE age BETWEEN 18 AND 65

package/lib/parser/visitors/clause/where/fixture/where-not-in-fix.js

@@ -0,0 +1,16 @@
+[
+    select(
+        '*',
+        from(
+            users,
+            where(
+                notInList(
+                    id,
+                    1,
+                    2,
+                    3,
+                ),
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/where/fixture/where-not-in.sql

@@ -0,0 +1 @@
+SELECT * FROM users WHERE id NOT IN (1, 2, 3)