happy-sql 2.0.7 → 2.1.0

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(x > 1 && y < 2))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x > 1 && y < 2,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(users, where(id === ':id'))),
+    select(
+        '*',
+        from(
+            users,
+            where(
+                id === ':id',
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(x >= 1))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x >= 1,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,16 @@
 [
-    select('*', from(t, where(inList(x, 1, 2, 3)))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                inList(
+                    x,
+                    1,
+                    2,
+                    3,
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,13 @@
 [
-    select('*', from(t, where(isNotNull(x)))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                isNotNull(
+                    x,
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,13 @@
 [
-    select('*', from(t, where(isNull(x)))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                isNull(
+                    x,
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,14 @@
 [
-    select('*', from(t, where(like(x, ':pattern')))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                like(
+                    x,
+                    ':pattern',
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -0,0 +1,11 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                a.b === 1,
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE a.b = 1

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(x !== ':y'))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x !== ':y',
+            ),
+        ),
+    ),
 ];

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

@@ -0,0 +1,11 @@
+[
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x === null,
+            ),
+        ),
+    ),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x = NULL

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(id === 42))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                id === 42,
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,11 @@
 [
-    select('*', from(t, where(x === ':x' || y === ':y'))),
+    select(
+        '*',
+        from(
+            t,
+            where(
+                x === ':x' || y === ':y',
+            ),
+        ),
+    ),
 ];

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

@@ -71,7 +71,7 @@ const convertBinary = (node) => {
     );
 };
 
-const convertCondition = (node) => {
+export const convertCondition = (node) => {
     if (node.operator?.name === 'AND')
         return convertAnd(node);
     

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

@@ -0,0 +1,19 @@
+[
+    withNamed(
+        recent = select(
+            id,
+            from(
+                users,
+                where(
+                    kind === 'const',
+                ),
+            ),
+        ),
+        select(
+            id,
+            from(
+                recent,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/with-named/fixture/with-named-select.sql

@@ -0,0 +1 @@
+WITH recent AS (SELECT id FROM users WHERE kind = 'const') SELECT id FROM recent

package/lib/parser/visitors/clause/with-named/fixture/with-recursive-fix.js

@@ -0,0 +1,27 @@
+[
+    withRecursive(
+        numbers(
+            'value',
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    value + 1,
+                    from(
+                        numbers,
+                        where(
+                            value < 10,
+                        ),
+                    ),
+                ),
+            ),
+        ),
+        select(
+            value,
+            from(
+                numbers,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/with-named/fixture/with-recursive-multi-fix.js

@@ -0,0 +1,38 @@
+[
+    withRecursive(
+        t(
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    2,
+                ),
+            ),
+        ),
+        u(
+            'a',
+            'b',
+            unionAll(
+                select(
+                    1,
+                    2,
+                ),
+                select(
+                    a,
+                    b,
+                    from(
+                        t,
+                    ),
+                ),
+            ),
+        ),
+        select(
+            a,
+            b,
+            from(
+                u,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/with-named/fixture/with-recursive-multi.sql

@@ -0,0 +1 @@
+WITH RECURSIVE t AS (SELECT 1 UNION ALL SELECT 2), u(a, b) AS (SELECT 1, 2 UNION ALL SELECT a, b FROM t) SELECT a, b FROM u

package/lib/parser/visitors/clause/with-named/fixture/with-recursive-no-columns-fix.js

@@ -0,0 +1,20 @@
+[
+    withRecursive(
+        t(
+            unionAll(
+                select(
+                    1,
+                ),
+                select(
+                    2,
+                ),
+            ),
+        ),
+        select(
+            '*',
+            from(
+                t,
+            ),
+        ),
+    ),
+];

package/lib/parser/visitors/clause/with-named/fixture/with-recursive-no-columns.sql

@@ -0,0 +1 @@
+WITH RECURSIVE t AS (SELECT 1 UNION ALL SELECT 2) SELECT * FROM t

package/lib/parser/visitors/clause/with-named/fixture/with-recursive.sql

@@ -0,0 +1 @@
+WITH RECURSIVE numbers(value) AS (SELECT 1 UNION ALL SELECT value + 1 FROM numbers WHERE value < 10) SELECT value FROM numbers

package/lib/parser/visitors/clause/with-named/with-named.js

@@ -6,6 +6,7 @@ const {
     identifier,
     assignmentExpression,
     callExpression,
+    stringLiteral,
 } = types;
 
 const isWithClause = (clause) => clause.type !== 'with_clause';
@@ -14,18 +15,30 @@ const convertTable = ({table, expr}) => {
     return assignmentExpression('=', identifier(table.name), convertClause(expr.expr));
 };
 
+// recursive CTE: numbers('value', unionAll(...))
+const convertRecursiveTable = ({table, columns, expr}) => {
+    const colArgs = columns ? columns.expr.items.map((column) => stringLiteral(column.name)) : [];
+    const body = convertClause(expr.expr);
+    
+    return callExpression(identifier(table.name), [...colArgs, body]);
+};
+
 export const convertWithNamed = (stmt) => {
     const withClause = findClause(stmt.clauses, 'with_clause');
+    const isRecursive = Boolean(withClause.recursiveKw);
+    const fnName = isRecursive ? 'withRecursive' : 'withNamed';
     
     const finalStatement = convertClause({
         ...stmt,
         clauses: stmt.clauses.filter(isWithClause),
     });
     
+    const convertCte = isRecursive ? convertRecursiveTable : convertTable;
+    
     const args = [
-        ...withClause.tables.items.map(convertTable),
+        ...withClause.tables.items.map(convertCte),
         finalStatement,
     ];
     
-    return callExpression(identifier('withNamed'), args);
+    return callExpression(identifier(fnName), args);
 };

package/lib/printer/visitors/array-expression.js

@@ -5,7 +5,9 @@ export const ArrayExpression = (path, {write, traverse}) => {
     for (const [i, el] of elements.entries()) {
         traverse(el);
         
-        if (i < n)
-            write('\n\n');
+        if (i < n) {
+            write.newline();
+            write.newline();
+        }
     }
 };

package/lib/printer/visitors/call-expression/clauses/clauses.js

@@ -14,6 +14,10 @@ import {section} from './section/section.js';
 import {count} from './count/count.js';
 import {returning} from './returning/returning.js';
 import {withNamed} from './with-named/with-named.js';
+import {withRecursive} from './with-recursive/with-recursive.js';
+import {unionAll} from './union-all/union-all.js';
+import {groupBy} from './group-by/group-by.js';
+import {having} from './having/having.js';
 import {createTable} from './create-table/create-table.js';
 import {createSequence} from './create-sequence/create-sequence.js';
 import {column} from './column/column.js';
@@ -48,6 +52,10 @@ export const clauses = {
     section,
     returning,
     withNamed,
+    withRecursive,
+    unionAll,
+    groupBy,
+    having,
     createTable,
     createSequence,
     column,

package/lib/printer/visitors/call-expression/clauses/column/column.js

@@ -3,7 +3,7 @@ export const column = (path, {write, traverse}) => {
     
     for (const [i, arg] of args.entries()) {
         if (i > 0)
-            write(' ');
+            write.space();
         
         traverse(arg);
     }

package/lib/printer/visitors/call-expression/clauses/create-table/create-table.js

@@ -3,13 +3,17 @@ export const createTable = (path, {write, traverse}) => {
     
     write('CREATE TABLE ');
     traverse(name);
-    write(' (\n');
+    write.space();
+    write('(');
+    write.newline();
     
     const elements = columns.get('elements');
     
     for (const [i, element] of elements.entries()) {
-        if (i > 0)
-            write(',\n');
+        if (i > 0) {
+            write(',');
+            write.newline();
+        }
         
         traverse(element);
     }

package/lib/printer/visitors/call-expression/clauses/delete/delete.js

@@ -7,7 +7,7 @@ export const deleteFrom = (path, {write, traverse}) => {
     traverse(fromArg);
     
     if (whereArg) {
-        write('\n');
+        write.newline();
         traverse(whereArg);
     }
 };

package/lib/printer/visitors/call-expression/clauses/from/fixture/group-by-having-fix.sql

@@ -0,0 +1,5 @@
+SELECT kind, COUNT(*)
+FROM VariableDeclaration
+WHERE kind = 'const'
+GROUP BY kind
+HAVING COUNT(*) > 1

package/lib/printer/visitors/call-expression/clauses/from/fixture/group-by-having.js

@@ -0,0 +1,22 @@
+[
+    select(
+        kind,
+        count(
+            '*',
+        ),
+        from(
+            VariableDeclaration,
+            where(
+                kind === 'const',
+            ),
+            groupBy(
+                kind,
+            ),
+            having(
+                count(
+                    '*',
+                ) > 1,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/from/from.js

@@ -7,6 +7,14 @@ const printAsExpression = (path, {write, traverse}) => {
     write(` AS ${path.node.typeAnnotation.literal.value}`);
 };
 
+const CLAUSE_NAMES = [
+    'where',
+    'groupBy',
+    'having',
+];
+
+const isClause = ({node}) => node.type === 'CallExpression' && CLAUSE_NAMES.includes(node.callee?.name);
+
 const printArg = (path, ctx) => {
     if (isTSAsExpression(path.node))
         return printAsExpression(path, ctx);
@@ -16,9 +24,8 @@ const printArg = (path, ctx) => {
 
 export const from = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    const lastArg = args.at(-1);
-    const hasWhere = lastArg?.node?.callee?.name === 'where';
-    const tableArgs = hasWhere ? args.slice(0, -1) : args;
+    const tableArgs = args.filter((arg) => !isClause(arg));
+    const clauseArgs = args.filter(isClause);
     
     write('FROM ');
     printArg(tableArgs[0], {
@@ -32,8 +39,8 @@ export const from = (path, {write, traverse}) => {
             traverse,
         });
     
-    if (hasWhere) {
-        write('\n');
-        traverse(lastArg);
+    for (const clause of clauseArgs) {
+        write.breakline();
+        traverse(clause);
     }
 };

package/lib/printer/visitors/call-expression/clauses/group-by/fixture/group-by-fix.sql

@@ -0,0 +1,3 @@
+SELECT kind, COUNT(*)
+FROM VariableDeclaration
+GROUP BY kind

package/lib/printer/visitors/call-expression/clauses/group-by/fixture/group-by-multi-fix.sql

@@ -0,0 +1,3 @@
+SELECT kind, name
+FROM VariableDeclaration
+GROUP BY kind, name

package/lib/printer/visitors/call-expression/clauses/group-by/fixture/group-by-multi.js

@@ -0,0 +1,13 @@
+[
+    select(
+        kind,
+        name,
+        from(
+            VariableDeclaration,
+            groupBy(
+                kind,
+                name,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/group-by/fixture/group-by.js

@@ -0,0 +1,14 @@
+[
+    select(
+        kind,
+        count(
+            '*',
+        ),
+        from(
+            VariableDeclaration,
+            groupBy(
+                kind,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/group-by/group-by.js

@@ -0,0 +1,12 @@
+export const groupBy = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('GROUP BY ');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+};

package/lib/printer/visitors/call-expression/clauses/having/fixture/having-fix.sql

@@ -0,0 +1,3 @@
+SELECT kind, COUNT(*)
+FROM VariableDeclaration
+HAVING COUNT(*) > 1

package/lib/printer/visitors/call-expression/clauses/having/fixture/having.js

@@ -0,0 +1,16 @@
+[
+    select(
+        kind,
+        count(
+            '*',
+        ),
+        from(
+            VariableDeclaration,
+            having(
+                count(
+                    '*',
+                ) > 1,
+            ),
+        ),
+    ),
+];

package/lib/printer/visitors/call-expression/clauses/having/having.js

@@ -0,0 +1,4 @@
+export const having = (path, {write, traverse}) => {
+    write('HAVING ');
+    traverse(path.get('arguments')[0]);
+};

package/lib/printer/visitors/call-expression/clauses/insert/insert.js

@@ -6,7 +6,7 @@ export const insert = (path, {write, traverse}) => {
     traverse(intoArg);
     
     for (const arg of rest) {
-        write('\n');
+        write.breakline();
         traverse(arg);
     }
 };

package/lib/printer/visitors/call-expression/clauses/into/into.js

@@ -24,7 +24,7 @@ export const into = (path, {write, traverse}) => {
     write(')');
     
     if (values) {
-        write(' ');
+        write.space();
         traverse(values);
     }
 };

package/lib/printer/visitors/call-expression/clauses/join/join.js

@@ -17,11 +17,12 @@ const printTable = (path, ctx) => {
 export const join = (path, {write, traverse}) => {
     const [table, onClause] = path.get('arguments');
     
-    write('\nJOIN ');
+    write.breakline();
+    write('JOIN ');
     printTable(table, {
         write,
         traverse,
     });
-    write(' ');
+    write.space();
     traverse(onClause);
 };

package/lib/printer/visitors/call-expression/clauses/select/select.js

@@ -34,7 +34,7 @@ export const select = (path, {write, traverse}) => {
     }
     
     if (fromArg) {
-        write('\n');
+        write.breakline();
         traverse(fromArg);
     }
 };

package/lib/printer/visitors/call-expression/clauses/union-all/fixture/union-all-fix.sql

@@ -0,0 +1,3 @@
+SELECT 1
+UNION ALL
+SELECT 2

package/lib/printer/visitors/call-expression/clauses/union-all/fixture/union-all.js

@@ -0,0 +1 @@
+[unionAll(select(1), select(2))];

package/lib/printer/visitors/call-expression/clauses/union-all/union-all.js

@@ -0,0 +1,9 @@
+export const unionAll = (path, {write, traverse}) => {
+    const [left, right] = path.get('arguments');
+    
+    traverse(left);
+    write.breakline();
+    write('UNION ALL');
+    write.breakline();
+    traverse(right);
+};

package/lib/printer/visitors/call-expression/clauses/update/update.js

@@ -6,11 +6,11 @@ export const update = (path, {write, traverse}) => {
     
     write('UPDATE ');
     traverse(table);
-    write('\n');
+    write.newline();
     traverse(set);
     
     if (where) {
-        write('\n');
+        write.newline();
         traverse(where);
     }
 };