happy-sql 2.1.0 → 2.1.1

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

@@ -34,6 +34,12 @@ const SQL_TO_JS_OP = {
 const convertAnd = (node) => logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
 const convertOr = (node) => logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
 
+export const convertBetween = (node) => callExpression(identifier('between'), [
+    convertOperand(node.left),
+    convertOperand(node.begin),
+    convertOperand(node.end),
+]);
+
 const convertBinary = (node) => {
     const op = opName(node.operator);
     
@@ -62,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(
@@ -78,6 +93,9 @@ export const convertCondition = (node) => {
     if (node.operator?.name === 'OR')
         return convertOr(node);
     
+    if (node.type === 'between_expr')
+        return convertBetween(node);
+    
     return convertBinary(node);
 };
 

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+export const between = (path, {write, traverse}) => {
+    const [col, lo, hi] = path.get('arguments');
+    
+    traverse(col);
+    write(' BETWEEN ');
+    traverse(lo);
+    write(' AND ');
+    traverse(hi);
+};

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

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

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

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

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

@@ -18,6 +18,16 @@ 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 {sum} from './sum/sum.js';
+import {avg} from './avg/avg.js';
+import {min} from './min/min.js';
+import {max} from './max/max.js';
+import {orderBy} from './order-by/order-by.js';
+import {desc} from './desc/desc.js';
+import {limit} from './limit/limit.js';
+import {distinct} from './distinct/distinct.js';
+import {notInList} from './not-in-list/not-in-list.js';
+import {between} from './between/between.js';
 import {createTable} from './create-table/create-table.js';
 import {createSequence} from './create-sequence/create-sequence.js';
 import {column} from './column/column.js';
@@ -56,6 +66,16 @@ export const clauses = {
     unionAll,
     groupBy,
     having,
+    sum,
+    avg,
+    min,
+    max,
+    orderBy,
+    desc,
+    limit,
+    distinct,
+    notInList,
+    between,
     createTable,
     createSequence,
     column,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/printer/visitors/call-expression/clauses/from/fixture/generate-series-fix.sql

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

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

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

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

@@ -1,6 +1,9 @@
 import {types} from '@putout/babel';
 
-const {isTSAsExpression} = types;
+const {
+    isTSAsExpression,
+    isCallExpression,
+} = types;
 
 const printAsExpression = (path, {write, traverse}) => {
     traverse(path.get('expression'));
@@ -11,15 +14,51 @@ const CLAUSE_NAMES = [
     'where',
     'groupBy',
     'having',
+    'orderBy',
+    'limit',
+];
+
+const TABLE_ARG_NAMES = [
+    ...CLAUSE_NAMES,
+    'join',
+    'on',
 ];
 
 const isClause = ({node}) => node.type === 'CallExpression' && CLAUSE_NAMES.includes(node.callee?.name);
 
-const printArg = (path, ctx) => {
-    if (isTSAsExpression(path.node))
-        return printAsExpression(path, ctx);
+const CAMEL_RE = /([A-Z])/g;
+const toSnake = (a) => a.replace(CAMEL_RE, (_, c) => `_${c.toLowerCase()}`);
+
+const isTableFunc = (node) => isCallExpression(node) && !TABLE_ARG_NAMES.includes(node.callee.name);
+
+const printTableFunc = (path, {write, traverse}) => {
+    const {name} = path.node.callee;
+    const args = path.get('arguments');
+    
+    write(toSnake(name));
+    write('(');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+    
+    write(')');
+};
+
+const printArg = (path, printer) => {
+    const {node} = path;
+    const {traverse} = printer;
     
-    ctx.traverse(path);
+    if (isTSAsExpression(node))
+        return printAsExpression(path, printer);
+    
+    if (isTableFunc(node))
+        return printTableFunc(path, printer);
+    
+    traverse(path);
 };
 
 export const from = (path, {write, traverse}) => {
@@ -44,3 +83,4 @@ export const from = (path, {write, traverse}) => {
         traverse(clause);
     }
 };
+

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/join/join.js

@@ -7,11 +7,13 @@ 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}) => {

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,10 +30,7 @@ export const select = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        printItem(cols[i], {
-            write,
-            traverse,
-        });
+        printItem(cols[i], printer);
     }
     
     if (fromArg) {
@@ -38,3 +38,4 @@ export const select = (path, {write, traverse}) => {
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {