happy-sql 2.0.6 → 2.0.8

package/ChangeLog

@@ -1,3 +1,19 @@
+2026.08.21, v2.0.8
+
+fix:
+- c5eddac happy-sql: remove js-printer
+- 31bebb9 happy-sql: use @putout/printer for convertSqlToJs
+- 1acd691 happy-sql: convertSqlToJs: use js-printer
+
+feature:
+- f8ae0f4 apply printer methods
+- 90905ad happy-sql: parser: clause: fixture
+
+2026.08.20, v2.0.7
+
+fix:
+- 0ddbb26 happy-sql: parser: improve error message
+
 2026.08.20, v2.0.6
 
 feature:

package/lib/happy-sql.js

@@ -6,7 +6,11 @@ import {printSql} from '#printer';
 export {printSql} from '#printer';
 export {parseSql} from '#parser';
 
-export const convertSqlToJs = (sql) => print(parseSql(sql));
+export const convertSqlToJs = (sql) => print(parseSql(sql), {
+    semantics: {
+        maxArgsInOneLine: 1,
+    },
+});
 
 export const convertJsToSql = (js) => printSql(parse(js, {
     plugins: [

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

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

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

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

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

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

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

@@ -1,11 +1,43 @@
 [
-    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))))),
+    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-insert-fix.js

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

package/lib/parser/parser.js

@@ -26,14 +26,17 @@ const parseCstDialect = (source, dialect) => parseCst(source, {
 });
 
 export const parseSql = (source) => {
+    let cst;
+    let error;
+    
     for (const dialect of DIALECTS) {
-        const [, cst] = tryCatch(parseCstDialect, source, dialect);
+        [error, cst] = tryCatch(parseCstDialect, source, dialect);
         
         if (cst)
             return convertSource(cst);
     }
     
-    throw Error(`Cannot parse SQL: '${source}'`);
+    throw error;
 };
 
 const isComment = ({text}) => text.startsWith('-- @');

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

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

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

@@ -1,3 +1,10 @@
 [
-    select(count(1), from(users)),
+    select(
+        count(
+            1,
+        ),
+        from(
+            users,
+        ),
+    ),
 ];

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

@@ -1,3 +1,5 @@
 [
-    createSequence(users_id_seq),
+    createSequence(
+        users_id_seq,
+    ),
 ];

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

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

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

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

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

@@ -1,5 +1,12 @@
 [
-    createTable(t, [
-        column(id, BIGINT, identity(), primaryKey()),
-    ]),
+    createTable(
+        t, [
+            column(
+                id,
+                BIGINT,
+                identity(),
+                primaryKey(),
+            ),
+        ],
+    ),
 ];

package/lib/parser/visitors/clause/create-table/fixture/create-table-identity-by-default-fix.js

@@ -1,5 +1,12 @@
 [
-    createTable(t, [
-        column(id, BIGINT, identityByDefault(), primaryKey()),
-    ]),
+    createTable(
+        t, [
+            column(
+                id,
+                BIGINT,
+                identityByDefault(),
+                primaryKey(),
+            ),
+        ],
+    ),
 ];

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

@@ -1,6 +1,18 @@
 [
-    createTable(users, [
-        column(id, INTEGER, nextval(users_id_seq), primaryKey()),
-        column(name, TEXT),
-    ]),
+    createTable(
+        users, [
+            column(
+                id,
+                INTEGER,
+                nextval(
+                    users_id_seq,
+                ),
+                primaryKey(),
+            ),
+            column(
+                name,
+                TEXT,
+            ),
+        ],
+    ),
 ];

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

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

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

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

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

@@ -1,3 +1,10 @@
 [
-    deleteFrom(from(t), where(id === ':id')),
+    deleteFrom(
+        from(
+            t,
+        ),
+        where(
+            id === ':id',
+        ),
+    ),
 ];

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

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

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

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

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

