happy-sql 2.0.0 → 2.0.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2026.08.20, v2.0.2
+
+fix:
+- e7b456f happy-sql: drop as(), use TSAsExpression aliases; round-trip specs; 100% coverage
+
+2026.08.19, v2.0.1
+
+fix:
+- c1629b0 happy-sql: keep :x unquoted
+
 2026.08.19, v2.0.0
 
 feature:

package/lib/happy-sql.js

@@ -8,4 +8,8 @@ export {parseSql} from '#parser';
 
 export const convertSqlToJs = (sql) => print(parseSql(sql));
 
-export const convertJsToSql = (js) => printSql(parse(js));
+export const convertJsToSql = (js) => printSql(parse(js, {
+    plugins: [
+        ['typescript'],
+    ],
+}));

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

@@ -1,6 +1,3 @@
 [
-    select(bin.id, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, 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,6 +1,3 @@
 [
-    select(bin.id, arg_id.name, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, nan_id), on(nan_id.parent_id === bin.id)), join(as(Identifier, 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-not-eq-fix.js

@@ -1,6 +1,3 @@
 [
-    select(bin.id, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, 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,6 +1,3 @@
 [
-    select(bin.id, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, 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,6 +1,3 @@
 [
-    select(bin.id, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, 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,6 +1,3 @@
 [
-    select(bin.id, from(as(
-        BinaryExpression,
-        bin,
-    ), join(as(Identifier, 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

@@ -12,6 +12,8 @@ const {
     numericLiteral,
     booleanLiteral,
     nullLiteral,
+    tsAsExpression,
+    tsLiteralType,
 } = types;
 
 const convertOperand = (node) => {
@@ -110,10 +112,7 @@ const convertOn = (spec) => callExpression(identifier('on'), [
 
 const convertAlias = (node) => {
     if (node.type === 'alias')
-        return callExpression(identifier('as'), [
-            identifier(node.expr.name),
-            identifier(node.alias.name),
-        ]);
+        return tsAsExpression(identifier(node.expr.name), tsLiteralType(stringLiteral(node.alias.name)));
     
     return identifier(node.name);
 };

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

@@ -3,5 +3,5 @@
         CallExpression,
         parent_id,
         values(':parent_id'),
-    ), returning(as(id, 'call_id'))),
+    ), returning(id as 'call_id')),
 ];

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

@@ -9,6 +9,8 @@ const {
     callExpression,
     arrayExpression,
     stringLiteral,
+    tsAsExpression,
+    tsLiteralType,
 } = types;
 
 const convertExprToIdentifier = ({expr}) => identifier(expr.name);
@@ -19,10 +21,7 @@ const convertReturningItem = (item) => {
         const {name} = item.expr;
         const aliasName = item.alias.name;
         
-        return callExpression(identifier('as'), [
-            identifier(name),
-            stringLiteral(aliasName),
-        ]);
+        return tsAsExpression(identifier(name), tsLiteralType(stringLiteral(aliasName)));
     }
     
     return identifier(item.name);

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

@@ -1,3 +1,3 @@
 [
-    select(message = 'msg', num = 42, from(t)),
+    select('msg' as 'message', 42 as 'num', from(t)),
 ];

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

@@ -1,3 +1,3 @@
 [
-    select(file = ':file', from(t)),
+    select(':file' as 'file', from(t)),
 ];

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

@@ -8,7 +8,8 @@ import {convertCount, isCount} from '#parser/clause/count';
 const {
     identifier,
     stringLiteral,
-    assignmentExpression,
+    tsAsExpression,
+    tsLiteralType,
     callExpression,
     memberExpression,
 } = types;
@@ -21,7 +22,7 @@ const convertColumn = (column) => {
         return convertFuncCall(column);
     
     if (column.type === 'alias')
-        return assignmentExpression('=', identifier(column.alias.name), convertOperand(column.expr));
+        return tsAsExpression(convertOperand(column.expr), tsLiteralType(stringLiteral(column.alias.name)));
     
     if (column.type === 'string_literal')
         return stringLiteral(column.value);

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

@@ -13,7 +13,6 @@ import {deleteFrom} 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 {createSequence} from './create-sequence/create-sequence.js';
@@ -48,7 +47,6 @@ export const clauses = {
     deleteFrom,
     section,
     returning,
-    as,
     withNamed,
     createTable,
     createSequence,

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

@@ -1,9 +1,31 @@
+import {types} from '@putout/babel';
+
+const {isTSAsExpression} = types;
+
+const printAsExpression = (path, {write, traverse}) => {
+    traverse(path.get('expression'));
+    write(` AS ${path.node.typeAnnotation.literal.value}`);
+};
+
+const printArg = (path, ctx) => {
+    if (isTSAsExpression(path.node))
+        return printAsExpression(path, ctx);
+    
+    ctx.traverse(path);
+};
+
 export const from = (path, {write, traverse}) => {
     const args = path.get('arguments');
     
     write('FROM ');
-    traverse(args[0]);
+    printArg(args[0], {
+        write,
+        traverse,
+    });
     
     for (let i = 1; i < args.length; i++)
-        traverse(args[i]);
+        printArg(args[i], {
+            write,
+            traverse,
+        });
 };

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

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (':x')
+INSERT INTO t (x) VALUES (:x)

package/lib/printer/visitors/call-expression/clauses/into/fixture/single-column-fix.sql

@@ -1 +1 @@
-INSERT INTO t (x) VALUES (':x')
+INSERT INTO t (x) VALUES (:x)

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

@@ -1,4 +1,4 @@
 SELECT bin.id
-FROM BinaryExpression bin
-JOIN Identifier nan_id ON nan_id.parent_id = bin.id
+FROM BinaryExpression AS bin
+JOIN Identifier AS nan_id ON nan_id.parent_id = bin.id
 AND nan_id.name = 'NaN'

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

@@ -1,4 +1,4 @@
 SELECT bin.id, arg_id.name
-FROM BinaryExpression bin
-JOIN Identifier nan_id ON nan_id.parent_id = bin.id
-JOIN Identifier arg_id ON arg_id.parent_id = bin.id
+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/printer/visitors/call-expression/clauses/join/fixture/join-multi.js

@@ -1 +1 @@
-[select(bin.id, arg_id.name, from(as(BinaryExpression, bin), join(as(Identifier, nan_id), on(nan_id.parent_id === bin.id)), join(as(Identifier, 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/printer/visitors/call-expression/clauses/join/fixture/join.js

@@ -1 +1 @@
-[select(bin.id, from(as(BinaryExpression, bin), join(as(Identifier, 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/printer/visitors/call-expression/clauses/join/join.js

@@ -1,8 +1,27 @@
+import {types} from '@putout/babel';
+
+const {isTSAsExpression} = types;
+
+const printAsExpression = (path, {write, traverse}) => {
+    traverse(path.get('expression'));
+    write(` AS ${path.node.typeAnnotation.literal.value}`);
+};
+
+const printTable = (path, ctx) => {
+    if (isTSAsExpression(path.node))
+        return printAsExpression(path, ctx);
+    
+    ctx.traverse(path);
+};
+
 export const join = (path, {write, traverse}) => {
     const [table, onClause] = path.get('arguments');
     
     write('\nJOIN ');
-    traverse(table);
+    printTable(table, {
+        write,
+        traverse,
+    });
     write(' ');
     traverse(onClause);
 };

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

@@ -1 +1 @@
-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 @@
-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 @@
-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 @@
-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 @@
-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 @@
-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/returning/fixture/returning.js

@@ -3,5 +3,5 @@
         CallExpression,
         parent_id,
         values(':parent_id'),
-    ), returning(as(id, 'call_id'))),
+    ), returning(id as 'call_id')),
 ];

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

@@ -1,3 +1,19 @@
+import {types} from '@putout/babel';
+
+const {isTSAsExpression} = types;
+
+const printAsExpression = (path, {write, traverse}) => {
+    traverse(path.get('expression'));
+    write(` AS ${path.node.typeAnnotation.literal.value}`);
+};
+
+const printItem = (path, ctx) => {
+    if (isTSAsExpression(path.node))
+        return printAsExpression(path, ctx);
+    
+    ctx.traverse(path);
+};
+
 export const returning = (path, {write, traverse}) => {
     write('RETURNING ');
     const args = path.get('arguments');
@@ -6,6 +22,9 @@ export const returning = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        traverse(arg);
+        printItem(arg, {
+            write,
+            traverse,
+        });
     }
 };

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

@@ -1,6 +1,21 @@
 import {types} from '@putout/babel';
 
-const {isStringLiteral} = types;
+const {
+    isTSAsExpression,
+    isStringLiteral,
+} = types;
+
+const printAsExpression = (path, {write, traverse}) => {
+    traverse(path.get('expression'));
+    write(` AS ${path.node.typeAnnotation.literal.value}`);
+};
+
+const printItem = (path, ctx) => {
+    if (isTSAsExpression(path.node))
+        return printAsExpression(path, ctx);
+    
+    ctx.traverse(path);
+};
 
 export const select = (path, {write, traverse}) => {
     const args = path.get('arguments');
@@ -13,7 +28,10 @@ export const select = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        traverse(cols[i]);
+        printItem(cols[i], {
+            write,
+            traverse,
+        });
     }
     
     if (rest.length === 1 && isStringLiteral(rest[0])) {

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

@@ -1 +1 @@
-VALUES (':x')
+VALUES (:x)

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

@@ -1 +1 @@
-VALUES (':file', ':parent_id')
+VALUES (:file, :parent_id)

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

@@ -1,7 +1,3 @@
-import {types} from '@putout/babel';
-
-const {isStringLiteral} = types;
-
 export const values = (path, {write, traverse}) => {
     const args = path.get('arguments');
     write('VALUES (');
@@ -9,12 +5,7 @@ export const values = (path, {write, traverse}) => {
         if (i > 0)
             write(', ');
         
-        const arg = args[i];
-        
-        if (isStringLiteral(arg.node))
-            write(`'${arg.node.value}'`);
-        else
-            traverse(arg);
+        traverse(args[i]);
     }
     
     write(')');

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

@@ -1,6 +1,6 @@
 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

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

@@ -1,6 +1,6 @@
 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

package/lib/printer/visitors/index.js

@@ -4,7 +4,6 @@ import {CallExpression} from './call-expression/call-expression.js';
 import {ArrayExpression} from './array-expression.js';
 import {BinaryExpression} from './binary-expression.js';
 import {LogicalExpression} from './logical-expression.js';
-import {AssignmentExpression} from './assignment-expression.js';
 import {MemberExpression} from './member-expression.js';
 
 export const visitors = {
@@ -14,6 +13,5 @@ export const visitors = {
     ExpressionStatement,
     BinaryExpression,
     LogicalExpression,
-    AssignmentExpression,
     MemberExpression,
 };

package/package.json

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

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

@@ -1,5 +0,0 @@
-export const AssignmentExpression = (path, {write, traverse}) => {
-    traverse(path.get('right'));
-    write(' AS ');
-    traverse(path.get('left'));
-};

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

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