happy-sql 1.4.0 → 1.5.0

package/ChangeLog

@@ -1,3 +1,11 @@
+2026.08.15, v1.5.0
+
+fix:
+- b8aff13 printer: test
+
+feature:
+- 465fc93 join: add support
+
 2026.08.14, v1.4.0
 
 feature:

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

@@ -15,5 +15,5 @@ export const convertDelete = ({clauses}) => {
         whereClause && convertWhere(whereClause),
     ].filter(Boolean);
     
-    return callExpression(identifier('delete'), args);
+    return callExpression(identifier('deleteFrom'), args);
 };

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

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

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

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

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

@@ -0,0 +1,6 @@
+[
+    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)))),
+];

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

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

package/lib/parser/visitors/clause/from/fixture/join.sql

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

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

@@ -1,7 +1,83 @@
 import {types} from '@putout/babel';
 
-const {identifier, callExpression} = types;
+const {
+    identifier,
+    callExpression,
+    memberExpression,
+    binaryExpression,
+    logicalExpression,
+    stringLiteral,
+    numericLiteral,
+} = types;
 
-export const convertFrom = (node) => callExpression(identifier('from'), [
-    identifier(node.expr.name),
+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);
+    
+    return identifier(node.name);
+};
+
+const convertCondition = (node) => {
+    if (node.operator?.name === 'AND')
+        return logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
+    
+    if (node.operator?.name === 'OR')
+        return logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
+    
+    return binaryExpression('===', convertOperand(node.left), convertOperand(node.right));
+};
+
+const convertOn = (spec) => callExpression(identifier('on'), [
+    convertCondition(spec.expr),
 ]);
+
+const convertAlias = (node) => {
+    if (node.type === 'alias')
+        return callExpression(identifier('as'), [
+            identifier(node.expr.name),
+            identifier(node.alias.name),
+        ]);
+    
+    return identifier(node.name);
+};
+
+const flattenJoins = (node, joins = []) => {
+    if (node.type === 'join_expr') {
+        flattenJoins(node.left, joins);
+        joins.push(callExpression(identifier('join'), [
+            convertAlias(node.right),
+            convertOn(node.specification),
+        ]));
+        
+        return joins;
+    }
+    
+    joins.unshift(convertAlias(node));
+    
+    return joins;
+};
+
+export const convertFrom = ({expr}) => {
+    if (expr.type === 'join_expr') {
+        const parts = flattenJoins(expr);
+        return callExpression(identifier('from'), parts);
+    }
+    
+    if (expr.type === 'alias')
+        return callExpression(identifier('from'), [
+            convertAlias(expr),
+        ]);
+    
+    return callExpression(identifier('from'), [
+        identifier(expr.name),
+    ]);
+};

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

@@ -4,9 +4,13 @@ const {
     identifier,
     stringLiteral,
     numericLiteral,
+    memberExpression,
 } = types;
 
 export 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);
     

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

@@ -10,6 +10,7 @@ const {
     stringLiteral,
     assignmentExpression,
     callExpression,
+    memberExpression,
 } = types;
 
 const convertColumn = (column) => {
@@ -25,6 +26,9 @@ const convertColumn = (column) => {
     if (column.type === 'string_literal')
         return stringLiteral(column.value);
     
+    if (column.type === 'member_expr')
+        return memberExpression(identifier(column.object.name), identifier(column.property.name));
+    
     return identifier(column.name);
 };
 

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

@@ -1,30 +1,19 @@
 import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
 
 const {
-    binaryExpression,
     logicalExpression,
     identifier,
-    stringLiteral,
-    numericLiteral,
     callExpression,
 } = types;
 
-const convertOperand = (node) => {
-    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);
-    
-    return identifier(node.name);
-};
-
 const convertAnd = (node) => logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
 const convertOr = (node) => logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
