rado 1.0.0-preview.5 → 1.0.0

package/dist/core/Builder.d.ts

@@ -1,4 +1,4 @@
-import { internalData, type HasQuery, type HasSql, type HasTable, type HasTarget } from './Internal.js';
+import { type HasQuery, type HasSql, type HasTarget, internalData } from './Internal.js';
 import type { IsPostgres, QueryMeta } from './MetaData.js';
 import type { QueryData } from './Query.js';
 import { type SelectionInput } from './Selection.js';
@@ -18,7 +18,7 @@ declare class BuilderBase<Meta extends QueryMeta> {
     selectDistinctOn<Input extends SelectionInput>(this: Builder<IsPostgres>, columns: Array<HasSql>, selection: Input): WithSelection<Input, Meta>;
     update<Definition extends TableDefinition>(table: Table<Definition>): UpdateTable<Definition, Meta>;
     insert<Definition extends TableDefinition>(into: Table<Definition>): InsertInto<Definition, Meta>;
-    delete(from: HasTable): DeleteFrom<Meta>;
+    delete<Definition extends TableDefinition>(from: Table<Definition>): DeleteFrom<Definition, Meta>;
 }
 export type CTE<Input = unknown> = Input & HasTarget & HasQuery;
 export declare class Builder<Meta extends QueryMeta> extends BuilderBase<Meta> {

package/dist/core/expr/Conditions.d.ts

@@ -1,6 +1,6 @@
 import { type HasSql } from '../Internal.js';
 import { type Sql } from '../Sql.js';
-import type { SelectBase } from '../query/Select.js';
+import type { Select } from '../query/Select.js';
 import { type Input } from './Input.js';
 export declare const eq: <T>(left: Input<T>, right: Input<T>) => Sql<boolean>;
 export declare const ne: <T>(left: Input<T>, right: Input<T>) => Sql<boolean>;
@@ -29,4 +29,4 @@ export declare function desc<T>(input: HasSql<T>): Sql;
 export declare function distinct<T>(input: HasSql<T>): Sql;
 export declare function when<In, Out>(compare: Input<In>, ...cases: Array<[condition: Input<In>, result: Input<Out>] | Input<Out>>): Sql<Out>;
 export declare function when<Out>(...cases: Array<[condition: Input<boolean>, result: Input<Out>] | Input<Out>>): Sql<Out>;
-export declare function exists<T>(query: SelectBase<T>): Sql<boolean>;
+export declare function exists<T>(query: Select<T>): Sql<boolean>;

package/dist/core/query/Delete.d.ts

@@ -1,8 +1,9 @@
-import { internalData, internalQuery, internalSelection, type HasSql, type HasTable } from '../Internal.js';
-import type { QueryMeta } from '../MetaData.js';
+import { type HasSql, type HasTable, internalData, internalQuery, internalSelection } from '../Internal.js';
+import type { IsPostgres, IsSqlite, QueryMeta } from '../MetaData.js';
 import { Query, type QueryData } from '../Query.js';
 import { type Selection, type SelectionInput, type SelectionRow } from '../Selection.js';
 import { type Sql } from '../Sql.js';
+import type { TableDefinition, TableRow } from '../Table.js';
 export interface DeleteData<Meta extends QueryMeta = QueryMeta> extends QueryData<Meta> {
     from: HasTable;
     where?: HasSql;
@@ -14,7 +15,8 @@ export declare class Delete<Result, Meta extends QueryMeta = QueryMeta> extends
     constructor(data: DeleteData<Meta>);
     get [internalQuery](): Sql;
 }
-export declare class DeleteFrom<Meta extends QueryMeta> extends Delete<void, Meta> {
-    where(condition: HasSql<boolean>): DeleteFrom<Meta>;
-    returning<Input extends SelectionInput>(returning: Input): Delete<SelectionRow<Input>, Meta>;
+export declare class DeleteFrom<Definition extends TableDefinition, Meta extends QueryMeta> extends Delete<void, Meta> {
+    where(...where: Array<HasSql<boolean> | undefined>): DeleteFrom<Definition, Meta>;
+    returning(this: DeleteFrom<Definition, IsPostgres | IsSqlite>): Delete<TableRow<Definition>, Meta>;
+    returning<Input extends SelectionInput>(this: DeleteFrom<Definition, IsPostgres | IsSqlite>, returning: Input): Delete<SelectionRow<Input>, Meta>;
 }

package/dist/core/query/Delete.js

@@ -10,6 +10,7 @@ import {
   selection
 } from "../Selection.js";
 import { sql } from "../Sql.js";
+import { and } from "../expr/Conditions.js";
 var Delete = class extends Query {
   [internalData];
   constructor(data) {
@@ -23,13 +24,14 @@ var Delete = class extends Query {
   }
 };
 var DeleteFrom = class _DeleteFrom extends Delete {
-  where(condition) {
-    return new _DeleteFrom({ ...getData(this), where: condition });
+  where(...where) {
+    return new _DeleteFrom({ ...getData(this), where: and(...where) });
   }
   returning(returning) {
+    const data = getData(this);
     return new Delete({
-      ...getData(this),
-      returning: selection(returning)
+      ...data,
+      returning: selection(returning ?? data.from)
     });
   }
 };

package/dist/core/query/Select.d.ts

@@ -1,4 +1,4 @@
-import { internalData, internalQuery, internalSelection, type HasSelection, type HasSql, type HasTable, type HasTarget } from '../Internal.js';
+import { type HasSelection, type HasSql, type HasTable, type HasTarget, internalData, internalQuery, internalSelection } from '../Internal.js';
 import type { QueryMeta } from '../MetaData.js';
 import type { Query } from '../Query.js';
 import { type IsNullable, type MakeNullable, type Selection, type SelectionRecord, type SelectionRow } from '../Selection.js';
@@ -35,7 +35,7 @@ export declare class Select<Input, Meta extends QueryMeta = QueryMeta> extends U
     rightJoin(right: HasTable, on: HasSql<boolean>): Select<Input, Meta>;
     innerJoin(right: HasTable, on: HasSql<boolean>): Select<Input, Meta>;
     fullJoin(right: HasTable, on: HasSql<boolean>): Select<Input, Meta>;
-    where(...where: Array<HasSql<boolean>>): Select<Input, Meta>;
+    where(...where: Array<HasSql<boolean> | undefined>): Select<Input, Meta>;
     groupBy(...exprs: Array<HasSql>): Select<Input, Meta>;
     having(having: HasSql<boolean>): Select<Input, Meta>;
     orderBy(...exprs: Array<HasSql>): Select<Input, Meta>;

package/dist/core/query/Update.d.ts

@@ -18,7 +18,7 @@ export declare class Update<Result, Meta extends QueryMeta = QueryMeta> extends
 }
 export declare class UpdateTable<Definition extends TableDefinition, Meta extends QueryMeta> extends Update<void, Meta> {
     set(values: TableUpdate<Definition>): UpdateTable<Definition, Meta>;
-    where(where: HasSql<boolean>): UpdateTable<Definition, Meta>;
+    where(...where: Array<HasSql<boolean> | undefined>): UpdateTable<Definition, Meta>;
     returning(this: UpdateTable<Definition, IsPostgres | IsSqlite>): Update<TableRow<Definition>, Meta>;
     returning<Input extends SelectionInput>(this: UpdateTable<Definition, IsPostgres | IsSqlite>, returning?: Input): Update<SelectionRow<Input>, Meta>;
 }

package/dist/core/query/Update.js

@@ -11,6 +11,7 @@ import {
   selection
 } from "../Selection.js";
 import { sql } from "../Sql.js";
+import { and } from "../expr/Conditions.js";
 import { input } from "../expr/Input.js";
 var Update = class extends Query {
   [internalData];
@@ -39,8 +40,11 @@ var UpdateTable = class _UpdateTable extends Update {
     );
     return new _UpdateTable({ ...getData(this), set });
   }
-  where(where) {
-    return new _UpdateTable({ ...getData(this), where });
+  where(...where) {
+    return new _UpdateTable({
+      ...getData(this),
+      where: and(...where)
+    });
   }
   returning(returning) {
     const data = getData(this);

package/dist/driver/mysql2.js

@@ -2,6 +2,7 @@
 import { AsyncDatabase } from "../core/Database.js";
 import { mysqlDialect } from "../mysql/dialect.js";
 import { mysqlDiff } from "../mysql/diff.js";
+import { setTransaction, startTransaction } from "../mysql/transactions.js";
 var PreparedStatement = class {
   constructor(client, sql, name) {
     this.client = client;
@@ -54,7 +55,14 @@ var Mysql2Driver = class _Mysql2Driver {
     const client = isPool(this.client) ? await this.client.getConnection() : this.client;
     const driver = new _Mysql2Driver(client, this.depth + 1);
     try {
-      await client.query(this.depth > 0 ? `savepoint d${this.depth}` : "begin");
+      await client.query(
+        this.depth > 0 ? `savepoint d${this.depth}` : startTransaction(options)
+      );
+      if (this.depth === 0) {
+        const setOptions = setTransaction(options);
+        if (setOptions)
+          await client.query(setOptions);
+      }
       const result = await run(driver);
       await client.query(
         this.depth > 0 ? `release savepoint d${this.depth}` : "commit"

package/dist/driver/pg.js

@@ -2,6 +2,7 @@
 import { AsyncDatabase } from "../core/Database.js";
 import { postgresDialect } from "../postgres/dialect.js";
 import { postgresDiff } from "../postgres/diff.js";
+import { setTransaction } from "../postgres/transactions.js";
 var PreparedStatement = class {
   constructor(client, sql, name) {
     this.client = client;
@@ -69,6 +70,8 @@ var PgDriver = class _PgDriver {
     const client = "totalCount" in this.client ? await this.client.connect() : this.client;
     try {
       await client.query(this.depth > 0 ? `savepoint d${this.depth}` : "begin");
+      if (this.depth === 0)
+        await client.query(setTransaction(options));
       const result = await run(new _PgDriver(client, this.depth + 1));
       await client.query(
         this.depth > 0 ? `release savepoint d${this.depth}` : "commit"

package/dist/driver/pglite.js

@@ -2,6 +2,7 @@
 import { AsyncDatabase } from "../index.js";
 import { postgresDialect } from "../postgres/dialect.js";
 import { postgresDiff } from "../postgres/diff.js";
+import { setTransaction } from "../postgres/transactions.js";
 var PreparedStatement = class {
   constructor(client, sql) {
     this.client = client;
@@ -59,7 +60,8 @@ var PGliteDriver = class _PGliteDriver {
   }
   async transaction(run, options) {
     if (this.depth === 0 && "transaction" in this.client)
-      return this.client.transaction((tx) => {
+      return this.client.transaction(async (tx) => {
+        await tx.query(setTransaction(options));
         return run(new _PGliteDriver(tx, this.depth + 1));
       });
     await this.exec(`savepoint d${this.depth}`);

package/dist/mysql/transactions.d.ts

@@ -0,0 +1,3 @@
+import type { TransactionOptions } from '../core/Database.js';
+export declare function startTransaction(options: TransactionOptions['mysql']): string;
+export declare function setTransaction(options: TransactionOptions['mysql']): string | undefined;

package/dist/mysql/transactions.js

@@ -0,0 +1,20 @@
+// src/mysql/transactions.ts
+function startTransaction(options) {
+  return [
+    "start transaction",
+    options.withConsistentSnapshot && "with consistent snapshot",
+    options.accessMode
+  ].filter(Boolean).join(" ");
+}
+function setTransaction(options) {
+  if (!options.isolationLevel)
+    return;
+  return [
+    "set transaction",
+    options.isolationLevel && `isolation level ${options.isolationLevel}`
+  ].filter(Boolean).join(" ");
+}
+export {
+  setTransaction,
+  startTransaction
+};

package/dist/postgres/transactions.d.ts

@@ -0,0 +1,2 @@
+import type { TransactionOptions } from '../core/Database.js';
+export declare function setTransaction(options: TransactionOptions['postgres']): string;

package/dist/postgres/transactions.js

@@ -0,0 +1,12 @@
+// src/postgres/transactions.ts
+function setTransaction(options) {
+  return [
+    "set transaction",
+    options.isolationLevel && `isolation level ${options.isolationLevel}`,
+    options.accessMode,
+    options.deferrable ? "deferrable" : "not deferrable"
+  ].filter(Boolean).join(" ");
+}
+export {
+  setTransaction
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "1.0.0-preview.5",
+  "version": "1.0.0",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -39,7 +39,7 @@
     "better-sqlite3": "^11.0.0",
     "esbuild": "^0.18.11",
     "glob": "^8.0.3",
-    "madge": "^6.1.0",
+    "madge": "^8.0.0",
     "mysql2": "^3.9.7",
     "pg": "^8.11.5",
     "rimraf": "^4.1.2",