happy-sql 2.0.4 → 2.0.6

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.08.20, v2.0.6
+
+feature:
+- eea70b5 @putout/parser: add source of incorrect sql
+
+2026.08.20, v2.0.5
+
+fix:
+- b1cf2b1 happy-sql: parser: where
+
 2026.08.20, v2.0.4
 
 fix:

package/lib/parser/parser.js

@@ -33,14 +33,16 @@ export const parseSql = (source) => {
             return convertSource(cst);
     }
     
-    throw Error('Cannot parse SQL');
+    throw Error(`Cannot parse SQL: '${source}'`);
 };
 
+const isComment = ({text}) => text.startsWith('-- @');
+
 const getSectionName = (leading) => {
     if (!leading)
         return null;
     
-    const comment = leading.find((c) => c.text.startsWith('-- @'));
+    const comment = leading.find(isComment);
     
     return comment ? comment.text
         .slice(2)

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/package.json

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