rado 0.2.32 → 0.2.33

package/dist/define/Ops.d.ts

@@ -2,7 +2,7 @@ import { Selection } from './Selection.js';
 import { Table } from './Table.js';
 import { Batch } from './query/Batch.js';
 import { Delete } from './query/Delete.js';
-import { Insert } from './query/Insert.js';
+import { InsertInto } from './query/Insert.js';
 import { Select } from './query/Select.js';
 import { RecursiveUnion } from './query/Union.js';
 import { Update } from './query/Update.js';
@@ -10,7 +10,7 @@ export declare function withRecursive<Row>(initialSelect: Select<Row>): Recursiv
 export declare function alias<T extends Table<{}>>(table: T): Record<string, T>;
 export declare function select<X extends Selection>(selection: X): Select<Selection.Infer<X>>;
 export declare function from<Row>(source: Table<Row> | Select<Row>): Select<Row>;
-export declare function update<Row>(table: Table<Row>): Update<Row>;
-export declare function insertInto<Row>(table: Table<Row>): Insert<Row>;
+export declare function update<Definition>(table: Table<Definition>): Update<Definition>;
+export declare function insertInto<Definition>(table: Table<Definition>): InsertInto<Definition>;
 export declare function deleteFrom<Row>(table: Table<Row>): Delete;
 export declare function create(...tables: Array<Table<any>>): Batch;

package/dist/define/Ops.js

@@ -5,7 +5,7 @@ import { Table, createTable } from "./Table.js";
 import { Target } from "./Target.js";
 import { Batch } from "./query/Batch.js";
 import { Delete } from "./query/Delete.js";
-import { Insert } from "./query/Insert.js";
+import { InsertInto } from "./query/Insert.js";
 import { Select } from "./query/Select.js";
 import { RecursiveUnion } from "./query/Union.js";
 import { Update } from "./query/Update.js";
