happy-sql 1.5.0 → 1.5.2

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.08.15, v1.5.2
+
+feature:
+- 6a7d43a happy-sql: improve
+- f2f0f0e printer: array expression
+
+2026.08.15, v1.5.1
+
+feature:
+- 3f71b12 convertOperand: boolean
+
 2026.08.15, v1.5.0
 
 fix:

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

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

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

@@ -0,0 +1 @@
+SELECT u.id FROM t JOIN u ON u.id IN (1, 2, 3)

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

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

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

@@ -0,0 +1 @@
+SELECT u.id FROM t JOIN u ON u.x IS NOT NULL

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

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

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

@@ -0,0 +1 @@
+SELECT u.id FROM t JOIN u ON u.x IS NULL

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

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

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

@@ -0,0 +1 @@
+SELECT u.id FROM t JOIN u ON u.x LIKE :p

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

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

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

@@ -0,0 +1 @@
+SELECT bin.id FROM BinaryExpression bin JOIN Identifier arg_id ON arg_id.parent_id = bin.id AND arg_id.id != bin.id

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

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

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

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

package/lib/parser/visitors/clause/from/fixture/join-on-or-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-on-or.sql

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

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

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

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

@@ -0,0 +1 @@
+SELECT bin.id FROM BinaryExpression bin JOIN Identifier nan_id ON nan_id.parent_id = :param_id

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

@@ -1,5 +1,7 @@
 import {types} from '@putout/babel';
 
+const isString = (a) => typeof a === 'string';
+
 const {
     identifier,
     callExpression,
@@ -8,6 +10,8 @@ const {
     logicalExpression,
     stringLiteral,
     numericLiteral,
+    booleanLiteral,
+    nullLiteral,
 } = types;
 
 const convertOperand = (node) => {
@@ -23,9 +27,72 @@ const convertOperand = (node) => {
     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
+            .map((k) => k.name)
+            .join(' ');
+    
+    if (isString(op))
+        return op;
+    
+    return op?.name ?? '';
+};
+
+const SQL_TO_JS_OP = {
+    '=': '===',
+    '!=': '!==',
+    '>=': '>=',
+    '<=': '<=',
+    '>': '>',
+    '<': '<',
+};
+
+const convertBinary = (node) => {
+    const op = opName(node.operator);
+    
+    if (op === 'LIKE')
+        return callExpression(identifier('like'), [
+            convertOperand(node.left),
+            convertOperand(node.right),
+        ]);
+    
+    if (op === 'IS')
+        return callExpression(identifier('isNull'), [
+            convertOperand(node.left),
+        ]);
+    
+    if (op === 'IS NOT')
+        return callExpression(identifier('isNotNull'), [
+            convertOperand(node.left),
+        ]);
+    
+    if (op === 'IN') {
+        const items = node.right.expr.items.map(convertOperand);
+        return callExpression(identifier('inList'), [
+            convertOperand(node.left),
+            ...items,
+        ]);
+    }
+    
+    const jsOp = SQL_TO_JS_OP[op] ?? '===';
+    
+    return binaryExpression(
+        jsOp,
+        convertOperand(node.left),
+        convertOperand(node.right),
+    );
+};
+
 const convertCondition = (node) => {
     if (node.operator?.name === 'AND')
         return logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
@@ -33,7 +100,7 @@ const convertCondition = (node) => {
     if (node.operator?.name === 'OR')
         return logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
     
-    return binaryExpression('===', convertOperand(node.left), convertOperand(node.right));
+    return convertBinary(node);
 };
 
 const convertOn = (spec) => callExpression(identifier('on'), [

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

@@ -1,4 +1,5 @@
 import {types} from '@putout/babel';
+import {convertOperand} from '#parser/clause/operand';
 import {convertSet} from '#parser/clause/set';
 import {convertSelect} from '#parser/clause/select';
 import {findClause} from '#parser/clause/find';
@@ -38,10 +39,7 @@ const convertSource = (vc) => {
         return convertSelect(vc);
     
     const vals = vc.values.items[0].expr.items;
-    const valArgs = [];
-    
-    for (const p of vals)
-        valArgs.push(stringLiteral(p.text));
+    const valArgs = vals.map(convertOperand);
     
     return callExpression(identifier('values'), valArgs);
 };

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

@@ -4,6 +4,8 @@ const {
     identifier,
     stringLiteral,
     numericLiteral,
+    booleanLiteral,
+    nullLiteral,
     memberExpression,
 } = types;
 
@@ -20,5 +22,11 @@ export const convertOperand = (node) => {
     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);
 };

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

@@ -0,0 +1,3 @@
+[
+    select(':arg_name', id, from(t)),
+];

package/lib/parser/visitors/clause/select/fixture/select-param.sql

@@ -0,0 +1 @@
+SELECT :arg_name, id FROM t

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

@@ -29,6 +29,9 @@ const convertColumn = (column) => {
     if (column.type === 'member_expr')
         return memberExpression(identifier(column.object.name), identifier(column.property.name));
     
+    if (column.type === 'parameter')
+        return stringLiteral(column.text);
+    
     return identifier(column.name);
 };
 

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x > 1 && y < 2)),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x > 1 AND y < 2

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x >= 1)),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x >= 1

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(inList(x, 1, 2, 3))),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x IN (1, 2, 3)

package/lib/parser/visitors/clause/where/fixture/where-is-not-null-fix.js

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(isNotNull(x))),
+];

package/lib/parser/visitors/clause/where/fixture/where-is-not-null.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x IS NOT NULL

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(isNull(x))),
+];

