happy-sql 2.0.3 → 2.0.5

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.08.20, v2.0.5
+
+fix:
+- b1cf2b1 happy-sql: parser: where
+
+2026.08.20, v2.0.4
+
+fix:
+- 743d5c6 happy-sql: ";"
+
 2026.08.20, v2.0.3
 
 feature:

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

@@ -0,0 +1,3 @@
+[
+    select(u.id, u.name, from(users as 'u', where(u.active === true))),
+];

package/lib/parser/visitors/clause/from/fixture/from-where.sql

@@ -0,0 +1,3 @@
+SELECT u.id, u.name
+FROM users AS u
+WHERE u.active = true;

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

@@ -134,6 +134,13 @@ const flattenJoins = (node, joins = []) => {
 };
 
 export const convertFrom = ({expr, whereClause}) => {
+    const fromArgs = [];
+    
+    if (whereClause)
+        fromArgs.push(callExpression(identifier('where'), [
+            convertCondition(whereClause.expr),
+        ]));
+    
     if (expr.type === 'join_expr') {
         const parts = flattenJoins(expr);
         return callExpression(identifier('from'), parts);
@@ -142,16 +149,11 @@ export const convertFrom = ({expr, whereClause}) => {
     if (expr.type === 'alias')
         return callExpression(identifier('from'), [
             convertAlias(expr),
+            ...fromArgs,
         ]);
     
-    const fromArgs = [
+    return callExpression(identifier('from'), [
         identifier(expr.name),
-    ];
-    
-    if (whereClause)
-        fromArgs.push(callExpression(identifier('where'), [
-            convertCondition(whereClause.expr),
-        ]));
-    
-    return callExpression(identifier('from'), fromArgs);
+        ...fromArgs,
+    ]);
 };

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

@@ -0,0 +1,3 @@
+SELECT id
+FROM Users
+JOIN Orders ON Orders.user_id = Users.id

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

@@ -0,0 +1 @@
+[select(id, from(Users, join(Orders, on(Orders.user_id === Users.id))))];

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

package/package.json

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