happy-sql 1.3.0 → 1.4.0

package/ChangeLog

@@ -1,3 +1,12 @@
+2026.08.14, v1.4.0
+
+feature:
+- 1f764d9 extend support of sqlite and postgres
+- 3a39fbf with: improve
+- c7d966c with: add
+- bf17b06 parser/printer: RETURNING clause
+- d779866 parser/printer: multi-statement sections
+
 2026.07.29, v1.3.0
 
 feature:

package/lib/parser/fixture/comment-fix.js

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

package/lib/parser/fixture/comment.sql

@@ -0,0 +1,2 @@
+-- hello world
+SELECT * FROM users;

package/lib/parser/fixture/section-multi-fix.js

@@ -0,0 +1,6 @@
+[
+    section('@fix', [
+        update(Identifier, set(name === 'isNaN'), where(id === ':nan_id')),
+        update(BinaryExpression, set(operator === '==='), where(id === ':id')),
+    ]),
+];

package/lib/parser/fixture/section-multi.sql

@@ -0,0 +1,3 @@
+-- @fix
+UPDATE Identifier SET name = 'isNaN' WHERE id = :nan_id;
+UPDATE BinaryExpression SET operator = '===' WHERE id = :id;

package/lib/parser/fixture/with-named-fix.js

@@ -0,0 +1,11 @@
+[
+    withNamed(call = insert(into(
+        CallExpression,
+        parent_id,
+        values(':parent_id'),
+    ), returning(id)), member = insert(into(
+        MemberExpression,
+        parent_id,
+        select(id, from(call)),
+    ), returning(id)), insert(into(Identifier, [name, parent_id], select('x', id, from(member))))),
+];

package/lib/parser/fixture/with-named.sql

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

package/lib/parser/parser.js

@@ -1,4 +1,5 @@
-import {parse} from 'sql-parser-cst';
+import {tryCatch} from 'try-catch';
+import {parse as parseCst} from 'sql-parser-cst';
 import {types} from '@putout/babel';
 import {convertClause} from '#parser/clause';
 
@@ -12,42 +13,73 @@ const {
     program,
 } = types;
 
+const DIALECTS = [
+    'postgresql',
+    'sqlite',
+];
+
+const parseCstDialect = (source, dialect) => parseCst(source, {
+    dialect,
+    paramTypes: [':name'],
+    includeRange: true,
+    includeComments: true,
+});
+
+export const parseSqlNode = (source) => {
+    for (const dialect of DIALECTS) {
+        const [, cst] = tryCatch(parseCstDialect, source, dialect);
+        
+        if (cst)
+            return convertSource(cst);
+    }
+    
+    throw Error('Cannot parse SQL');
+};
+
 const getSectionName = (leading) => {
-    const comment = leading?.find((c) => c.text.startsWith('-- @'));
+    if (!leading)
+        return null;
+    
+    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 convertSource = (cst) => {
     const elements = [];
+    let currentSection = null;
+    const sectionGroups = new Map();
     
-    for (const [i, statement] of cst.statements.entries()) {
-        if (statement.type === 'empty')
+    for (const [i, stmt] of cst.statements.entries()) {
+        if (stmt.type === 'empty')
             continue;
         
-        const stmtNode = convertClause(statement);
-        const leading = i ? statement.leading : cst.leading;
+        const stmtNode = convertClause(stmt);
+        const leading = i ? stmt.leading : cst.leading;
+        const name = getSectionName(leading);
+        
+        if (name)
+            currentSection = name;
+        
+        if (currentSection) {
+            if (!sectionGroups.has(currentSection))
+                sectionGroups.set(currentSection, []);
+            
+            sectionGroups.get(currentSection).push(stmtNode);
+        } else {
+            elements.push(stmtNode);
+        }
+    }
+    
+    for (const [name, nodes] of sectionGroups) {
+        const inner = nodes.length === 1 ? nodes[0] : arrayExpression(nodes);
         
-        elements.push(wrapSection(stmtNode, getSectionName(leading)));
+        elements.push(callExpression(identifier('section'), [
+            stringLiteral(name),
+            inner,
+        ]));
     }
     
     return file(program([

package/lib/parser/visitors/clause/column-definition/column-definition.js

@@ -0,0 +1,41 @@
+import {types} from '@putout/babel';
+
+const {identifier, callExpression} = types;
+
+const getDataType = (dataType) => {
+    if (dataType.type === 'identifier')
+        return dataType;
+    
+    return dataType.name;
+};
+
+const isSerial = (dataType) => getDataType(dataType).name === 'SERIAL';
+
+const convertConstraint = (constraint) => {
+    if (constraint.type === 'constraint_primary_key')
+        return callExpression(identifier('primaryKey'), []);
+    
+    return callExpression(identifier('autoIncrement'), []);
+};
+
+export const convertColumnDefinition = (column) => {
+    const {
+        name,
+        dataType,
+        constraints,
+    } = column;
+    
+    const args = [
+        identifier(name.name),
+    ];
+    
+    if (isSerial(dataType))
+        args.push(callExpression(identifier('serial'), []));
+    else
+        args.push(identifier(getDataType(dataType).text));
+    
+    for (const constraint of constraints)
+        args.push(convertConstraint(constraint));
+    
+    return callExpression(identifier('column'), args);
+};

package/lib/parser/visitors/clause/create-table/create-table.js

@@ -0,0 +1,17 @@
+import {types} from '@putout/babel';
+import {convertColumnDefinition} from '#parser/clause/column-definition';
+
+const {
+    identifier,
+    callExpression,
+    arrayExpression,
+} = types;
+
+export const convertCreateTable = ({name, columns}) => {
+    const colNodes = columns.expr.items.map(convertColumnDefinition);
+    
+    return callExpression(identifier('createTable'), [
+        identifier(name.name),
+        arrayExpression(colNodes),
+    ]);
+};

package/lib/parser/visitors/clause/create-table/fixture/create-table-autoincrement-fix.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, INTEGER, primaryKey(), autoIncrement()),
+    ]),
+];

package/lib/parser/visitors/clause/create-table/fixture/create-table-autoincrement.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id INTEGER PRIMARY KEY AUTOINCREMENT)

package/lib/parser/visitors/clause/create-table/fixture/create-table-serial-fix.js

@@ -0,0 +1,5 @@
+[
+    createTable(t, [
+        column(id, serial(), primaryKey()),
+    ]),
+];

package/lib/parser/visitors/clause/create-table/fixture/create-table-serial.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id SERIAL PRIMARY KEY)

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