-const convertEq = (node) => binaryExpression('===', convertOperand(node.left), convertOperand(node.right));
+
+const convertEq = (node) => {
+    const {binaryExpression} = types;
+    return binaryExpression('===', convertOperand(node.left), convertOperand(node.right));
+};
 
 const convertCondition = (node) => {
     if (node.operator?.name === 'AND')

package/lib/printer/fixture/select.js

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

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

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

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

@@ -1,3 +1,5 @@
+import {join} from './join/join.js';
+import {on} from './on/on.js';
 import {select} from './select/select.js';
 import {from} from './from/from.js';
 import {where} from './where/where.js';
@@ -7,7 +9,7 @@ import {values} from './values/values.js';
 import {onConflict} from './on-conflict/on-conflict.js';
 import {update} from './update/update.js';
 import {set} from './set/set.js';
-import {del} from './delete/delete.js';
+import {deleteFrom} from './delete/delete.js';
 import {section} from './section/section.js';
 import {count} from './count/count.js';
 import {returning} from './returning/returning.js';
@@ -22,6 +24,8 @@ import {lastInsertRowid} from './last-insert-rowid/last-insert-rowid.js';
 import {lastval} from './lastval/lastval.js';
 
 export const clauses = {
+    join,
+    on,
     count,
     from,
     select,
@@ -32,7 +36,7 @@ export const clauses = {
     onConflict,
     update,
     set,
-    delete: del,
+    deleteFrom,
     section,
     returning,
     as,

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

@@ -0,0 +1,2 @@
+SELECT COUNT(*)
+FROM users

package/lib/printer/visitors/call-expression/clauses/count/fixture/count-one-fix.js

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

package/lib/printer/visitors/call-expression/clauses/count/fixture/count-one.js

@@ -0,0 +1 @@
+select(count(1), from(users));

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

@@ -0,0 +1 @@
+select(count('*'), from(users));

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

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

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

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

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

@@ -1,4 +1,4 @@
-export const del = (path, {write, traverse}) => {
+export const deleteFrom = (path, {write, traverse}) => {
     const args = path.get('arguments');
     const [fromArg] = args;
     const [, whereArg] = args;

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

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

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

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

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

@@ -0,0 +1 @@
+select('*', from(users));

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

@@ -1,5 +1,9 @@
 export const from = (path, {write, traverse}) => {
     const args = path.get('arguments');
+    
     write('FROM ');
     traverse(args[0]);
+    
+    for (let i = 1; i < args.length; i++)
+        traverse(args[i]);
 };

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

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

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

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

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

@@ -0,0 +1 @@
+insert(into(t, x), values(':x'));

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+SELECT bin.id
+FROM BinaryExpression bin
+JOIN Identifier 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

@@ -0,0 +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

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

@@ -0,0 +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))))];

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

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

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

@@ -0,0 +1,8 @@
+export const join = (path, {write, traverse}) => {
+    const [table, onClause] = path.get('arguments');
+    
+    write('\nJOIN ');
+    traverse(table);
+    write(' ');
+    traverse(onClause);
+};

package/lib/printer/visitors/call-expression/clauses/last-insert-rowid/fixture/lastInsertRowid.js

@@ -0,0 +1,3 @@
+[
+    select(lastInsertRowid(), from(users)),
+];

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

@@ -0,0 +1,3 @@
+[
+    select(lastval(), from(users)),
+];

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

@@ -0,0 +1,4 @@
+export const on = (path, {write, traverse}) => {
+    write('ON ');
+    traverse(path.get('arguments.0'));
+};

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+[
+    insert(into(
+        CallExpression,
+        parent_id,
+        values(':parent_id'),
+    ), returning(id)),
+];

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

@@ -0,0 +1,3 @@
+[
+    insert(into(t, x, values(':x')), returning(id, created_at)),
+];

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

@@ -0,0 +1,7 @@
+[
+    insert(into(
+        CallExpression,
+        parent_id,
+        values(':parent_id'),
+    ), returning(as(id, 'call_id'))),
+];

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+[
+    select('hello'),
+];

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

@@ -0,0 +1,3 @@
+[
+    update(t, set(x === ':x'), where(id === ':id')),
+];

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(users), where(id === ':id')),
+];

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

@@ -0,0 +1,11 @@
+[
+    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/printer/visitors/index.js

@@ -5,6 +5,7 @@ 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 = {
     ArrayExpression,
@@ -14,4 +15,5 @@ export const visitors = {
     BinaryExpression,
     LogicalExpression,
     AssignmentExpression,
+    MemberExpression,
 };

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

@@ -0,0 +1,5 @@
+export const MemberExpression = (path, {write, traverse}) => {
+    traverse(path.get('object'));
+    write('.');
+    traverse(path.get('property'));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-sql",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -64,24 +64,24 @@
   },
   "homepage": "https://github.com/coderaiser/happy-sql",
   "devDependencies": {
-    "@putout/plugin-printer": "^8.17.0",
-    "@putout/test": "^15.4.0",
-    "eslint": "^10.0.3",
-    "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^31.1.1",
+    "@putout/plugin-printer": "^8.22.0",
+    "@putout/test": "^15.8.2",
+    "eslint": "^10.8.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-putout": "^31.4.2",
     "just-kebab-case": "^4.2.0",
-    "madrun": "^13.0.1",
+    "madrun": "^13.0.4",
     "montag": "^2.0.1",
-    "nodemon": "^3.1.11",
-    "putout": "^42.2.3",
+    "nodemon": "^3.1.14",
+    "putout": "^42.11.0",
     "redlint": "^6.9.2",
     "superc8": "^12.7.0",
-    "supertape": "^13.2.0"
+    "supertape": "^13.5.1"
   },
   "dependencies": {
-    "@putout/babel": "^5.7.3",
-    "@putout/operator-json": "^3.4.0",
-    "@putout/printer": "^18.17.0",
+    "@putout/babel": "^5.9.9",
+    "@putout/operator-json": "^3.5.0",
+    "@putout/printer": "^18.38.1",
     "just-camel-case": "^6.2.0",
     "redstd": "^1.0.2",
     "sql-parser-cst": "^0.42.1",