@@ -36,10 +36,12 @@ function from(source) {
   );
 }
 function update(table) {
-  return new Update(new QueryData.Update({ table: table[Table.Data] }));
+  return new Update(
+    new QueryData.Update({ table: table[Table.Data] })
+  );
 }
 function insertInto(table) {
-  return new Insert(table[Table.Data]);
+  return new InsertInto(table[Table.Data]);
 }
 function deleteFrom(table) {
   return new Delete(new QueryData.Delete({ table: table[Table.Data] }));

package/dist/define/query/Insert.d.ts

@@ -2,18 +2,21 @@ import { Query, QueryData } from '../Query.js';
 import { Selection } from '../Selection.js';
 import { Table, TableData } from '../Table.js';
 import { Select } from './Select.js';
-export declare class InsertValuesReturning<T> extends Query<T> {
-}
-export declare class Inserted extends Query<{
+export declare class Insert<T = {
     rowsAffected: number;
-}> {
+}> extends Query<T> {
+    [Query.Data]: QueryData.Insert;
+    constructor(query: QueryData.Insert);
+    returning<X extends Selection>(selection: X): Insert<Array<Selection.Infer<X>>>;
+}
+export declare class InsertOne<T> extends Query<T> {
     [Query.Data]: QueryData.Insert;
     constructor(query: QueryData.Insert);
-    returning<X extends Selection>(selection: X): InsertValuesReturning<Selection.Infer<X>>;
+    returning<X extends Selection>(selection: X): Insert<Selection.Infer<X>>;
 }
-export declare class Insert<Definition> {
+export declare class InsertInto<Definition> {
     protected into: TableData;
     constructor(into: TableData);
-    selection(query: Select<Table.Select<Definition>>): Inserted;
-    values(...data: Array<Table.Insert<Definition>>): Inserted;
+    selection(query: Select<Table.Select<Definition>>): Insert;
+    values(...data: Array<Table.Insert<Definition>>): Insert;
 }

package/dist/define/query/Insert.js

@@ -1,13 +1,11 @@
 import { ExprData } from "../Expr.js";
 import { Query, QueryData } from "../Query.js";
-class InsertValuesReturning extends Query {
-}
-class Inserted extends Query {
+class Insert extends Query {
   constructor(query) {
     super(query);
   }
   returning(selection) {
-    return new InsertValuesReturning(
+    return new Insert(
       new QueryData.Insert({
         ...this[Query.Data],
         selection: ExprData.create(selection)
@@ -15,21 +13,35 @@ class Inserted extends Query {
     );
   }
 }
-class Insert {
+class InsertOne extends Query {
+  constructor(query) {
+    super(query);
+  }
+  returning(selection) {
+    return new Insert(
+      new QueryData.Insert({
+        ...this[Query.Data],
+        selection: ExprData.create(selection),
+        singleResult: true
+      })
+    );
+  }
+}
+class InsertInto {
   constructor(into) {
     this.into = into;
   }
   selection(query) {
-    return new Inserted(
+    return new Insert(
       new QueryData.Insert({ into: this.into, select: query[Query.Data] })
     );
   }
   values(...data) {
-    return new Inserted(new QueryData.Insert({ into: this.into, data }));
+    return new Insert(new QueryData.Insert({ into: this.into, data }));
   }
 }
 export {
   Insert,
-  InsertValuesReturning,
-  Inserted
+  InsertInto,
+  InsertOne
 };

package/dist/define/query/TableSelect.d.ts

@@ -3,7 +3,7 @@ import { Query, QueryData } from '../Query.js';
 import { Table, TableData } from '../Table.js';
 import { CreateTable } from './CreateTable.js';
 import { Delete } from './Delete.js';
-import { Inserted } from './Insert.js';
+import { Insert, InsertOne } from './Insert.js';
 import { Select } from './Select.js';
 import { Update } from './Update.js';
 export declare class TableSelect<Definition> extends Select<Table.Select<Definition>> {
@@ -12,9 +12,16 @@ export declare class TableSelect<Definition> extends Select<Table.Select<Definit
     constructor(table: TableData, conditions?: Array<EV<boolean>>);
     as(alias: string): Table<Definition>;
     create(): CreateTable;
-    insertSelect(query: Select<Table.Insert<Definition>>): Inserted;
-    insertOne(record: Table.Insert<Definition>): Query<{ [K in keyof Definition as Definition[K] extends import("../Column.js").Column<any> ? K : never]: Definition[K] extends import("../Column.js").Column<infer T> ? T : never; }>;
-    insertAll(data: Array<Table.Insert<Definition>>): Inserted;
+    insert(query: Select<Table.Insert<Definition>>): Insert;
+    insert(rows: Array<Table.Insert<Definition>>): Insert;
+    insert(row: Table.Insert<Definition>): InsertOne<Table.Select<Definition>>;
+    insertSelect(query: Select<Table.Insert<Definition>>): Insert<{
+        rowsAffected: number;
+    }>;
+    insertOne(record: Table.Insert<Definition>): InsertOne<{ [K in keyof Definition as Definition[K] extends import("../Column.js").Column<any> ? K : never]: Definition[K] extends import("../Column.js").Column<infer T> ? T : never; }>;
+    insertAll(data: Array<Table.Insert<Definition>>): Insert<{
+        rowsAffected: number;
+    }>;
     set(data: Table.Update<Definition>): Update<Definition>;
     delete(): Delete;
     get(name: string): Expr<any>;

package/dist/define/query/TableSelect.js

@@ -4,7 +4,7 @@ import { createTable } from "../Table.js";
 import { Target } from "../Target.js";
 import { CreateTable } from "./CreateTable.js";
 import { Delete } from "./Delete.js";
-import { Insert, Inserted } from "./Insert.js";
+import { Insert, InsertInto, InsertOne } from "./Insert.js";
 import { Select } from "./Select.js";
 import { Update } from "./Update.js";
 class TableSelect extends Select {
@@ -25,13 +25,22 @@ class TableSelect extends Select {
   create() {
     return new CreateTable(this.table);
   }
+  insert(input) {
+    if (input instanceof Select) {
+      return this.insertSelect(input);
+    } else if (Array.isArray(input)) {
+      return this.insertAll(input);
+    } else {
+      return this.insertOne(input);
+    }
+  }
   insertSelect(query) {
-    return new Inserted(
+    return new Insert(
       new QueryData.Insert({ into: this.table, select: query[Query.Data] })
     );
   }
   insertOne(record) {
-    return new Query(
+    return new InsertOne(
       new QueryData.Insert({
         into: this.table,
         data: [record],
@@ -41,7 +50,7 @@ class TableSelect extends Select {
     );
   }
   insertAll(data) {
-    return new Insert(this.table).values(...data);
+    return new InsertInto(this.table).values(...data);
   }
   set(data) {
     return new Update(

package/package.json

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