happy-sql 2.0.8 → 2.1.1

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-sum-fix.sql

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

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

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

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.newline();
+        write.breakline();
         traverse(arg);
     }
 };

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

@@ -7,17 +7,19 @@ const printAsExpression = (path, {write, traverse}) => {
     write(` AS ${path.node.typeAnnotation.literal.value}`);
 };
 
-const printTable = (path, ctx) => {
+const printTable = (path, printer) => {
+    const {traverse} = printer;
+    
     if (isTSAsExpression(path.node))
-        return printAsExpression(path, ctx);
+        return printAsExpression(path, printer);
     
-    ctx.traverse(path);
+    traverse(path);
 };
 
 export const join = (path, {write, traverse}) => {
     const [table, onClause] = path.get('arguments');
     
-    write.newline();
+    write.breakline();
     write('JOIN ');
     printTable(table, {
         write,

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+export const limit = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    write('LIMIT ');
+    traverse(args[0]);
+    
+    if (args.length > 1) {
+        write.breakline();
+        write('OFFSET ');
+        traverse(args[1]);
+    }
+};

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

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

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

@@ -0,0 +1 @@
+select(max(price), from(products));

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

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

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

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

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

@@ -0,0 +1 @@
+select(min(price), from(products));

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

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

package/lib/printer/visitors/call-expression/clauses/not-in-list/fixture/not-in-list-fix.sql

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

package/lib/printer/visitors/call-expression/clauses/not-in-list/fixture/not-in-list.js

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

package/lib/printer/visitors/call-expression/clauses/not-in-list/not-in-list.js

@@ -0,0 +1,15 @@
+export const notInList = (path, {write, traverse}) => {
+    const [head, ...items] = path.get('arguments');
+    
+    traverse(head);
+    write(' NOT IN (');
+    
+    for (let i = 0; i < items.length; i++) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(items[i]);
+    }
+    
+    write(')');
+};

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

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

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

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

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

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

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

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

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

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

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

@@ -7,11 +7,13 @@ const printAsExpression = (path, {write, traverse}) => {
     write(` AS ${path.node.typeAnnotation.literal.value}`);
 };
 
-const printItem = (path, ctx) => {
+const printItem = (path, printer) => {
+    const {traverse} = printer;
+    
     if (isTSAsExpression(path.node))
-        return printAsExpression(path, ctx);
+        return printAsExpression(path, printer);
     
-    ctx.traverse(path);
+    traverse(path);
 };
 
 export const returning = (path, {write, traverse}) => {

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

@@ -7,14 +7,17 @@ const printAsExpression = (path, {write, traverse}) => {
     write(` AS ${path.node.typeAnnotation.literal.value}`);
 };
 
-const printItem = (path, ctx) => {
+const printItem = (path, printer) => {
+    const {traverse} = printer;
+    
     if (isTSAsExpression(path.node))
-        return printAsExpression(path, ctx);
+        return printAsExpression(path, printer);
     
-    ctx.traverse(path);
+    traverse(path);
 };
 
-export const select = (path, {write, traverse}) => {
+export const select = (path, printer) => {
+    const {write, traverse} = printer;
     const args = path.get('arguments');
     const lastArg = args.at(-1);
     const hasFrom = lastArg?.node?.callee?.name === 'from';
@@ -27,14 +30,12 @@ export const select = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        printItem(cols[i], {
-            write,
-            traverse,
-        });
+        printItem(cols[i], printer);
     }
     
     if (fromArg) {
-        write.newline();
+        write.breakline();
         traverse(fromArg);
     }
 };
+

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

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

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

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

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

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

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/with-named/fixture/with-named-insert-fix.sql

@@ -1,12 +1,12 @@
 WITH
     call AS (
         INSERT INTO CallExpression (file, parent_id) VALUES (:file, :parent_id)
-RETURNING id
+        RETURNING id
     ),
     member AS (
         INSERT INTO MemberExpression (file, parent_id) SELECT :file, id
-FROM call
-RETURNING id
+        FROM call
+        RETURNING id
     )
 INSERT INTO Identifier (file, name, parent_id) SELECT :file, 'isNaN', id
 FROM member

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/with-named-select-fix.sql

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

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

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

package/lib/printer/visitors/call-expression/clauses/with-named/fixture/withNamed-fix.sql

@@ -1,12 +1,12 @@
 WITH
     call AS (
         INSERT INTO CallExpression (parent_id) VALUES (:parent_id)
-RETURNING id
+        RETURNING id
     ),
     member AS (
         INSERT INTO MemberExpression (parent_id) SELECT id
-FROM call
-RETURNING id
+        FROM call
+        RETURNING id
     )
 INSERT INTO Identifier (name, parent_id) SELECT 'x', id
 FROM member

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

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

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-multi-fix.sql

@@ -0,0 +1,14 @@
+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/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-multi.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/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-no-columns-fix.sql

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

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive-no-columns.js

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

package/lib/printer/visitors/call-expression/clauses/with-recursive/fixture/with-recursive.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/printer/visitors/call-expression/clauses/with-recursive/with-recursive.js

@@ -0,0 +1,57 @@
+const isStringLiteral = ({type}) => type === 'StringLiteral';
+
+export const withRecursive = (path, {write, indent, traverse}) => {
+    const args = path.get('arguments');
+    const ctes = args.slice(0, -1);
+    const finalStatement = args.at(-1);
+    
+    write('WITH RECURSIVE');
+    write.newline();
+    
+    const last = ctes.length - 1;
+    
+    for (const [i, cte] of ctes.entries()) {
+        const {name} = cte.node.callee;
+        const cteArgs = cte.get('arguments');
+        const colArgs = cteArgs.filter(isStringLiteral);
+        
+        indent.inc();
+        write.indent();
+        indent.dec();
+        write(name);
+        
+        if (colArgs.length) {
+            write('(');
+            
+            for (const [j, col] of colArgs.entries()) {
+                if (j > 0)
+                    write(', ');
+                
+                write(col.node.value);
+            }
+            
+            write(')');
+        }
+        
+        write(' AS (');
+        write.newline();
+        indent.inc();
+        indent.inc();
+        write.indent();
+        traverse(cteArgs.at(-1));
+        indent.dec();
+        indent.dec();
+        write.newline();
+        indent.inc();
+        write.indent();
+        indent.dec();
+        write(')');
+        
+        if (i < last)
+            write(',');
+        
+        write.newline();
+    }
+    
+    traverse(finalStatement);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "2.0.8",
+  "version": "2.1.1",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -25,6 +25,7 @@
     "#parser/clause/update": "./lib/parser/visitors/clause/update/update.js",
     "#parser/clause/delete": "./lib/parser/visitors/clause/delete/delete.js",
     "#parser/clause/with-named": "./lib/parser/visitors/clause/with-named/with-named.js",
+    "#parser/clause/union": "./lib/parser/visitors/clause/union/union.js",
     "#parser/clause/create-table": "./lib/parser/visitors/clause/create-table/create-table.js",
     "#parser/clause/create-sequence": "./lib/parser/visitors/clause/create-sequence/create-sequence.js",
     "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",