happy-sql 1.0.0 → 1.1.0

package/ChangeLog

@@ -0,0 +1,9 @@
+2026.07.27, v1.1.0
+
+feature:
+- f6446c3 happy-sql: COUNT
+
+2026.07.27, v1.0.1
+
+feature:
+- b609029 happy-sql: keywords

package/README.md

@@ -7,6 +7,8 @@
 [LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat
 [LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
 
+<img width="600" height="428" alt="image" src="https://github.com/user-attachments/assets/aefbd055-957e-4de3-aca5-c30e5e3ee3f9" />
+
 SQL to JS AST parser and printer.
 
 ## Install
@@ -15,6 +17,17 @@ SQL to JS AST parser and printer.
 npm i happy-sql --save
 ```
 
+## API
+
+```js
+const source = `select(count('*'), from(users))`;
+
+convertJsToSql(source);
+// returns
+'SELECT COUNT(*)\nFROM users\n');
+
+```
+
 ## License
 
 MIT

package/lib/parser/parser.js

@@ -3,20 +3,52 @@ import {types} from '@putout/babel';
 import {convertClause} from '#parser/clause';
 
 const {
+    identifier,
+    stringLiteral,
+    callExpression,
     arrayExpression,
     expressionStatement,
     file,
     program,
 } = types;
 
+const getSectionName = (leading) => {
+    const comment = leading?.find((c) => c.text.startsWith('-- @'));
+    
+    return comment ? comment.text
+        .slice(2)
+        .trim() : null;
+};
+
+const wrapSection = (stmtNode, sectionName) => {
+    if (!sectionName)
+        return stmtNode;
+    
+    return callExpression(identifier('section'), [
+        stringLiteral(sectionName),
+        stmtNode,
+    ]);
+};
+
 export const parseSqlNode = (source) => {
     const cst = parse(source, {
         dialect: 'sqlite',
         paramTypes: [':name'],
         includeRange: true,
+        includeComments: true,
     });
     
-    const elements = cst.statements.map(convertClause);
+    const elements = [];
+    
+    for (const [i, statement] of cst.statements.entries()) {
+        if (statement.type === 'empty')
+            continue;
+        
+        const stmtNode = convertClause(statement);
+        const leading = i ? statement.leading : cst.leading;
+        
+        elements.push(wrapSection(stmtNode, getSectionName(leading)));
+    }
     
     return file(program([
         expressionStatement(arrayExpression(elements)),

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

@@ -0,0 +1,23 @@
+import {types} from '@putout/babel';
+
+const {
+    stringLiteral,
+    callExpression,
+    identifier,
+} = types;
+
+export const isCount = (column) => {
+    return column.type === 'func_call' && /count/i.test(column.name.name);
+};
+
+export const convertCount = (column) => {
+    const {items} = column.args.expr.args;
+    const args = [];
+    
+    for (const item of items) {
+        if (item.type === 'all_columns')
+            args.push(stringLiteral('*'));
+    }
+    
+    return callExpression(identifier('count'), args);
+};

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

@@ -0,0 +1,3 @@
+[
+    select(count('*'), from(users)),
+];

package/lib/parser/visitors/clause/count/fixture/count.sql

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

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

@@ -1,11 +1,12 @@
 import {types} from '@putout/babel';
 import {convertWhere} from '#parser/clause/where';
+import {findClause} from '#parser/clause/find';
 
 const {identifier, callExpression} = types;
 
 export const convertDelete = ({clauses}) => {
-    const deleteClause = clauses.find((c) => c.type === 'delete_clause');
-    const whereClause = clauses.find((c) => c.type === 'where_clause');
+    const deleteClause = findClause(clauses, 'delete_clause');
+    const whereClause = findClause(clauses, 'where_clause');
     
     const table = identifier(deleteClause.tables.items[0].name);
     

package/lib/parser/visitors/clause/find-clause.js

@@ -0,0 +1,3 @@
+const equalType = (a) => ({type}) => type === a;
+
+export const findClause = (clauses, type) => clauses.find(equalType(type));

package/lib/parser/visitors/clause/insert/fixture/insert-identifier-fix.js

@@ -0,0 +1,3 @@
+[
+    insert(into(t, x, values(':x')), onConflict(x, set(y === x))),
+];

package/lib/parser/visitors/clause/insert/fixture/insert-identifier.sql

@@ -0,0 +1 @@
+INSERT INTO t (x) VALUES (:x) ON CONFLICT (x) DO UPDATE SET y = x

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

@@ -1,41 +1,22 @@
 import {types} from '@putout/babel';
+import {convertSet} from '#parser/clause/set';
+import {findClause} from '#parser/clause/find';
 
 const {
     identifier,
-    stringLiteral,
-    binaryExpression,
-    arrayExpression,
     callExpression,
+    arrayExpression,
+    stringLiteral,
 } = types;
 
-const convertOperand = (node) => {
-    if (node.type === 'parameter')
-        return stringLiteral(node.text);
-    
-    if (node.type === 'number_literal')
-        return types.numericLiteral(node.value);
-    
-    if (node.type === 'string_literal')
-        return stringLiteral(node.value);
-    
-    return identifier(node.name);
-};
-
-const convertSet = (setClause) => {
-    const args = [];
-    
-    for (const a of setClause.assignments.items) {
-        args.push(binaryExpression('===', identifier(a.column.name), convertOperand(a.expr)));
-    }
-    
-    return callExpression(identifier('set'), args);
-};
+const convertExprToIdentifier = ({expr}) => identifier(expr.name);
+const convertColToIdentifier = ({name}) => identifier(name);
 
 const convertUpsert = (upsertClause) => {
     const target = upsertClause.conflictTarget;
     const {action} = upsertClause;
     
-    const targetArgs = target ? target.expr.items.map((i) => identifier(i.expr.name)) : [];
+    const targetArgs = target ? target.expr.items.map(convertExprToIdentifier) : [];
     const actionNode = action.type === 'upsert_action_nothing' ? identifier('nothing') : convertSet(action.set);
     
     return callExpression(identifier('onConflict'), [...targetArgs, actionNode]);
@@ -44,13 +25,11 @@ const convertUpsert = (upsertClause) => {
 export const convertInsert = ({clauses}) => {
     const [ic] = clauses;
     const [, vc] = clauses;
-    const uc = clauses.find((c) => c.type === 'upsert_clause');
+    const uc = findClause(clauses, 'upsert_clause');
     
     const cols = ic.columns.expr.items;
     const vals = vc.values.items[0].expr.items;
-    
-    const colArg = cols.length === 1 ? identifier(cols[0].name) : arrayExpression(cols.map((c) => identifier(c.name)));
-    
+    const colArg = cols.length === 1 ? identifier(cols[0].name) : arrayExpression(cols.map(convertColToIdentifier));
     const valArgs = [];
     
     for (const p of vals) {

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

@@ -0,0 +1,20 @@
+import {types} from '@putout/babel';
+
+const {
+    identifier,
+    stringLiteral,
+    numericLiteral,
+} = types;
+
+export const convertOperand = (node) => {
+    if (node.type === 'parameter')
+        return stringLiteral(node.text);
+    
+    if (node.type === 'number_literal')
+        return numericLiteral(node.value);
+    
+    if (node.type === 'string_literal')
+        return stringLiteral(node.value);
+    
+    return identifier(node.name);
+};

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

@@ -0,0 +1,3 @@
+[
+    select(file = ':file', from(t)),
+];

package/lib/parser/visitors/clause/select/fixture/select-alias-param.sql

@@ -0,0 +1 @@
+SELECT :file AS file FROM t

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

@@ -1,6 +1,9 @@
 import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
 import {convertFrom} from '#parser/clause/from';
 import {convertWhere} from '#parser/clause/where';
+import {findClause} from '#parser/clause/find';
+import {convertCount, isCount} from '#parser/clause/count';
 
 const {
     identifier,
@@ -9,26 +12,14 @@ const {
     callExpression,
 } = types;
 
-const findClause = (clauses, type) => clauses.find((c) => c.type === type);
-
-const convertOperand = (node) => {
-    if (node.type === 'parameter')
-        return stringLiteral(node.text);
-    
-    if (node.type === 'number_literal')
-        return types.numericLiteral(node.value);
-    
-    if (node.type === 'string_literal')
-        return stringLiteral(node.value);
+const convertColumn = (column) => {
+    if (isCount(column))
+        return convertCount(column);
     
-    return identifier(node.name);
-};
-
-const convertColumn = (col) => {
-    if (col.type === 'alias')
-        return assignmentExpression('=', identifier(col.alias.name), convertOperand(col.expr));
+    if (column.type === 'alias')
+        return assignmentExpression('=', identifier(column.alias.name), convertOperand(column.expr));
     
-    return identifier(col.name);
+    return identifier(column.name);
 };
 
 const convertColumns = (columns) => {

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

@@ -0,0 +1,18 @@
+import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
+
+const {
+    callExpression,
+    identifier,
+    binaryExpression,
+} = types;
+
+export const convertSet = (setClause) => {
+    const args = [];
+    
+    for (const a of setClause.assignments.items) {
+        args.push(binaryExpression('===', identifier(a.column.name), convertOperand(a.expr)));
+    }
+    
+    return callExpression(identifier('set'), args);
+};

package/lib/parser/visitors/clause/update/fixture/update-identifier-fix.js

@@ -0,0 +1,3 @@
+[
+    update(t, set(x === y), where(id === ':id')),
+];

package/lib/parser/visitors/clause/update/fixture/update-identifier.sql

@@ -0,0 +1 @@
+UPDATE t SET x = y WHERE id = :id

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

@@ -0,0 +1,3 @@
+[
+    update(t, set(x === 1), where(id === ':id')),
+];

package/lib/parser/visitors/clause/update/fixture/update-number.sql

@@ -0,0 +1 @@
+UPDATE t SET x = 1 WHERE id = :id

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

@@ -1,30 +1,18 @@
 import {types} from '@putout/babel';
 import {convertWhere} from '#parser/clause/where';
+import {convertOperand} from '#parser/clause/operand';
+import {findClause} from '#parser/clause/find';
 
 const {
     identifier,
-    stringLiteral,
     binaryExpression,
     callExpression,
 } = types;
 
-const convertOperand = (node) => {
-    if (node.type === 'parameter')
-        return stringLiteral(node.text);
-    
-    if (node.type === 'number_literal')
-        return types.numericLiteral(node.value);
-    
-    if (node.type === 'string_literal')
-        return stringLiteral(node.value);
-    
-    return identifier(node.name);
-};
-
 export const convertUpdate = ({clauses}) => {
-    const updateClause = clauses.find((c) => c.type === 'update_clause');
-    const setClause = clauses.find((c) => c.type === 'set_clause');
-    const whereClause = clauses.find((c) => c.type === 'where_clause');
+    const updateClause = findClause(clauses, 'update_clause');
+    const setClause = findClause(clauses, 'set_clause');
+    const whereClause = findClause(clauses, 'where_clause');
     
     const table = identifier(updateClause.tables.items[0].name);
     const setArgs = [];

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

@@ -2,9 +2,10 @@ import {clauses} from './clauses/clauses.js';
 
 export const CallExpression = (path, printer) => {
     const {name} = path.node.callee;
+    const visit = clauses[name];
     
-    if (!clauses[name])
+    if (!visit)
         throw Error(`${name} not supported yet`);
     
-    clauses[name](path, printer);
+    visit(path, printer);
 };

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

@@ -8,10 +8,13 @@ import {onConflict} from './on-conflict/on-conflict.js';
 import {update} from './update/update.js';
 import {set} from './set/set.js';
 import {del} from './delete/delete.js';
+import {section} from './section/section.js';
+import {count} from './count/count.js';
 
 export const clauses = {
-    select,
+    count,
     from,
+    select,
     where,
     insert,
     into,
@@ -20,4 +23,5 @@ export const clauses = {
     update,
     set,
     delete: del,
+    section,
 };

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

@@ -0,0 +1,7 @@
+export const count = (path, {write, traverse}) => {
+    const [first] = path.get('arguments');
+    write('COUNT');
+    write('(');
+    traverse(first);
+    write(')');
+};

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

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

package/lib/printer/visitors/call-expression/clauses/on-conflict/fixture/on-conflict-multi.sql

@@ -0,0 +1 @@
+INSERT INTO t (x) VALUES (:x) ON CONFLICT (x, y) DO UPDATE SET x = :x

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

@@ -0,0 +1,3 @@
+-- @select
+SELECT *
+FROM users

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

@@ -0,0 +1,5 @@
+export const section = (path, {write, traverse}) => {
+    const [name, stmt] = path.get('arguments');
+    write(`-- ${name.node.value}\n`);
+    traverse(stmt);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -12,9 +12,13 @@
   "imports": {
     "#happy-sql": "./lib/happy-sql.js",
     "#parser": "./lib/parser/parser.js",
+    "#parser/clause/operand": "./lib/parser/visitors/clause/operand.js",
+    "#parser/clause/set": "./lib/parser/visitors/clause/set.js",
+    "#parser/clause/find": "./lib/parser/visitors/clause/find-clause.js",
     "#parser/test": "./test/create-parser-test.js",
     "#parser/clause": "./lib/parser/visitors/clause/index.js",
     "#parser/clause/select": "./lib/parser/visitors/clause/select/select.js",
+    "#parser/clause/count": "./lib/parser/visitors/clause/count/count.js",
     "#parser/clause/from": "./lib/parser/visitors/clause/from/from.js",
     "#parser/clause/where": "./lib/parser/visitors/clause/where/where.js",
     "#parser/clause/insert": "./lib/parser/visitors/clause/insert/insert.js",
@@ -42,9 +46,10 @@
     "url": "git+https://github.com/coderaiser/happy-sql.git"
   },
   "keywords": [
-    "store",
-    "variable",
-    "functional"
+    "sql",
+    "js",
+    "print",
+    "parse"
   ],
   "author": "coderaiser <mnemonic.enemy@gmail.com> (http://coderaiser.github.io/)",
   "license": "MIT",
@@ -75,6 +80,7 @@
     "@putout/babel": "^5.7.3",
     "@putout/operator-json": "^3.4.0",
     "@putout/printer": "^18.17.0",
+    "just-camel-case": "^6.2.0",
     "redstd": "^1.0.2",
     "sql-parser-cst": "^0.42.1"
   }