rado 0.3.2 → 0.3.4

package/dist/define/Ops.js

@@ -1,14 +1,17 @@
 import { ExprData } from "./Expr.js";
-import { Query, QueryData } from "./Query.js";
+import {
+  Batch,
+  Delete,
+  InsertInto,
+  Query,
+  QueryData,
+  RecursiveUnion,
+  Select,
+  Update
+} from "./Query.js";
 import { Schema } from "./Schema.js";
 import { Table, createTable } from "./Table.js";
 import { Target } from "./Target.js";
-import { Batch } from "./query/Batch.js";
-import { Delete } from "./query/Delete.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";
 function withRecursive(initialSelect) {
   return new RecursiveUnion(initialSelect[Query.Data]);
 }

package/dist/define/Query.d.ts

@@ -1,12 +1,13 @@
 import { Driver } from '../lib/Driver.js';
 import { CompileOptions } from '../lib/Formatter.js';
 import { ColumnData } from './Column.js';
-import { EV, ExprData } from './Expr.js';
+import { EV, Expr, ExprData } from './Expr.js';
 import { IndexData } from './Index.js';
 import { OrderBy } from './OrderBy.js';
 import { Selection } from './Selection.js';
-import { TableData } from './Table.js';
+import { Table, TableData } from './Table.js';
 import { Target } from './Target.js';
+import { VirtualTable } from './VirtualTable.js';
 export declare enum QueryType {
     Insert = "QueryData.Insert",
     Select = "QueryData.Select",
@@ -151,3 +152,117 @@ export declare namespace Query {
     const Data: unique symbol;
     function isQuery<T>(input: any): input is Query<T>;
 }
+export declare class Batch<T = void> extends Query<T> {
+    protected queries: Array<QueryData>;
+    [Query.Data]: QueryData.Batch;
+    constructor(queries: Array<QueryData>);
+    next<T>(cursor: Query<T>): Query<T>;
+}
+export declare class CreateTable extends Query<void> {
+    protected table: TableData;
+    constructor(table: TableData);
+}
+export declare class Delete extends Query<{
+    rowsAffected: number;
+}> {
+    [Query.Data]: QueryData.Delete;
+    constructor(query: QueryData.Delete);
+    where(...where: Array<EV<boolean>>): Delete;
+    orderBy(...orderBy: Array<OrderBy>): Delete;
+    take(limit: number | undefined): Delete;
+    skip(offset: number | undefined): Delete;
+}
+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): Insert<Selection.Infer<X>>;
+}
+export declare class InsertInto<Definition> {
+    protected into: TableData;
+    constructor(into: TableData);
+    selection(query: Select<Table.Select<Definition>>): Insert;
+    values(...data: Array<Table.Insert<Definition>>): Insert;
+}
+export declare class RecursiveUnion<Row> {
+    initialSelect: QueryData.Select;
+    constructor(initialSelect: QueryData.Select);
+    union(create: () => Select<Row> | Union<Row>): VirtualTable.Of<Row>;
+    unionAll(create: () => Select<Row> | Union<Row>): VirtualTable.Of<Row>;
+}
+export declare class Union<Row> extends Query<Array<Row>> {
+    [Query.Data]: QueryData.Union | QueryData.Select;
+    constructor(query: QueryData.Union | QueryData.Select);
+    union(query: Select<Row> | Union<Row>): Union<Row>;
+    unionAll(query: Select<Row> | Union<Row>): Union<Row>;
+    except(query: Select<Row> | Union<Row>): Union<Row>;
+    intersect(query: Select<Row> | Union<Row>): Union<Row>;
+}
+export declare class Select<Row> extends Union<Row> {
+    [Query.Data]: QueryData.Select;
+    constructor(query: QueryData.Select);
+    from(table: Table<any> | VirtualTable<any>): Select<Row>;
+    indexedBy(index: IndexData): Select<unknown>;
+    leftJoin<C>(that: Table<C> | Select<C>, ...on: Array<EV<boolean>>): Select<Row>;
+    innerJoin<C>(that: Table<C> | Select<C>, ...on: Array<EV<boolean>>): Select<Row>;
+    select<X extends Selection>(selection: X): Select<Selection.Infer<X>>;
+    count(): SelectFirst<number>;
+    orderBy(...orderBy: Array<Expr<any> | OrderBy>): Select<Row>;
+    groupBy(...groupBy: Array<Expr<any>>): Select<Row>;
+    maybeFirst(): SelectFirst<Row | null>;
+    first(): SelectFirst<Row>;
+    where(...where: Array<EV<boolean>>): Select<Row>;
+    take(limit: number | undefined): Select<Row>;
+    skip(offset: number | undefined): Select<Row>;
+    [Expr.ToExpr](): Expr<Row>;
+}
+export declare class SelectFirst<Row> extends Query<Row> {
+    [Query.Data]: QueryData.Select;
+    constructor(query: QueryData.Select);
+    from(table: Table<any>): Select<Row>;
+    leftJoin<C>(that: Table<C> | Select<C>, ...on: Array<EV<boolean>>): SelectFirst<Row>;
+    innerJoin<C>(that: Table<C> | Select<C>, ...on: Array<EV<boolean>>): SelectFirst<Row>;
+    select<X extends Selection>(selection: X): SelectFirst<Selection.Infer<X>>;
+    orderBy(...orderBy: Array<OrderBy>): SelectFirst<Row>;
+    groupBy(...groupBy: Array<Expr<any>>): SelectFirst<Row>;
+    where(...where: Array<EV<boolean>>): SelectFirst<Row>;
+    take(limit: number | undefined): SelectFirst<Row>;
+    skip(offset: number | undefined): SelectFirst<Row>;
+    all(): Select<Row>;
+    [Expr.ToExpr](): Expr<Row>;
+}
+export declare class TableSelect<Definition> extends Select<Table.Select<Definition>> {
+    protected table: TableData;
+    [Query.Data]: QueryData.Select;
+    constructor(table: TableData, conditions?: Array<EV<boolean>>);
+    as(alias: string): Table<Definition>;
+    create(): CreateTable;
+    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>;
+}
+export declare class Update<Definition> extends Query<{
+    rowsAffected: number;
+}> {
+    [Query.Data]: QueryData.Update;
+    set(set: Table.Update<Definition>): Update<Definition>;
+    where(...where: Array<EV<boolean>>): Update<Definition>;
+    take(limit: number | undefined): Update<Definition>;
+    skip(offset: number | undefined): Update<Definition>;
+}

