happy-sql 1.3.0 → 1.5.0

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

@@ -0,0 +1,15 @@
+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);
+};

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

@@ -0,0 +1 @@
+export const autoIncrement = (path, {write}) => write('AUTOINCREMENT');

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,11 +9,23 @@ 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';
+import {as} from './as/as.js';
+import {withNamed} from './with-named/with-named.js';
+import {createTable} from './create-table/create-table.js';
+import {column} from './column/column.js';
+import {autoIncrement} from './auto-increment/auto-increment.js';
+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';
 
 export const clauses = {
+    join,
+    on,
     count,
     from,
     select,
@@ -22,6 +36,16 @@ export const clauses = {
     onConflict,
     update,
     set,
-    delete: del,
+    deleteFrom,
     section,
+    returning,
+    as,
+    withNamed,
+    createTable,
+    column,
+    autoIncrement,
+    serial,
+    primaryKey,
+    lastInsertRowid,
+    lastval,
 };

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

@@ -0,0 +1,10 @@
+export const column = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i > 0)
+            write(' ');
+        
+        traverse(arg);
+    }
+};

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/create-table.js

@@ -0,0 +1,18 @@
+export const createTable = (path, {write, traverse}) => {
+    const [name, columns] = path.get('arguments');
+    
+    write('CREATE TABLE ');
+    traverse(name);
+    write(' (');
+    
+    const elements = columns.get('elements');
+    
+    for (const [i, element] of elements.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(element);
+    }
+    
+    write(')');
+};

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

@@ -0,0 +1 @@
+CREATE TABLE t (id INTEGER PRIMARY KEY AUTOINCREMENT)

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-fix.sql

@@ -0,0 +1 @@
+CREATE TABLE t (id SERIAL PRIMARY KEY)

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/insert/insert.js

@@ -1,9 +1,12 @@
 export const insert = (path, {write, traverse}) => {
     const args = path.get('arguments');
-    traverse(args[0]);
+    const [intoArg] = args;
+    const rest = args.slice(1);
     
-    if (args[1]) {
+    traverse(intoArg);
+    
+    for (const arg of rest) {
         write(' ');
-        traverse(args[1]);
+        traverse(arg);
     }
 };

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-fix.sql

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

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/last-insert-rowid/last-insert-rowid.js

@@ -0,0 +1 @@
+export const lastInsertRowid = (path, {write}) => write('last_insert_rowid()');

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

@@ -0,0 +1,2 @@
+SELECT LASTVAL()
+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/lastval/lastval.js

@@ -0,0 +1 @@
+export const lastval = (path, {write}) => write('LASTVAL()');

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/primary-key/primary-key.js

@@ -0,0 +1 @@
+export const primaryKey = (path, {write}) => write('PRIMARY KEY');

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

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

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

@@ -0,0 +1 @@
+INSERT INTO CallExpression (parent_id) VALUES (:parent_id) 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-fix.sql

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

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/returning/returning.js

@@ -0,0 +1,11 @@
+export const returning = (path, {write, traverse}) => {
+    write('RETURNING ');
+    const args = path.get('arguments');
+    
+    for (const [i, arg] of args.entries()) {
+        if (i > 0)
+            write(', ');
+        
+        traverse(arg);
+    }
+};

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

@@ -0,0 +1,7 @@
+-- @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-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/section/section.js

@@ -1,6 +1,19 @@
 export const section = (path, {write, traverse}) => {
     const [name, stmt] = path.get('arguments');
     write(`-- ${name.node.value}\n`);
+    
+    if (stmt.node.type === 'ArrayExpression') {
+        const elements = stmt.get('elements');
+        const lastIndex = elements.length - 1;
+        
+        for (const [i, element] of elements.entries()) {
+            traverse(element);
+            write(i < lastIndex ? ';\n' : ';');
+        }
+        
+        return;
+    }
+    
     traverse(stmt);
     write(';');
 };

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/serial/serial.js

@@ -0,0 +1 @@
+export const serial = (path, {write}) => write('SERIAL');

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-fix.sql

@@ -0,0 +1,10 @@
+WITH
+    call AS (
+        INSERT INTO CallExpression (parent_id) VALUES (:parent_id) RETURNING id
+    ),
+    member AS (
+        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/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/call-expression/clauses/with-named/with-named.js

@@ -0,0 +1,21 @@
+const isAssignment = (arg) => arg.node.type === 'AssignmentExpression';
+
+export const withNamed = (path, {write, traverse}) => {
+    const args = path.get('arguments');
+    const namedQueries = args.filter(isAssignment);
+    const finalStatement = args.at(-1);
+    
+    write('WITH\n');
+    const last = namedQueries.length - 1;
+    
+    for (const [i, query] of namedQueries.entries()) {
+        write('    ');
+        write(query.get('left').node.name);
+        write(' AS (\n        ');
+        traverse(query.get('right'));
+        write('\n    )');
+        write(i < last ? ',\n' : '\n');
+    }
+    
+    traverse(finalStatement);
+};

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.3.0",
+  "version": "1.5.0",
   "type": "module",
   "description": "sql to js ast parser and printer",
   "exports": {
@@ -24,6 +24,9 @@
     "#parser/clause/insert": "./lib/parser/visitors/clause/insert/insert.js",
     "#parser/clause/update": "./lib/parser/visitors/clause/update/update.js",
     "#parser/clause/delete": "./lib/parser/visitors/clause/delete/delete.js",
+    "#parser/clause/with-named": "./lib/parser/visitors/clause/with-named/with-named.js",
+    "#parser/clause/create-table": "./lib/parser/visitors/clause/create-table/create-table.js",
+    "#parser/clause/column-definition": "./lib/parser/visitors/clause/column-definition/column-definition.js",
     "#printer": "./lib/printer/printer.js",
     "#printer/test": "./test/create-printer-test.js"
   },
@@ -61,27 +64,27 @@
   },
   "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",
-    "try-catch": "^4.0.9"
+    "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"
+    "sql-parser-cst": "^0.42.1",
+    "try-catch": "^4.0.9"
   }
 }