happy-sql 2.0.2 → 2.0.3

package/ChangeLog

@@ -1,3 +1,8 @@
+2026.08.20, v2.0.3
+
+feature:
+- 894a345 from
+
 2026.08.20, v2.0.2
 
 fix:

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

@@ -133,7 +133,7 @@ const flattenJoins = (node, joins = []) => {
     return joins;
 };
 
-export const convertFrom = ({expr}) => {
+export const convertFrom = ({expr, whereClause}) => {
     if (expr.type === 'join_expr') {
         const parts = flattenJoins(expr);
         return callExpression(identifier('from'), parts);
@@ -144,7 +144,14 @@ export const convertFrom = ({expr}) => {
             convertAlias(expr),
         ]);
     
-    return callExpression(identifier('from'), [
+    const fromArgs = [
         identifier(expr.name),
-    ]);
+    ];
+    
+    if (whereClause)
+        fromArgs.push(callExpression(identifier('where'), [
+            convertCondition(whereClause.expr),
+        ]));
+    
+    return callExpression(identifier('from'), fromArgs);
 };

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

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

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

@@ -1,9 +1,8 @@
 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';
+import {findClause} from '#parser/clause/find';
 
 const {
     identifier,
@@ -61,8 +60,10 @@ export const convertSelect = ({clauses}) => {
     
     const args = [
         ...convertColumns(selectClause.columns),
-        fromClause && convertFrom(fromClause),
-        whereClause && convertWhere(whereClause),
+        fromClause && convertFrom({
+            expr: fromClause.expr,
+            whereClause,
+        }),
     ].filter(Boolean);
     
     return callExpression(identifier('select'), args);

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

@@ -1,3 +1,3 @@
 [
-    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,3 @@
 [
-    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,3 @@
 [
-    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,3 @@
 [
-    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,3 @@
 [
-    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,3 @@
 [
-    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,3 @@
 [
-    select('*', from(t), where(like(x, ':pattern'))),
+    select('*', from(t, where(like(x, ':pattern')))),
 ];

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

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

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

@@ -1,3 +1,3 @@
 [
-    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,3 @@
 [
-    select('*', from(t), where(x === ':x' || y === ':y')),
+    select('*', from(t, where(x === ':x' || y === ':y'))),
 ];

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

@@ -6,6 +6,6 @@ export const ArrayExpression = (path, {write, traverse}) => {
         traverse(el);
         
         if (i < n)
-            write(';\n');
+            write('\n\n');
     }
 };

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

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

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

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

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

@@ -1 +1,2 @@
-CREATE TABLE t (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)
+CREATE TABLE t (
+id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)

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

@@ -1 +1,2 @@
-CREATE TABLE t (id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)
+CREATE TABLE t (
+id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)

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

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

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

@@ -16,16 +16,24 @@ 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;
     
     write('FROM ');
-    printArg(args[0], {
+    printArg(tableArgs[0], {
         write,
         traverse,
     });
     
-    for (let i = 1; i < args.length; i++)
-        printArg(args[i], {
+    for (let i = 1; i < tableArgs.length; i++)
+        printArg(tableArgs[i], {
             write,
             traverse,
         });
+    
+    if (hasWhere) {
+        write('\n');
+        traverse(lastArg);
+    }
 };

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(' ');
+        write('\n');
         traverse(arg);
     }
 };

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

@@ -21,6 +21,10 @@ export const into = (path, {write, traverse}) => {
         traverse(columns);
     }
     
-    write(') ');
-    traverse(values);
+    write(')');
+    
+    if (values) {
+        write(' ');
+        traverse(values);
+    }
 };

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

@@ -1 +1,3 @@
-CREATE TABLE users (id INTEGER DEFAULT nextval('users_id_seq') PRIMARY KEY, name TEXT)
+CREATE TABLE users (
+id INTEGER DEFAULT nextval('users_id_seq') PRIMARY KEY,
+name TEXT)

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

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

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

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

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

@@ -1 +1,3 @@
-INSERT INTO t (x) VALUES (:x) ON CONFLICT (x) DO UPDATE SET y = :y RETURNING id
+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

@@ -1 +1,2 @@
-INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id AS call_id
+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

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

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

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

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

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

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

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

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

@@ -8,12 +8,13 @@ export const section = (path, {write, traverse}) => {
         
         for (const [i, element] of elements.entries()) {
             traverse(element);
-            write(i < lastIndex ? ';\n' : ';');
+            
+            if (i < lastIndex)
+                write('\n\n');
         }
         
         return;
     }
     
     traverse(stmt);
-    write(';');
 };

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

@@ -1 +1 @@
-SELECT 'hello';
+SELECT 'hello'

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

@@ -1,9 +1,6 @@
 import {types} from '@putout/babel';
 
-const {
-    isTSAsExpression,
-    isStringLiteral,
-} = types;
+const {isTSAsExpression} = types;
 
 const printAsExpression = (path, {write, traverse}) => {
     traverse(path.get('expression'));
@@ -19,11 +16,13 @@ const printItem = (path, ctx) => {
 
 export const select = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    const fromIdx = args.findIndex((a) => a.node.callee?.name === 'from');
-    const cols = args.slice(0, fromIdx);
-    const rest = args.slice(fromIdx);
+    const lastArg = args.at(-1);
+    const hasFrom = lastArg?.node?.callee?.name === 'from';
+    const fromArg = hasFrom ? lastArg : null;
+    const cols = hasFrom ? args.slice(0, -1) : args;
     
     write('SELECT ');
+    
     for (let i = 0; i < cols.length; i++) {
         if (i > 0)
             write(', ');
@@ -34,15 +33,8 @@ export const select = (path, {write, traverse}) => {
         });
     }
     
-    if (rest.length === 1 && isStringLiteral(rest[0])) {
-        traverse(rest[0]);
-        write(';');
-        
-        return;
-    }
-    
-    for (const arg of rest) {
+    if (fromArg) {
         write('\n');
-        traverse(arg);
+        traverse(fromArg);
     }
 };

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

@@ -1,3 +1 @@
-SELECT *
-FROM users
-WHERE id = :id
+SELECT *, FROM users, WHERE id = :id

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

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x >= 1
+SELECT *, FROM t, WHERE x >= 1

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

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x IN (1, 2, 3)
+SELECT *, FROM t, WHERE x IN (1, 2, 3)

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-not-null-fix.sql

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x IS NOT NULL
+SELECT *, FROM t, WHERE x IS NOT NULL

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-null-fix.sql

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x IS NULL
+SELECT *, FROM t, WHERE x IS NULL

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

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x LIKE :pattern
+SELECT *, FROM t, WHERE x LIKE :pattern

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

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x != :y
+SELECT *, FROM t, WHERE x != :y

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

@@ -1,10 +1,12 @@
 WITH
     call AS (
-        INSERT INTO CallExpression (file, parent_id) VALUES (:file, :parent_id) RETURNING id
+        INSERT INTO CallExpression (file, parent_id) VALUES (:file, :parent_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/withNamed-fix.sql

@@ -1,10 +1,12 @@
 WITH
     call AS (
-        INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id
+        INSERT INTO CallExpression (parent_id) VALUES (:parent_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/fixture/binary-expression-fix.sql

@@ -1,3 +1 @@
-SELECT *
-FROM t
-WHERE x % 2
+SELECT *, FROM t, WHERE x % 2

package/package.json

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