rado 0.1.50 → 0.1.52

package/dist/define/Cursor.js

@@ -31,7 +31,7 @@ var Cursor = class {
 function addWhere(query, where) {
   const conditions = where.slice();
   if (query.where)
-    conditions.push(query.where);
+    conditions.push(new Expr(query.where));
   return {
     ...query,
     where: Expr.and(...conditions).expr

package/dist/driver/better-sqlite3.js

@@ -1,5 +1,6 @@
 // src/driver/better-sqlite3.ts
 import { Driver } from "../lib/Driver.js";
+import { SqlError } from "../lib/SqlError.js";
 import { SqliteFormatter } from "../sqlite/SqliteFormatter.js";
 import { SqliteSchema } from "../sqlite/SqliteSchema.js";
 var PreparedStatement = class {
@@ -32,7 +33,11 @@ var BetterSqlite3Driver = class extends Driver.Sync {
   tableData;
   indexData;
   prepareStatement(stmt) {
-    return new PreparedStatement(this.db.prepare(stmt.sql));
+    try {
+      return new PreparedStatement(this.db.prepare(stmt.sql));
+    } catch (e) {
+      throw new SqlError(e, stmt.sql);
+    }
   }
   schemaInstructions(tableName) {
     const columnData = this.tableData(tableName);

package/dist/driver/bun-sqlite.js

@@ -2,6 +2,7 @@
 import { Cursor } from "../define/Cursor.js";
 import { Query } from "../define/Query.js";
 import { Driver } from "../lib/Driver.js";
+import { SqlError } from "../lib/SqlError.js";
 import { SqliteFormatter } from "../sqlite/SqliteFormatter.js";
 import { SqliteSchema } from "../sqlite/SqliteSchema.js";
 var PreparedStatement = class {
@@ -47,7 +48,11 @@ var BunSqliteDriver = class extends Driver.Sync {
   indexData;
   lastChanges;
   prepareStatement(stmt) {
-    return new PreparedStatement(this.lastChanges, this.db.prepare(stmt.sql));
+    try {
+      return new PreparedStatement(this.lastChanges, this.db.prepare(stmt.sql));
+    } catch (e) {
+      throw new SqlError(e, stmt.sql);
+    }
   }
   schemaInstructions(tableName) {
     const columnData = this.tableData(tableName);

package/dist/driver/sql.js.js

@@ -1,5 +1,6 @@
 // src/driver/sql.js.ts
 import { Driver } from "../lib/Driver.js";
+import { SqlError } from "../lib/SqlError.js";
 import { SqliteFormatter } from "../sqlite/SqliteFormatter.js";
 import { SqliteSchema } from "../sqlite/SqliteSchema.js";
 var PreparedStatement = class {
@@ -43,11 +44,15 @@ var SqlJsDriver = class extends Driver.Sync {
   tableData;
   indexData;
   prepareStatement(stmt, discardAfter) {
-    return new PreparedStatement(
-      this.db,
-      this.db.prepare(stmt.sql),
-      discardAfter
-    );
+    try {
+      return new PreparedStatement(
+        this.db,
+        this.db.prepare(stmt.sql),
+        discardAfter
+      );
+    } catch (e) {
+      throw new SqlError(e, stmt.sql);
+    }
   }
   schemaInstructions(tableName) {
     const columnData = this.tableData(tableName);

package/dist/driver/sqlite3.js

@@ -1,5 +1,6 @@
 // src/driver/sqlite3.ts
 import { Driver } from "../lib/Driver.js";
+import { SqlError } from "../lib/SqlError.js";
 import { SqliteFormatter } from "../sqlite/SqliteFormatter.js";
 import { SqliteSchema } from "../sqlite/SqliteSchema.js";
 var PreparedStatement = class {
@@ -93,7 +94,11 @@ var Sqlite3Driver = class extends Driver.Async {
     return super.executeQuery(query, stmt, params);
   }
   prepareStatement(stmt) {
-    return new PreparedStatement(this.db.prepare(stmt.sql));
+    try {
+      return new PreparedStatement(this.db.prepare(stmt.sql));
+    } catch (e) {
+      throw new SqlError(e, stmt.sql);
+    }
   }
   async schemaInstructions(tableName) {
     const columnData = await this.tableData(tableName);

package/dist/index.d.ts

@@ -17,4 +17,5 @@ export * from './define/Update';
 export type { Driver } from './lib/Driver';
 export type { FormatContext, Formatter } from './lib/Formatter';
 export type { Sanitizer } from './lib/Sanitizer';
+export * from './lib/SqlError';
 export type { Statement } from './lib/Statement';

package/dist/index.js

@@ -15,3 +15,4 @@ export * from "./define/Selection.js";
 export * from "./define/Table.js";
 export * from "./define/Target.js";
 export * from "./define/Update.js";
+export * from "./lib/SqlError.js";

package/dist/lib/Formatter.js

@@ -72,7 +72,7 @@ var Formatter = class {
   }
   formatSelect(ctx, query) {
     const { stmt, topLevel } = ctx;
-    stmt.add("SELECT").space();
+    stmt.raw("SELECT").space();
     this.formatSelection(
       { ...ctx, topLevel: false },
       query.selection,
@@ -96,8 +96,11 @@ var Formatter = class {
     for (const column of stmt.call(columns))
       this.formatString(ctx, column.name);
     stmt.add("VALUES");
-    for (const row of stmt.separate(query.data))
-      this.formatInsertRow(ctx, query.into.columns, row);
+    if (query.data.length === 0)
+      stmt.add("()");
+    else
+      for (const row of stmt.separate(query.data))
+        this.formatInsertRow(ctx, query.into.columns, row);
     if (query.selection) {
       stmt.add("RETURNING").space();
       this.formatSelection(ctx, query.selection, formatAsResultObject);
@@ -325,14 +328,14 @@ var Formatter = class {
       case TargetType.Table:
         stmt.identifier(target.table.name);
         if (target.table.alias)
-          stmt.raw("AS").addIdentifier(target.table.alias);
+          stmt.add("AS").addIdentifier(target.table.alias);
         return stmt;
       case TargetType.Join:
         const { left, right, joinType } = target;
         this.formatTarget(ctx, left);
-        stmt.addLine(joins[joinType]).add("JOIN");
+        stmt.addLine(joins[joinType]).add("JOIN").space();
         this.formatTarget(ctx, right);
-        stmt.add("ON");
+        stmt.add("ON").space();
         this.formatExprValue(ctx, target.on);
         return stmt;
       case TargetType.Query:
@@ -340,7 +343,7 @@ var Formatter = class {
         this.format(ctx, target.query);
         stmt.closeParenthesis();
         if (target.alias)
-          stmt.raw("AS").addIdentifier(target.alias);
+          stmt.add("AS").addIdentifier(target.alias);
         return stmt;
       case TargetType.Expr:
         throw new Error("Cannot format expression as target");
@@ -375,7 +378,7 @@ var Formatter = class {
     const { stmt } = ctx;
     if (!orderBy)
       return stmt;
-    stmt.newline().raw("ORDER BY");
+    stmt.newline().raw("ORDER BY").space();
     for (const { expr, order } of stmt.separate(orderBy)) {
       this.formatExprValue(ctx, expr);
       stmt.add(order === OrderDirection.Asc ? "ASC" : "DESC");
@@ -572,7 +575,7 @@ var Formatter = class {
           this.format(ctx, expr.query);
           return stmt.closeParenthesis().closeParenthesis();
         }
-        stmt.openParenthesis().raw("SELECT json_group_array(json(result))").newline().raw("FROM").openParenthesis();
+        stmt.openParenthesis().raw("SELECT json_group_array(json(result))").newline().raw("FROM").space().openParenthesis();
         this.format(ctx, expr.query);
         return stmt.closeParenthesis().closeParenthesis();
       case ExprType.Row:

package/dist/lib/SqlError.d.ts

@@ -0,0 +1,3 @@
+export declare class SqlError extends Error {
+    constructor(cause: Error, sql: string);
+}

package/dist/lib/SqlError.js

@@ -0,0 +1,11 @@
+// src/lib/SqlError.ts
+var SqlError = class extends Error {
+  constructor(cause, sql) {
+    super(`${sql}
+\u2502
+\u2514\u2500\u2500\u2500\u2500 ${cause}`, { cause });
+  }
+};
+export {
+  SqlError
+};

package/dist/lib/Statement.js

@@ -24,7 +24,7 @@ var Statement = class {
   addLine(addition) {
     if (!addition)
       return this;
-    return this.newline().add(addition);
+    return this.newline().raw(addition);
   }
   indent() {
     this.currentIndent = this.currentIndent + "  ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",