@@ -2,6 +2,9 @@ import {convertSelect} from '#parser/clause/select';
 import {convertInsert} from '#parser/clause/insert';
 import {convertUpdate} from '#parser/clause/update';
 import {convertDelete} from '#parser/clause/delete';
+import {convertWithNamed} from '#parser/clause/with-named';
+import {convertCreateTable} from '#parser/clause/create-table';
+import {findClause} from '#parser/clause/find';
 
 export const convertClause = (stmt) => {
     const {type} = stmt;
@@ -13,9 +16,19 @@ export const convertClause = (stmt) => {
     throw Error(`${type} not supported yet`);
 };
 
+const convertInsertOrNamed = (stmt) => {
+    const {clauses} = stmt;
+    
+    if (findClause(clauses, 'with_clause'))
+        return convertWithNamed(stmt);
+    
+    return convertInsert(stmt);
+};
+
 const clauseVisitors = {
     select_stmt: convertSelect,
-    insert_stmt: convertInsert,
+    insert_stmt: convertInsertOrNamed,
     update_stmt: convertUpdate,
     delete_stmt: convertDelete,
+    create_table_stmt: convertCreateTable,
 };

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

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

package/lib/parser/visitors/clause/insert/fixture/insert-returning-conflict.sql

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

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

@@ -0,0 +1,7 @@
+[
+    insert(into(
+        CallExpression,
+        parent_id,
+        values(':parent_id'),
+    ), returning(as(id, 'call_id'))),
+];

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

@@ -0,0 +1,7 @@
+[
+    insert(into(
+        CallExpression,
+        parent_id,
+        values(':parent_id'),
+    ), returning(id)),
+];

package/lib/parser/visitors/clause/insert/fixture/insert-returning-id.sql

@@ -0,0 +1 @@
+INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id;

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

@@ -0,0 +1 @@
+INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id AS call_id;

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

@@ -1,5 +1,6 @@
 import {types} from '@putout/babel';
 import {convertSet} from '#parser/clause/set';
+import {convertSelect} from '#parser/clause/select';
 import {findClause} from '#parser/clause/find';
 
 const {
@@ -12,6 +13,39 @@ const {
 const convertExprToIdentifier = ({expr}) => identifier(expr.name);
 const convertColToIdentifier = ({name}) => identifier(name);
 
+const convertReturningItem = (item) => {
+    if (item.type === 'alias') {
+        const {name} = item.expr;
+        const aliasName = item.alias.name;
+        
+        return callExpression(identifier('as'), [
+            identifier(name),
+            stringLiteral(aliasName),
+        ]);
+    }
+    
+    return identifier(item.name);
+};
+
+const convertReturning = (returningClause) => {
+    const args = returningClause.columns.items.map(convertReturningItem);
+    
+    return callExpression(identifier('returning'), args);
+};
+
+const convertSource = (vc) => {
+    if (vc.type === 'select_stmt')
+        return convertSelect(vc);
+    
+    const vals = vc.values.items[0].expr.items;
+    const valArgs = [];
+    
+    for (const p of vals)
+        valArgs.push(stringLiteral(p.text));
+    
+    return callExpression(identifier('values'), valArgs);
+};
+
 const convertUpsert = (upsertClause) => {
     const target = upsertClause.conflictTarget;
     const {action} = upsertClause;
@@ -26,23 +60,20 @@ export const convertInsert = ({clauses}) => {
     const [ic] = clauses;
     const [, vc] = clauses;
     const uc = findClause(clauses, 'upsert_clause');
+    const rc = findClause(clauses, 'returning_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(convertColToIdentifier));
-    const valArgs = [];
-    
-    for (const p of vals) {
-        valArgs.push(stringLiteral(p.text));
-    }
+    const source = convertSource(vc);
     
     const args = [
         callExpression(identifier('into'), [
             identifier(ic.table.name),
             colArg,
-            callExpression(identifier('values'), valArgs),
+            source,
         ]),
         uc && convertUpsert(uc),
+        rc && convertReturning(rc),
     ].filter(Boolean);
     
     return callExpression(identifier('insert'), args);

package/lib/parser/visitors/clause/select/fixture/select-last-insert-rowid-fix.js

@@ -0,0 +1,3 @@
+[
+    select(lastInsertRowid(), from(users)),
+];

package/lib/parser/visitors/clause/select/fixture/select-last-insert-rowid.sql

@@ -0,0 +1 @@
+SELECT last_insert_rowid() FROM users

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

@@ -0,0 +1,3 @@
+[
+    select(lastval(), from(users)),
+];

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

@@ -0,0 +1 @@
+SELECT LASTVAL() FROM users

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

@@ -16,6 +16,9 @@ const convertColumn = (column) => {
     if (isCount(column))
         return convertCount(column);
     
+    if (column.type === 'func_call')
+        return convertFuncCall(column);
+    
     if (column.type === 'alias')
         return assignmentExpression('=', identifier(column.alias.name), convertOperand(column.expr));
     
@@ -25,6 +28,15 @@ const convertColumn = (column) => {
     return identifier(column.name);
 };
 
+const convertFuncCall = (column) => {
+    const {name} = column.name;
+    
+    if (name === 'last_insert_rowid')
+        return callExpression(identifier('lastInsertRowid'), []);
+    
+    return callExpression(identifier('lastval'), []);
+};
+
 const convertColumns = (columns) => {
     if (columns.items.length === 1 && columns.items[0].type === 'all_columns')
         return [

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

@@ -0,0 +1,31 @@
+import {types} from '@putout/babel';
+import {convertClause} from '#parser/clause';
+import {findClause} from '#parser/clause/find';
+
+const {
+    identifier,
+    assignmentExpression,
+    callExpression,
+} = types;
+
+const isWithClause = (clause) => clause.type !== 'with_clause';
+
+const convertTable = ({table, expr}) => {
+    return assignmentExpression('=', identifier(table.name), convertClause(expr.expr));
+};
+
+export const convertWithNamed = (stmt) => {
+    const withClause = findClause(stmt.clauses, 'with_clause');
+    
+    const finalStatement = convertClause({
+        ...stmt,
+        clauses: stmt.clauses.filter(isWithClause),
+    });
+    
+    const args = [
+        ...withClause.tables.items.map(convertTable),
+        finalStatement,
+    ];
+    
+    return callExpression(identifier('withNamed'), args);
+};

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

@@ -0,0 +1,6 @@
+export const as = (path, {write, traverse}) => {
+    const [column, alias] = path.get('arguments');
+    traverse(column);
+    write(' AS ');
+    write(alias.node.value);
+};

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

@@ -0,0 +1 @@
+export const autoIncrement = (path, {write}) => write('AUTOINCREMENT');

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

@@ -10,6 +10,16 @@ import {set} from './set/set.js';
 import {del} from './delete/delete.js';
 import {section} from './section/section.js';
 import {count} from './count/count.js';
+import {returning} from './returning/returning.js';
+import {as} from './as/as.js';
+import {withNamed} from './with-named/with-named.js';
+import {createTable} from './create-table/create-table.js';
+import {column} from './column/column.js';
+import {autoIncrement} from './auto-increment/auto-increment.js';
+import {serial} from './serial/serial.js';
+import {primaryKey} from './primary-key/primary-key.js';
+import {lastInsertRowid} from './last-insert-rowid/last-insert-rowid.js';
+import {lastval} from './lastval/lastval.js';
 
 export const clauses = {
     count,
@@ -24,4 +34,14 @@ export const clauses = {
     set,
     delete: del,
     section,
+    returning,
+    as,
+    withNamed,
+    createTable,
+    column,
+    autoIncrement,
+    serial,
+    primaryKey,
+    lastInsertRowid,
+    lastval,
 };

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

@@ -0,0 +1,10 @@
+export const column = (path, {write, traverse}) => {
+    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/create-table/create-table.js

@@ -0,0 +1,18 @@
+export const createTable = (path, {write, traverse}) => {
+    const [name, columns] = path.get('arguments');
+    
+    write('CREATE TABLE ');
+    traverse(name);
+    write(' (');
+    
+    const elements = columns.get('elements');
+    
+    for (const [i, element] of elements.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(element);
+    }
+    
+    write(')');
+};

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTable.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id INTEGER PRIMARY KEY AUTOINCREMENT)

package/lib/printer/visitors/call-expression/clauses/create-table/fixture/createTableSerial.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id SERIAL PRIMARY KEY)

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

@@ -1,9 +1,12 @@
 export const insert = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    traverse(args[0]);
+    const [intoArg] = args;
+    const rest = args.slice(1);
     
-    if (args[1]) {
+    traverse(intoArg);
+    
+    for (const arg of rest) {
         write(' ');
-        traverse(args[1]);
+        traverse(arg);
     }
 };

package/lib/printer/visitors/call-expression/clauses/last-insert-rowid/fixture/lastInsertRowid.sql

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

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

@@ -0,0 +1 @@
+export const lastInsertRowid = (path, {write}) => write('last_insert_rowid()');

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

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

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

@@ -0,0 +1 @@
+export const lastval = (path, {write}) => write('LASTVAL()');

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

@@ -0,0 +1 @@
+export const primaryKey = (path, {write}) => write('PRIMARY KEY');

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

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

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

@@ -0,0 +1 @@
+INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id AS call_id

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

@@ -0,0 +1 @@
+INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id

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

@@ -0,0 +1 @@
+INSERT INTO t (x) VALUES (:x) RETURNING id, created_at

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

@@ -0,0 +1,11 @@
+export const returning = (path, {write, traverse}) => {
+    write('RETURNING ');
+    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/section/fixture/section-multi-fix.sql

@@ -0,0 +1,7 @@
+-- @fix
+UPDATE Identifier
+SET name = 'isNaN'
+WHERE id = :nan_id;
+UPDATE BinaryExpression
+SET operator = '==='
+WHERE id = :id;

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

@@ -1,6 +1,19 @@
 export const section = (path, {write, traverse}) => {
     const [name, stmt] = path.get('arguments');
     write(`-- ${name.node.value}\n`);
+    
+    if (stmt.node.type === 'ArrayExpression') {
+        const elements = stmt.get('elements');
+        const lastIndex = elements.length - 1;
+        
+        for (const [i, element] of elements.entries()) {
+            traverse(element);
+            write(i < lastIndex ? ';\n' : ';');
+        }
+        
+        return;
+    }
+    
     traverse(stmt);
     write(';');
 };

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

@@ -0,0 +1 @@
+export const serial = (path, {write}) => write('SERIAL');

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

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

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

@@ -0,0 +1,21 @@
+const isAssignment = (arg) => arg.node.type === 'AssignmentExpression';
+
+export const withNamed = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    const namedQueries = args.filter(isAssignment);
+    const finalStatement = args.at(-1);
+    
+    write('WITH\n');
+    const last = namedQueries.length - 1;
+    
+    for (const [i, query] of namedQueries.entries()) {
+        write('    ');
+        write(query.get('left').node.name);
+        write(' AS (\n        ');
+        traverse(query.get('right'));
+        write('\n    )');
+        write(i < last ? ',\n' : '\n');
+    }
+    
+    traverse(finalStatement);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -24,6 +24,9 @@
     "#parser/clause/insert": "./lib/parser/visitors/clause/insert/insert.js",
     "#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/create-table": "./lib/parser/visitors/clause/create-table/create-table.js",
+    "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",
     "#printer": "./lib/printer/printer.js",
     "#printer/test": "./test/create-printer-test.js"
   },
@@ -73,8 +76,7 @@
     "putout": "^42.2.3",
     "redlint": "^6.9.2",
     "superc8": "^12.7.0",
-    "supertape": "^13.2.0",
-    "try-catch": "^4.0.9"
+    "supertape": "^13.2.0"
   },
   "dependencies": {
     "@putout/babel": "^5.7.3",
@@ -82,6 +84,7 @@
     "@putout/printer": "^18.17.0",
     "just-camel-case": "^6.2.0",
     "redstd": "^1.0.2",
-    "sql-parser-cst": "^0.42.1"
+    "sql-parser-cst": "^0.42.1",
+    "try-catch": "^4.0.9"
   }
 }