@@ -1,3 +1,14 @@
 [
-    select(bin.id, from(BinaryExpression as 'bin', join(Identifier as 'nan_id', on(nan_id.parent_id === bin.id && nan_id.name === 'NaN')))),
+    select(
+        bin.id,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'nan_id',
+                on(
+                    nan_id.parent_id === bin.id && nan_id.name === 'NaN',
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -1,3 +1,21 @@
 [
-    select(bin.id, arg_id.name, from(BinaryExpression as 'bin', join(Identifier as 'nan_id', on(nan_id.parent_id === bin.id)), join(Identifier as 'arg_id', on(arg_id.parent_id === bin.id)))),
+    select(
+        bin.id,
+        arg_id.name,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'nan_id',
+                on(
+                    nan_id.parent_id === bin.id,
+                ),
+            ),
+            join(
+                Identifier as 'arg_id',
+                on(
+                    arg_id.parent_id === bin.id,
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-in-fix.js

@@ -1,3 +1,19 @@
 [
-    select(u.id, from(t, join(u, on(inList(u.id, 1, 2, 3))))),
+    select(
+        u.id,
+        from(
+            t,
+            join(
+                u,
+                on(
+                    inList(
+                        u.id,
+                        1,
+                        2,
+                        3,
+                    ),
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-is-not-null-fix.js

@@ -1,3 +1,16 @@
 [
-    select(u.id, from(t, join(u, on(isNotNull(u.x))))),
+    select(
+        u.id,
+        from(
+            t,
+            join(
+                u,
+                on(
+                    isNotNull(
+                        u.x,
+                    ),
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-is-null-fix.js

@@ -1,3 +1,16 @@
 [
-    select(u.id, from(t, join(u, on(isNull(u.x))))),
+    select(
+        u.id,
+        from(
+            t,
+            join(
+                u,
+                on(
+                    isNull(
+                        u.x,
+                    ),
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-like-fix.js

@@ -1,3 +1,17 @@
 [
-    select(u.id, from(t, join(u, on(like(u.x, ':p'))))),
+    select(
+        u.id,
+        from(
+            t,
+            join(
+                u,
+                on(
+                    like(
+                        u.x,
+                        ':p',
+                    ),
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-not-eq-fix.js

@@ -1,3 +1,14 @@
 [
-    select(bin.id, from(BinaryExpression as 'bin', join(Identifier as 'arg_id', on(arg_id.parent_id === bin.id && arg_id.id !== bin.id)))),
+    select(
+        bin.id,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'arg_id',
+                on(
+                    arg_id.parent_id === bin.id && arg_id.id !== bin.id,
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-number-fix.js

@@ -1,3 +1,14 @@
 [
-    select(bin.id, from(BinaryExpression as 'bin', join(Identifier as 'nan_id', on(nan_id.parent_id === 1)))),
+    select(
+        bin.id,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'nan_id',
+                on(
+                    nan_id.parent_id === 1,
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-or-fix.js

@@ -1,3 +1,14 @@
 [
-    select(bin.id, from(BinaryExpression as 'bin', join(Identifier as 'nan_id', on(nan_id.parent_id === bin.id || nan_id.name === 'NaN')))),
+    select(
+        bin.id,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'nan_id',
+                on(
+                    nan_id.parent_id === bin.id || nan_id.name === 'NaN',
+                ),
+            ),
+        ),
+    ),
 ];

package/lib/parser/visitors/clause/from/fixture/join-on-param-fix.js

@@ -1,3 +1,14 @@
 [
-    select(bin.id, from(BinaryExpression as 'bin', join(Identifier as 'nan_id', on(nan_id.parent_id === ':param_id')))),
+    select(
+        bin.id,
+        from(
+            BinaryExpression as 'bin',
+            join(
+                Identifier as 'nan_id',
+                on(
+                    nan_id.parent_id === ':param_id',
+                ),
+            ),
+        ),
+    ),
 ];

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

@@ -1,43 +1,18 @@
 import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
 
 const isString = (a) => typeof a === 'string';
 
 const {
     identifier,
     callExpression,
-    memberExpression,
     binaryExpression,
     logicalExpression,
     stringLiteral,
-    numericLiteral,
-    booleanLiteral,
-    nullLiteral,
     tsAsExpression,
     tsLiteralType,
 } = types;
 
-const convertOperand = (node) => {
-    if (node.type === 'member_expr')
-        return memberExpression(identifier(node.object.name), identifier(node.property.name));
-    
-    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);
-    
-    if (node.type === 'boolean_literal')
-        return booleanLiteral(node.value);
-    
-    if (node.type === 'null_literal')
-        return nullLiteral(node.value);
-    
-    return identifier(node.name);
-};
-
 const opName = (op) => {
     if (Array.isArray(op))
         return op

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

@@ -1,3 +1,11 @@
 [
-    insert(into(t, x, values(':x'))),
+    insert(
+        into(
+            t,
+            x,
+            values(
+                ':x',
+            ),
+        ),
+    ),
 ];

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

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