rado 0.1.35 → 0.1.36

package/dist/lib/Cursor.d.ts

@@ -1,3 +1,4 @@
+import { Driver } from './Driver';
 import { EV, Expr } from './Expr';
 import { OrderBy } from './OrderBy';
 import { Query } from './Query';
@@ -10,26 +11,27 @@ export declare class Cursor<T> {
     constructor(query: Query<T>);
     static all(strings: TemplateStringsArray, ...params: Array<any>): Cursor<any>;
     query(): Query<T>;
+    run(driver: Driver.Sync): T;
+    run(driver: Driver.Async): Promise<T>;
     toJSON(): Query<T>;
 }
 export declare namespace Cursor {
-    class Limitable<T> extends Cursor<T> {
-        take(limit: number | undefined): Limitable<T>;
-        skip(offset: number | undefined): Limitable<T>;
-    }
-    class Filterable<T> extends Limitable<T> {
-        where(...where: Array<EV<boolean>>): Filterable<T>;
-    }
-    class Delete extends Filterable<{
+    class Delete extends Cursor<{
         rowsAffected: number;
     }> {
         query(): Query.Delete;
+        where(...where: Array<EV<boolean>>): Delete;
+        take(limit: number | undefined): Delete;
+        skip(offset: number | undefined): Delete;
     }
-    class Update<T> extends Filterable<{
+    class Update<T> extends Cursor<{
         rowsAffected: number;
     }> {
         query: () => Query.Update;
         set(set: UpdateSet<T>): Update<T>;
+        where(...where: Array<EV<boolean>>): Update<T>;
+        take(limit: number | undefined): Update<T>;
+        skip(offset: number | undefined): Update<T>;
     }
     class InsertValuesReturning<T> extends Cursor<T> {
     }
@@ -44,7 +46,7 @@ export declare namespace Cursor {
         constructor(into: Schema);
         values(...data: Array<Table.Insert<T>>): InsertValues;
     }
-    class Create extends Cursor<void> {
+    class CreateTable extends Cursor<void> {
         protected table: Schema;
         constructor(table: Schema);
     }
@@ -52,7 +54,7 @@ export declare namespace Cursor {
         protected queries: Array<Query>;
         constructor(queries: Array<Query>);
     }
-    class SelectMultiple<T> extends Filterable<Array<T>> {
+    class SelectMultiple<T> extends Cursor<Array<T>> {
         query(): Query.Select;
         leftJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectMultiple<T>;
         innerJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectMultiple<T>;
@@ -63,9 +65,11 @@ export declare namespace Cursor {
         first(): SelectSingle<T | undefined>;
         sure(): SelectSingle<T>;
         where(...where: Array<EV<boolean>>): SelectMultiple<T>;
+        take(limit: number | undefined): SelectMultiple<T>;
+        skip(offset: number | undefined): SelectMultiple<T>;
         toExpr(): Expr<T>;
     }
-    class SelectSingle<T> extends Filterable<T> {
+    class SelectSingle<T> extends Cursor<T> {
         query(): Query.Select;
         leftJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectSingle<T>;
         innerJoin<C>(that: Table<C>, ...on: Array<EV<boolean>>): SelectSingle<T>;
@@ -73,6 +77,8 @@ export declare namespace Cursor {
         orderBy(...orderBy: Array<OrderBy>): SelectSingle<T>;
         groupBy(...groupBy: Array<Expr<any>>): SelectSingle<T>;
         where(...where: Array<EV<boolean>>): SelectSingle<T>;
+        take(limit: number | undefined): SelectSingle<T>;
+        skip(offset: number | undefined): SelectSingle<T>;
         all(): SelectMultiple<T>;
         toExpr(): Expr<T>;
     }

package/dist/lib/Cursor.js

@@ -21,41 +21,51 @@ var Cursor = class {
   query() {
     throw new Error("Not implemented");
   }
+  run(driver) {
+    return driver.executeQuery(this.query());
+  }
   toJSON() {
     return this.query();
   }
 };
+function addWhere(query, where) {
+  const conditions = where.slice();
+  if (query.where)
+    conditions.push(query.where);
+  return {
+    ...query,
+    where: Expr.and(...conditions).expr
+  };
+}
 ((Cursor2) => {
-  class Limitable extends Cursor2 {
-    take(limit) {
-      return new Limitable({ ...this.query(), limit });
-    }
-    skip(offset) {
-      return new Limitable({ ...this.query(), offset });
+  class Delete extends Cursor2 {
+    query() {
+      return super.query();
     }
-  }
-  Cursor2.Limitable = Limitable;
-  class Filterable extends Limitable {
     where(...where) {
-      const condition = Expr.and(...where);
-      const query = this.query();
-      return new Filterable({
-        ...query,
-        where: (query.where ? condition.and(new Expr(query.where)) : condition).expr
-      });
+      return new Delete(addWhere(this.query(), where));
     }
-  }
-  Cursor2.Filterable = Filterable;
-  class Delete extends Filterable {
-    query() {
-      return super.query();
+    take(limit) {
+      return new Delete({ ...this.query(), limit });
+    }
+    skip(offset) {
+      return new Delete({ ...this.query(), offset });
     }
   }
   Cursor2.Delete = Delete;
-  class Update extends Filterable {
+  class Update extends Cursor2 {
     set(set) {
       return new Update({ ...this.query(), set });
     }
+    where(...where) {
+      return new Update(addWhere(this.query(), where));
+    }
+    take(limit) {
+      return new Update({ ...this.query(), limit });
+    }
+    skip(offset) {
+      return new Update({ ...this.query(), offset });
+    }
   }
   Cursor2.Update = Update;
   class InsertValuesReturning extends Cursor2 {
@@ -81,13 +91,13 @@ var Cursor = class {
     }
   }
   Cursor2.Insert = Insert;
-  class Create extends Cursor2 {
+  class CreateTable extends Cursor2 {
     constructor(table) {
       super(Schema.create(table));
       this.table = table;
     }
   }
-  Cursor2.Create = Create;
+  Cursor2.CreateTable = CreateTable;
   class Batch extends Cursor2 {
     constructor(queries) {
       super(Query.Batch({ queries }));
@@ -95,7 +105,7 @@ var Cursor = class {
     }
   }
   Cursor2.Batch = Batch;
-  class SelectMultiple extends Filterable {
+  class SelectMultiple extends Cursor2 {
     query() {
       return super.query();
     }
@@ -161,14 +171,20 @@ var Cursor = class {
       });
     }
     where(...where) {
-      return new SelectMultiple(super.where(...where).query());
+      return new SelectMultiple(addWhere(this.query(), where));
+    }
+    take(limit) {
+      return new SelectMultiple({ ...this.query(), limit });
+    }
+    skip(offset) {
+      return new SelectMultiple({ ...this.query(), offset });
     }
     toExpr() {
       return new Expr(ExprData.Query(this.query()));
     }
   }
   Cursor2.SelectMultiple = SelectMultiple;
-  class SelectSingle extends Filterable {
+  class SelectSingle extends Cursor2 {
     query() {
       return super.query();
     }
@@ -215,7 +231,13 @@ var Cursor = class {
       });
     }
     where(...where) {
-      return new SelectSingle(super.where(...where).query());
+      return new SelectSingle(addWhere(this.query(), where));
+    }
+    take(limit) {
+      return new SelectSingle({ ...this.query(), limit });
+    }
+    skip(offset) {
+      return new SelectSingle({ ...this.query(), offset });
     }
     all() {
       return new SelectMultiple({ ...this.query(), singleResult: false });

package/dist/lib/Driver.d.ts

@@ -90,6 +90,7 @@ interface AsyncPreparedStatement {
     get<T>(params?: Array<any>): Promise<T>;
     execute(params?: Array<any>): Promise<void>;
 }
+export type Driver = SyncDriver | AsyncDriver;
 export declare namespace Driver {
     type Sync = SyncDriver;
     const Sync: typeof SyncDriver;

package/dist/lib/Table.d.ts

@@ -16,7 +16,7 @@ export declare class Table<T> extends Cursor.SelectMultiple<Table.Normalize<T>>
     insertAll(data: Array<Table.Insert<T>>): Cursor.InsertValues;
     set(data: Update<Table.Normalize<T>>): Cursor.Update<Table.Normalize<T>>;
     delete(): Cursor.Delete;
-    createTable(): Cursor.Create;
+    createTable(): Cursor.CreateTable;
     as(alias: string): this;
     alias(): Record<string, this>;
     get(name: string): Expr<any>;

package/dist/lib/Table.js

@@ -59,7 +59,7 @@ var Table = class extends Cursor.SelectMultiple {
     return new Cursor.Delete(Query.Delete({ table: this.schema() }));
   }
   createTable() {
-    return new Cursor.Create(this.schema());
+    return new Cursor.CreateTable(this.schema());
   }
   as(alias) {
     return new Table({ ...this.schema(), alias });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "license": "MIT",
   "type": "module",
   "exports": {