package/lib/parser/visitors/clause/where/fixture/where-is-null.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x IS NULL

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(like(x, ':pattern'))),
+];

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

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x LIKE :pattern

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x !== ':y')),
+];

package/lib/parser/visitors/clause/where/fixture/where-not-eq.sql

@@ -0,0 +1 @@
+SELECT * FROM t WHERE x != :y

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

@@ -1,18 +1,73 @@
 import {types} from '@putout/babel';
 import {convertOperand} from '#parser/clause/operand';
 
+const isString = (a) => typeof a === 'string';
+
 const {
     logicalExpression,
     identifier,
     callExpression,
+    binaryExpression,
 } = types;
 
+const opName = (op) => {
+    if (Array.isArray(op))
+        return op
+            .map((k) => k.name)
+            .join(' ');
+    
+    if (isString(op))
+        return op;
+    
+    return op?.name ?? '';
+};
+
+const SQL_TO_JS_OP = {
+    '=': '===',
+    '!=': '!==',
+    '>=': '>=',
+    '<=': '<=',
+    '>': '>',
+    '<': '<',
+};
+
 const convertAnd = (node) => logicalExpression('&&', convertCondition(node.left), convertCondition(node.right));
 const convertOr = (node) => logicalExpression('||', convertCondition(node.left), convertCondition(node.right));
 
-const convertEq = (node) => {
-    const {binaryExpression} = types;
-    return binaryExpression('===', convertOperand(node.left), convertOperand(node.right));
+const convertBinary = (node) => {
+    const op = opName(node.operator);
+    
+    if (op === 'LIKE')
+        return callExpression(identifier('like'), [
+            convertOperand(node.left),
+            convertOperand(node.right),
+        ]);
+    
+    if (op === 'IS')
+        return callExpression(identifier('isNull'), [
+            convertOperand(node.left),
+        ]);
+    
+    if (op === 'IS NOT')
+        return callExpression(identifier('isNotNull'), [
+            convertOperand(node.left),
+        ]);
+    
+    if (op === 'IN') {
+        const items = node.right.expr.items.map(convertOperand);
+        return callExpression(identifier('inList'), [
+            convertOperand(node.left),
+            ...items,
+        ]);
+    }
+    
+    const jsOp = SQL_TO_JS_OP[op] ?? '===';
+    
+    return binaryExpression(
+        jsOp,
+        convertOperand(node.left),
+        convertOperand(node.right),
+    );
 };
 
 const convertCondition = (node) => {
@@ -22,7 +77,7 @@ const convertCondition = (node) => {
     if (node.operator?.name === 'OR')
         return convertOr(node);
     
-    return convertEq(node);
+    return convertBinary(node);
 };
 
 export const convertWhere = (node) => callExpression(identifier('where'), [

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

@@ -6,6 +6,6 @@ export const ArrayExpression = (path, {write, traverse}) => {
         traverse(el);
         
         if (i < n)
-            write('\n');
+            write(';\n');
     }
 };

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

@@ -1,5 +1,13 @@
+const JS_TO_SQL_OP = {
+    '===': '=',
+    '!==': '!=',
+};
+
 export const BinaryExpression = (path, {write, traverse}) => {
     traverse(path.get('left'));
-    write(' = ');
+    
+    const op = path.node.operator;
+    
+    write(` ${JS_TO_SQL_OP[op] ?? op} `);
     traverse(path.get('right'));
 };

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

@@ -22,6 +22,9 @@ import {serial} from './serial/serial.js';
 import {primaryKey} from './primary-key/primary-key.js';
 import {lastInsertRowid} from './last-insert-rowid/last-insert-rowid.js';
 import {lastval} from './lastval/lastval.js';
+import {like} from './like/like.js';
+import {isNull, isNotNull} from './is-null/is-null.js';
+import {inList} from './in-list/in-list.js';
 
 export const clauses = {
     join,
@@ -48,4 +51,8 @@ export const clauses = {
     primaryKey,
     lastInsertRowid,
     lastval,
+    like,
+    isNull,
+    isNotNull,
+    inList,
 };

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

@@ -0,0 +1,15 @@
+export const inList = (path, {write, traverse}) => {
+    const [head, ...items] = path.get('arguments');
+    
+    traverse(head);
+    write(' IN (');
+    
+    for (let i = 0; i < items.length; i++) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(items[i]);
+    }
+    
+    write(')');
+};

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

@@ -0,0 +1,11 @@
+export const isNull = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    traverse(args[0]);
+    write(' IS NULL');
+};
+
+export const isNotNull = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    traverse(args[0]);
+    write(' IS NOT NULL');
+};

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

@@ -0,0 +1,6 @@
+export const like = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    traverse(args[0]);
+    write(' LIKE ');
+    traverse(args[1]);
+};

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x >= 1

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x >= 1)),
+];

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x IN (1, 2, 3)

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(inList(x, 1, 2, 3))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-not-null-fix.sql

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x IS NOT NULL

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(isNotNull(x))),
+];

package/lib/printer/visitors/call-expression/clauses/where/fixture/where-is-null-fix.sql

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x IS NULL

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(isNull(x))),
+];

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x LIKE :pattern

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(like(x, ':pattern'))),
+];

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

@@ -0,0 +1,3 @@
+SELECT *
+FROM t
+WHERE x != :y

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

@@ -0,0 +1,3 @@
+[
+    select('*', from(t), where(x !== ':y')),
+];

package/package.json

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