package/dist/define/Query.js

@@ -1,5 +1,14 @@
-import { Expr } from "./Expr.js";
-const { assign } = Object;
+import { randomAlias } from "../util/Alias.js";
+import { Expr, ExprData, ExprType } from "./Expr.js";
+import { Functions } from "./Functions.js";
+import { Schema } from "./Schema.js";
+import { Table, createTable } from "./Table.js";
+import { Target, TargetType } from "./Target.js";
+import {
+  VirtualTable,
+  createVirtualTable
+} from "./VirtualTable.js";
+const { keys, assign, fromEntries } = Object;
 var QueryType = /* @__PURE__ */ ((QueryType2) => {
   QueryType2["Insert"] = "QueryData.Insert";
   QueryType2["Select"] = "QueryData.Select";
@@ -33,30 +42,30 @@ var QueryData;
     UnionOperation2["Intersect"] = "Intersect";
     UnionOperation2["Except"] = "Except";
   })(UnionOperation = QueryData2.UnionOperation || (QueryData2.UnionOperation = {}));
-  class Union extends Data {
+  class Union2 extends Data {
     type = "QueryData.Union" /* Union */;
   }
-  QueryData2.Union = Union;
-  class Select extends Data {
+  QueryData2.Union = Union2;
+  class Select2 extends Data {
     type = "QueryData.Select" /* Select */;
   }
-  QueryData2.Select = Select;
-  class Insert extends Data {
+  QueryData2.Select = Select2;
+  class Insert2 extends Data {
     type = "QueryData.Insert" /* Insert */;
   }
-  QueryData2.Insert = Insert;
-  class Update extends Data {
+  QueryData2.Insert = Insert2;
+  class Update2 extends Data {
     type = "QueryData.Update" /* Update */;
   }
-  QueryData2.Update = Update;
-  class Delete extends Data {
+  QueryData2.Update = Update2;
+  class Delete2 extends Data {
     type = "QueryData.Delete" /* Delete */;
   }
-  QueryData2.Delete = Delete;
-  class CreateTable extends Data {
+  QueryData2.Delete = Delete2;
+  class CreateTable2 extends Data {
     type = "QueryData.CreateTable" /* CreateTable */;
   }
-  QueryData2.CreateTable = CreateTable;
+  QueryData2.CreateTable = CreateTable2;
   class AlterTable extends Data {
     type = "QueryData.AlterTable" /* AlterTable */;
   }
@@ -73,10 +82,10 @@ var QueryData;
     type = "QueryData.DropIndex" /* DropIndex */;
   }
   QueryData2.DropIndex = DropIndex;
-  class Batch extends Data {
+  class Batch2 extends Data {
     type = "QueryData.Batch" /* Batch */;
   }
-  QueryData2.Batch = Batch;
+  QueryData2.Batch = Batch2;
   let TransactionOperation;
   ((TransactionOperation2) => {
     TransactionOperation2["Begin"] = "Begin";
@@ -134,8 +143,454 @@ class Query {
   }
   Query2.isQuery = isQuery;
 })(Query || (Query = {}));
+class Batch extends Query {
+  constructor(queries) {
+    super(new QueryData.Batch({ queries }));
+    this.queries = queries;
+  }
+  next(cursor) {
+    return new Query(
+      new QueryData.Batch({
+        queries: [...this[Query.Data].queries, cursor[Query.Data]]
+      })
+    );
+  }
+}
+class CreateTable extends Query {
+  constructor(table) {
+    super(Schema.create(table));
+    this.table = table;
+  }
+}
+class Delete extends Query {
+  constructor(query) {
+    super(query);
+  }
+  where(...where) {
+    return new Delete(this.addWhere(where));
+  }
+  orderBy(...orderBy) {
+    return new Delete(this[Query.Data].with({ orderBy }));
+  }
+  take(limit) {
+    return new Delete(this[Query.Data].with({ limit }));
+  }
+  skip(offset) {
+    return new Delete(this[Query.Data].with({ offset }));
+  }
+}
+class Insert extends Query {
+  constructor(query) {
+    super(query);
+  }
+  returning(selection) {
+    return new Insert(
+      new QueryData.Insert({
+        ...this[Query.Data],
+        selection: ExprData.create(selection)
+      })
+    );
+  }
+}
+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 Insert(
+      new QueryData.Insert({ into: this.into, select: query[Query.Data] })
+    );
+  }
+  values(...data) {
+    return new Insert(new QueryData.Insert({ into: this.into, data }));
+  }
+}
+function joinTarget(joinType, query, to, on) {
+  const toQuery = Query.isQuery(to) ? to[Query.Data] : void 0;
+  const target = toQuery ? toQuery.from : new Target.Table(to[Table.Data]);
+  if (!query.from || !target)
+    throw new Error("No from clause");
+  const conditions = [...on];
+  if (toQuery) {
+    const where = toQuery.where;
+    if (where)
+      conditions.push(new Expr(where));
+  }
+  return new Target.Join(
+    query.from,
+    target,
+    joinType,
+    Expr.and(...conditions)[Expr.Data]
+  );
+}
+function columnsOf(expr) {
+  switch (expr.type) {
+    case ExprType.Record:
+      return keys(expr.fields);
+    case ExprType.Row:
+      switch (expr.target.type) {
+        case TargetType.Table:
+          return keys(expr.target.table.columns);
+        default:
+          throw new Error("Could not retrieve CTE columns");
+      }
+    default:
+      throw new Error("Could not retrieve CTE columns");
+  }
+}
+function makeRecursiveUnion(initial, createUnion, operator) {
+  const name = randomAlias();
+  const cols = columnsOf(initial.selection);
+  const union = new QueryData.Union({
+    a: initial,
+    operator,
+    b: () => createUnion()[Query.Data]
+  });
+  const target = new Target.CTE(name, union);
+  const row = new ExprData.Row(target);
+  const selection = new ExprData.Record(
+    fromEntries(cols.map((col) => [col, new ExprData.Field(row, col)]))
+  );
+  const select = (conditions) => {
+    const where = Expr.and(...conditions)[Expr.Data];
+    return new Select(
+      new QueryData.Select({
+        selection,
+        from: target,
+        where
+      })
+    );
+  };
+  const cte = createVirtualTable({
+    name,
+    target,
+    select
+  });
+  return cte;
+}
+class RecursiveUnion {
+  constructor(initialSelect) {
+    this.initialSelect = initialSelect;
+  }
+  union(create) {
+    return makeRecursiveUnion(
+      this.initialSelect,
+      create,
+      "Union" /* Union */
+    );
+  }
+  unionAll(create) {
+    return makeRecursiveUnion(
+      this.initialSelect,
+      create,
+      "UnionAll" /* UnionAll */
+    );
+  }
+}
+class Union extends Query {
+  constructor(query) {
+    super(query);
+  }
+  union(query) {
+    return new Union(
+      new QueryData.Union({
+        a: this[Query.Data],
+        operator: "Union" /* Union */,
+        b: query[Query.Data]
+      })
+    );
+  }
+  unionAll(query) {
+    return new Union(
+      new QueryData.Union({
+        a: this[Query.Data],
+        operator: "UnionAll" /* UnionAll */,
+        b: query[Query.Data]
+      })
+    );
+  }
+  except(query) {
+    return new Union(
+      new QueryData.Union({
+        a: this[Query.Data],
+        operator: "Except" /* Except */,
+        b: query[Query.Data]
+      })
+    );
+  }
+  intersect(query) {
+    return new Union(
+      new QueryData.Union({
+        a: this[Query.Data],
+        operator: "Intersect" /* Intersect */,
+        b: query[Query.Data]
+      })
+    );
+  }
+}
+class Select extends Union {
+  constructor(query) {
+    super(query);
+  }
+  from(table) {
+    const virtual = table[VirtualTable.Data];
+    return new Select(
+      this[Query.Data].with({ from: virtual?.target || new Target.Table(table) })
+    );
+  }
+  indexedBy(index) {
+    const from = this[Query.Data].from;
+    switch (from?.type) {
+      case TargetType.Table:
+        return new Select(
+          this[Query.Data].with({
+            from: new Target.Table(from.table, index)
+          })
+        );
+      default:
+        throw new Error("Cannot index by without table target");
+    }
+  }
+  leftJoin(that, ...on) {
+    const query = this[Query.Data];
+    return new Select(
+      this[Query.Data].with({
+        from: joinTarget("left", query, that, on)
+      })
+    );
+  }
+  innerJoin(that, ...on) {
+    const query = this[Query.Data];
+    return new Select(
+      this[Query.Data].with({
+        from: joinTarget("inner", query, that, on)
+      })
+    );
+  }
+  select(selection) {
+    return new Select(
+      this[Query.Data].with({
+        selection: ExprData.create(selection)
+      })
+    );
+  }
+  count() {
+    return new SelectFirst(
+      this[Query.Data].with({
+        selection: Functions.count()[Expr.Data],
+        singleResult: true
+      })
+    );
+  }
+  orderBy(...orderBy) {
+    return new Select(
+      this[Query.Data].with({
+        orderBy: orderBy.map((e) => {
+          return Expr.isExpr(e) ? e.asc() : e;
+        })
+      })
+    );
+  }
+  groupBy(...groupBy) {
+    return new Select(
+      this[Query.Data].with({
+        groupBy: groupBy.map(ExprData.create)
+      })
+    );
+  }
+  maybeFirst() {
+    return new SelectFirst(this[Query.Data].with({ singleResult: true }));
+  }
+  first() {
+    return new SelectFirst(
+      this[Query.Data].with({
+        singleResult: true,
+        validate: true
+      })
+    );
+  }
+  where(...where) {
+    return new Select(this.addWhere(where));
+  }
+  take(limit) {
+    return new Select(this[Query.Data].with({ limit }));
+  }
+  skip(offset) {
+    return new Select(this[Query.Data].with({ offset }));
+  }
+  [Expr.ToExpr]() {
+    return new Expr(new ExprData.Query(this[Query.Data]));
+  }
+}
+class SelectFirst extends Query {
+  constructor(query) {
+    super(query);
+  }
+  from(table) {
+    return new Select(this[Query.Data].with({ from: new Target.Table(table) }));
+  }
+  leftJoin(that, ...on) {
+    const query = this[Query.Data];
+    return new SelectFirst(
+      this[Query.Data].with({
+        from: joinTarget("left", query, that, on)
+      })
+    );
+  }
+  innerJoin(that, ...on) {
+    const query = this[Query.Data];
+    return new SelectFirst(
+      this[Query.Data].with({
+        from: joinTarget("inner", query, that, on)
+      })
+    );
+  }
+  select(selection) {
+    return new SelectFirst(
+      this[Query.Data].with({
+        selection: ExprData.create(selection)
+      })
+    );
+  }
+  orderBy(...orderBy) {
+    return new SelectFirst(
+      this[Query.Data].with({
+        orderBy
+      })
+    );
+  }
+  groupBy(...groupBy) {
+    return new SelectFirst(
+      this[Query.Data].with({
+        groupBy: groupBy.map(ExprData.create)
+      })
+    );
+  }
+  where(...where) {
+    return new SelectFirst(this.addWhere(where));
+  }
+  take(limit) {
+    return new SelectFirst(this[Query.Data].with({ limit }));
+  }
+  skip(offset) {
+    return new SelectFirst(this[Query.Data].with({ offset }));
+  }
+  all() {
+    return new Select(this[Query.Data].with({ singleResult: false }));
+  }
+  [Expr.ToExpr]() {
+    return new Expr(new ExprData.Query(this[Query.Data]));
+  }
+}
+class TableSelect extends Select {
+  constructor(table, conditions = []) {
+    const target = new Target.Table(table);
+    super(
+      new QueryData.Select({
+        from: target,
+        selection: new ExprData.Row(target),
+        where: Expr.and(...conditions)[Expr.Data]
+      })
+    );
+    this.table = table;
+  }
+  as(alias) {
+    return createTable({ ...this.table, alias });
+  }
+  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 Insert(
+      new QueryData.Insert({ into: this.table, select: query[Query.Data] })
+    );
+  }
+  insertOne(record) {
+    return new InsertOne(
+      new QueryData.Insert({
+        into: this.table,
+        data: [record],
+        selection: new ExprData.Row(new Target.Table(this.table)),
+        singleResult: true
+      })
+    );
+  }
+  insertAll(data) {
+    return new InsertInto(this.table).values(...data);
+  }
+  set(data) {
+    return new Update(
+      new QueryData.Update({
+        table: this.table,
+        where: this[Query.Data].where
+      })
+    ).set(data);
+  }
+  delete() {
+    return new Delete(
+      new QueryData.Delete({
+        table: this.table,
+        where: this[Query.Data].where
+      })
+    );
+  }
+  get(name) {
+    return new Expr(
+      new ExprData.Field(new ExprData.Row(new Target.Table(this.table)), name)
+    );
+  }
+}
+class Update extends Query {
+  set(set) {
+    return new Update(this[Query.Data].with({ set }));
+  }
+  where(...where) {
+    return new Update(this.addWhere(where));
+  }
+  take(limit) {
+    return new Update(this[Query.Data].with({ limit }));
+  }
+  skip(offset) {
+    return new Update(this[Query.Data].with({ offset }));
+  }
+}
 export {
+  Batch,
+  CreateTable,
+  Delete,
+  Insert,
+  InsertInto,
+  InsertOne,
   Query,
   QueryData,
-  QueryType
+  QueryType,
+  RecursiveUnion,
+  Select,
+  SelectFirst,
+  TableSelect,
+  Union,
+  Update
 };

package/dist/define/Selection.d.ts

@@ -1,6 +1,6 @@
 import type { Column } from './Column.js';
 import type { Expr } from './Expr.js';
-import type { Select, SelectFirst } from './query/Select.js';
+import type { Select, SelectFirst } from './Query.js';
 type SelectionBase = unknown | (() => any) | Expr<any> | Select<any> | SelectFirst<any>;
 interface SelectionRecord extends Record<string, Selection> {
 }