rado 0.2.24 → 0.2.26

package/dist/define/Query.js

@@ -1,10 +1,5 @@
 // src/define/Query.ts
-import { makeRecursiveUnion } from "./CTE.js";
-import { Expr, ExprData } from "./Expr.js";
-import { Functions } from "./Functions.js";
-import { Schema } from "./Schema.js";
-import { createTable, Table } from "./Table.js";
-import { Target } from "./Target.js";
+import { Expr } from "./Expr.js";
 var { assign } = Object;
 var DATA = Symbol("Query.Data");
 var QueryType = /* @__PURE__ */ ((QueryType2) => {
@@ -109,11 +104,6 @@ var Query = class {
   constructor(query) {
     this[DATA] = query;
   }
-  static all(strings, ...params) {
-    return new Query(
-      new QueryData.Raw({ expectedReturn: "rows", strings, params })
-    );
-  }
   next(cursor) {
     return new Query(
       new QueryData.Batch(
@@ -132,390 +122,20 @@ var Query = class {
   toJSON() {
     return this[DATA];
   }
-};
-function addWhere(query, where) {
-  const conditions = where.slice();
-  if (query.where)
-    conditions.push(new Expr(query.where));
-  return Expr.and(...conditions)[Expr.Data];
-}
-((Query2) => {
-  class Delete extends Query2 {
-    where(...where) {
-      return new Delete(this[DATA].with({ where: addWhere(this[DATA], where) }));
-    }
-    take(limit) {
-      return new Delete(this[DATA].with({ limit }));
-    }
-    skip(offset) {
-      return new Delete(this[DATA].with({ offset }));
-    }
-  }
-  Query2.Delete = Delete;
-  class Update extends Query2 {
-    set(set) {
-      return new Update(this[DATA].with({ set }));
-    }
-    where(...where) {
-      return new Update(this[DATA].with({ where: addWhere(this[DATA], where) }));
-    }
-    take(limit) {
-      return new Update(this[DATA].with({ limit }));
-    }
-    skip(offset) {
-      return new Update(this[DATA].with({ offset }));
-    }
-  }
-  Query2.Update = Update;
-  class InsertValuesReturning extends Query2 {
-  }
-  Query2.InsertValuesReturning = InsertValuesReturning;
-  class Inserted extends Query2 {
-    constructor(query) {
-      super(query);
-    }
-    returning(selection) {
-      return new InsertValuesReturning(
-        new QueryData.Insert({
-          ...this[DATA],
-          selection: ExprData.create(selection)
-        })
-      );
-    }
-  }
-  Query2.Inserted = Inserted;
-  class Insert {
-    constructor(into) {
-      this.into = into;
-    }
-    selection(query) {
-      return new Inserted(
-        new QueryData.Insert({ into: this.into, select: query[DATA] })
-      );
-    }
-    values(...data) {
-      return new Inserted(new QueryData.Insert({ into: this.into, data }));
-    }
-  }
-  Query2.Insert = Insert;
-  class CreateTable extends Query2 {
-    constructor(table) {
-      super(Schema.create(table));
-      this.table = table;
-    }
-  }
-  Query2.CreateTable = CreateTable;
-  class Batch extends Query2 {
-    constructor(queries) {
-      super(new QueryData.Batch({ queries }));
-      this.queries = queries;
-    }
-    next(cursor) {
-      return new Query2(
-        new QueryData.Batch({
-          queries: [...this[DATA].queries, cursor[DATA]]
-        })
-      );
-    }
-  }
-  Query2.Batch = Batch;
-  class Union extends Query2 {
-    union(query) {
-      return new Union(
-        new QueryData.Union({
-          a: this[DATA],
-          operator: "Union" /* Union */,
-          b: query[DATA]
-        })
-      );
-    }
-    unionAll(query) {
-      return new Union(
-        new QueryData.Union({
-          a: this[DATA],
-          operator: "UnionAll" /* UnionAll */,
-          b: query[DATA]
-        })
-      );
-    }
-    except(query) {
-      return new Union(
-        new QueryData.Union({
-          a: this[DATA],
-          operator: "Except" /* Except */,
-          b: query[DATA]
-        })
-      );
-    }
-    intersect(query) {
-      return new Union(
-        new QueryData.Union({
-          a: this[DATA],
-          operator: "Intersect" /* Intersect */,
-          b: query[DATA]
-        })
-      );
-    }
-  }
-  Query2.Union = Union;
-  function joinTarget(joinType, query, to, on) {
-    const toQuery = Query2.isQuery(to) ? to[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]
-    );
-  }
-  class SelectMultiple extends Union {
-    constructor(query) {
-      super(query);
-    }
-    from(table) {
-      return new SelectMultiple(
-        this[DATA].with({ from: new Target.Table(table) })
-      );
-    }
-    leftJoin(that, ...on) {
-      const query = this[DATA];
-      return new SelectMultiple(
-        this[DATA].with({
-          from: joinTarget("left", query, that, on)
-        })
-      );
-    }
-    innerJoin(that, ...on) {
-      const query = this[DATA];
-      return new SelectMultiple(
-        this[DATA].with({
-          from: joinTarget("inner", query, that, on)
-        })
-      );
-    }
-    select(selection) {
-      return new SelectMultiple(
-        this[DATA].with({
-          selection: ExprData.create(selection)
-        })
-      );
-    }
-    count() {
-      return new SelectSingle(
-        this[DATA].with({
-          selection: Functions.count()[Expr.Data],
-          singleResult: true
-        })
-      );
-    }
-    orderBy(...orderBy) {
-      return new SelectMultiple(
-        this[DATA].with({
-          orderBy: orderBy.map((e) => {
-            return Expr.isExpr(e) ? e.asc() : e;
-          })
-        })
-      );
-    }
-    groupBy(...groupBy) {
-      return new SelectMultiple(
-        this[DATA].with({
-          groupBy: groupBy.map(ExprData.create)
-        })
-      );
-    }
-    maybeFirst() {
-      return new SelectSingle(this[DATA].with({ singleResult: true }));
-    }
-    first() {
-      return new SelectSingle(
-        this[DATA].with({
-          singleResult: true,
-          validate: true
-        })
-      );
-    }
-    where(...where) {
-      return new SelectMultiple(
-        this[DATA].with({
-          where: addWhere(this[DATA], where)
-        })
-      );
-    }
-    take(limit) {
-      return new SelectMultiple(this[DATA].with({ limit }));
-    }
-    skip(offset) {
-      return new SelectMultiple(this[DATA].with({ offset }));
-    }
-    recursiveUnion(create) {
-      return new SelectMultiple(
-        makeRecursiveUnion(this[DATA], create, "Union" /* Union */)
-      );
-    }
-    recursiveUnionAll(create) {
-      return new SelectMultiple(
-        makeRecursiveUnion(
-          this[DATA],
-          create,
-          "UnionAll" /* UnionAll */
-        )
-      );
-    }
-    [Expr.ToExpr]() {
-      return new Expr(new ExprData.Query(this[DATA]));
-    }
-  }
-  Query2.SelectMultiple = SelectMultiple;
-  class TableSelect extends SelectMultiple {
-    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 Query2.CreateTable(this.table);
-    }
-    insertSelect(query) {
-      return new Query2.Inserted(
-        new QueryData.Insert({ into: this.table, select: query[DATA] })
-      );
-    }
-    insertOne(record) {
-      return new Query2(
-        new QueryData.Insert({
-          into: this.table,
-          data: [record],
-          selection: new ExprData.Row(new Target.Table(this.table)),
-          singleResult: true
-        })
-      );
-    }
-    insertAll(data) {
-      return new Query2.Insert(this.table).values(...data);
-    }
-    set(data) {
-      return new Query2.Update(
-        new QueryData.Update({
-          table: this.table,
-          where: this[DATA].where
-        })
-      ).set(data);
-    }
-    delete() {
-      return new Query2.Delete(
-        new QueryData.Delete({
-          table: this.table,
-          where: this[DATA].where
-        })
-      );
-    }
-    get(name) {
-      return new Expr(
-        new ExprData.Field(new ExprData.Row(new Target.Table(this.table)), name)
-      );
-    }
-  }
-  Query2.TableSelect = TableSelect;
-  class SelectSingle extends Query2 {
-    constructor(query) {
-      super(query);
-    }
-    from(table) {
-      return new SelectMultiple(
-        this[DATA].with({ from: new Target.Table(table) })
-      );
-    }
-    leftJoin(that, ...on) {
-      const query = this[DATA];
-      return new SelectSingle(
-        this[DATA].with({
-          from: joinTarget("left", query, that, on)
-        })
-      );
-    }
-    innerJoin(that, ...on) {
-      const query = this[DATA];
-      return new SelectSingle(
-        this[DATA].with({
-          from: joinTarget("inner", query, that, on)
-        })
-      );
-    }
-    select(selection) {
-      return new SelectSingle(
-        this[DATA].with({
-          selection: ExprData.create(selection)
-        })
-      );
-    }
-    orderBy(...orderBy) {
-      return new SelectSingle(
-        this[DATA].with({
-          orderBy
-        })
-      );
-    }
-    groupBy(...groupBy) {
-      return new SelectSingle(
-        this[DATA].with({
-          groupBy: groupBy.map(ExprData.create)
-        })
-      );
-    }
-    where(...where) {
-      return new SelectSingle(
-        this[DATA].with({
-          where: addWhere(this[DATA], where)
-        })
-      );
-    }
-    take(limit) {
-      return new SelectSingle(this[DATA].with({ limit }));
-    }
-    skip(offset) {
-      return new SelectSingle(this[DATA].with({ offset }));
-    }
-    all() {
-      return new SelectMultiple(this[DATA].with({ singleResult: false }));
-    }
-    [Expr.ToExpr]() {
-      return new Expr(new ExprData.Query(this[DATA]));
-    }
+  addWhere(where) {
+    const query = this[DATA];
+    const conditions = where.slice();
+    if (query.where)
+      conditions.push(new Expr(query.where));
+    return query.with({ where: Expr.and(...conditions)[Expr.Data] });
   }
-  Query2.SelectSingle = SelectSingle;
-})(Query || (Query = {}));
+};
 ((Query2) => {
   Query2.Data = DATA;
   function isQuery(input) {
     return input !== null && Boolean(DATA in input);
   }
   Query2.isQuery = isQuery;
-  function isSingle(input) {
-    return input instanceof Query2.SelectSingle;
-  }
-  Query2.isSingle = isSingle;
-  function isMultiple(input) {
-    return input instanceof Query2.SelectSingle;
-  }
-  Query2.isMultiple = isMultiple;
 })(Query || (Query = {}));
 export {
   Query,

package/dist/define/Selection.d.ts

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

package/dist/define/Table.d.ts

@@ -1,9 +1,10 @@
+import { ClearFunctionProto } from '../util/Callable';
 import { Column, ColumnData, OptionalColumn, PrimaryColumn } from './Column';
-import { EV } from './Expr';
-import { Fields } from './Fields';
+import { EV, Expr } from './Expr';
+import type { Fields } from './Fields';
 import { Index, IndexData } from './Index';
-import { Query } from './Query';
-import { Selection } from './Selection';
+import type { Selection } from './Selection';
+import { TableSelect } from './query/TableSelect';
 declare const DATA: unique symbol;
 declare const META: unique symbol;
 interface TableDefinition {
@@ -18,28 +19,22 @@ export declare class TableData {
     };
     constructor(data: TableData);
 }
-export interface TableInstance<Definition> {
+export interface TableInstance<Definition> extends ClearFunctionProto {
     (conditions: {
-        [K in keyof Definition]?: Definition[K] extends Column<infer V> ? EV<V> : never;
-    }): Query.TableSelect<Definition>;
-    (...conditions: Array<EV<boolean>>): Query.TableSelect<Definition>;
+        [K in keyof Definition]?: Definition[K] extends Expr<infer V> ? EV<V> : never;
+    }): TableSelect<Definition>;
+    (...conditions: Array<EV<boolean>>): TableSelect<Definition>;
 }
 export declare class TableInstance<Definition> {
     [Selection.TableType](): Table.Select<Definition>;
     get [DATA](): TableData;
-    get name(): unknown;
-    get length(): unknown;
-    get call(): unknown;
-    get apply(): unknown;
-    get bind(): unknown;
-    get prototype(): unknown;
 }
 export type Table<Definition> = Definition & TableInstance<Definition>;
 export declare namespace Table {
     export const Data: typeof DATA;
     export const Meta: typeof META;
     export type Of<Row> = Table<{
-        [K in keyof Row as K extends string ? K : never]: Fields<Row[K]>;
+        [K in keyof Row as K extends string ? K : never]: Column<Row[K]> & Fields<Row[K]>;
     }>;
     export type Select<Definition> = {
         [K in keyof Definition as Definition[K] extends Column<any> ? K : never]: Definition[K] extends Column<infer T> ? T : never;
@@ -62,7 +57,6 @@ interface Define<T> {
     new (): T;
 }
 export type table<T> = T extends Table<infer D> ? Table.Select<D> : never;
-export declare function virtualTable<Definition>(name: string): Table<Definition>;
 export declare function createTable<Definition>(data: TableData): Table<Definition>;
 export declare function table<T extends {}>(define: Record<string, T | Define<T>>): Table<T>;
 export declare namespace table {

package/dist/define/Table.js

@@ -4,11 +4,10 @@ import {
   ColumnType
 } from "./Column.js";
 import { BinOpType, Expr, ExprData } from "./Expr.js";
-import { Query } from "./Query.js";
 import { Target } from "./Target.js";
+import { TableSelect } from "./query/TableSelect.js";
 var {
   assign,
-  create,
   keys,
   entries,
   fromEntries,
@@ -29,42 +28,6 @@ var Table;
   Table2.Data = DATA;
   Table2.Meta = META;
 })(Table || (Table = {}));
-function virtualTable(name) {
-  const data = new TableData({
-    name,
-    columns: {},
-    definition: create(null),
-    meta: () => ({ indexes: {} })
-  });
-  const target = new Target.Table(data);
-  const cache = create(null);
-  function call(...args) {
-    const isConditionalRecord = args.length === 1 && !Expr.isExpr(args[0]);
-    const conditions = isConditionalRecord ? entries(args[0]).map(([key, value]) => {
-      return new Expr(
-        new ExprData.BinOp(
-          BinOpType.Equals,
-          new ExprData.Field(new ExprData.Row(target), key),
-          ExprData.create(value)
-        )
-      );
-    }) : args;
-    return new Query.TableSelect(data, conditions);
-  }
-  return new Proxy(call, {
-    get(_, column) {
-      if (column === DATA)
-        return data;
-      if (column === Expr.ToExpr)
-        return new Expr(new ExprData.Row(target));
-      if (column in cache)
-        return cache[column];
-      return (cache[column] = new Expr(
-        new ExprData.Field(new ExprData.Row(target), column)
-      )).dynamic();
-    }
-  });
-}
 function createTable(data) {
   const target = new Target.Table(data);
   const call = {
@@ -82,7 +45,7 @@ function createTable(data) {
           )
         );
       }) : args;
-      return new Query.TableSelect(data, conditions);
+      return new TableSelect(data, conditions);
     }
   }[data.name];
   const cols = keys(data.columns);
@@ -160,6 +123,5 @@ export {
   Table,
   TableData,
   createTable,
-  table,
-  virtualTable
+  table
 };

package/dist/define/Target.d.ts

@@ -10,18 +10,18 @@ export declare enum TargetType {
 }
 export type Target = Target.Expr | Target.CTE | Target.Query | Target.Table | Target.Join;
 export declare namespace Target {
-    class CTE {
-        name: string;
-        union: QueryData.Union;
-        type: TargetType.CTE;
-        constructor(name: string, union: QueryData.Union);
-    }
     class Expr {
         expr: ExprData;
         alias?: string | undefined;
         type: TargetType.Expr;
         constructor(expr: ExprData, alias?: string | undefined);
     }
+    class CTE {
+        name: string;
+        union: QueryData.Union;
+        type: TargetType.CTE;
+        constructor(name: string, union: QueryData.Union);
+    }
     class Query {
         query: QueryData;
         alias?: string | undefined;

package/dist/define/Target.js

@@ -9,14 +9,6 @@ var TargetType = /* @__PURE__ */ ((TargetType2) => {
 })(TargetType || {});
 var Target;
 ((Target2) => {
-  class CTE {
-    constructor(name, union) {
-      this.name = name;
-      this.union = union;
-    }
-    type = "Target.CTE" /* CTE */;
-  }
-  Target2.CTE = CTE;
   class Expr {
     constructor(expr, alias) {
       this.expr = expr;
@@ -25,6 +17,14 @@ var Target;
     type = "Target.Expr" /* Expr */;
   }
   Target2.Expr = Expr;
+  class CTE {
+    constructor(name, union) {
+      this.name = name;
+      this.union = union;
+    }
+    type = "Target.CTE" /* CTE */;
+  }
+  Target2.CTE = CTE;
   class Query {
     constructor(query, alias) {
       this.query = query;

package/dist/define/VirtualTable.d.ts

@@ -0,0 +1,33 @@
+import { ClearFunctionProto } from '../util/Callable';
+import { Column } from './Column';
+import { EV, Expr } from './Expr';
+import { Fields } from './Fields';
+import { Selection } from './Selection';
+import { Table } from './Table';
+import { Target } from './Target';
+import { SelectMultiple } from './query/Select';
+declare const DATA: unique symbol;
+export interface VirtualTableInstance<Definition> extends ClearFunctionProto {
+    (conditions: {
+        [K in keyof Definition]?: Definition[K] extends Expr<infer V> ? EV<V> : never;
+    }): SelectMultiple<Table.Select<Definition>>;
+    (...conditions: Array<EV<boolean>>): SelectMultiple<Table.Select<Definition>>;
+}
+export declare class VirtualTableInstance<Definition> {
+    [Selection.TableType](): Table.Select<Definition>;
+    get [DATA](): VirtualTableData;
+}
+export interface VirtualTableData {
+    name: string;
+    target: Target;
+    select: (conditions: Array<EV<boolean>>) => SelectMultiple<any>;
+}
+export type VirtualTable<Definition> = Definition & VirtualTableInstance<Definition>;
+export declare namespace VirtualTable {
+    const Data: typeof DATA;
+    type Of<Row> = VirtualTable<{
+        [K in keyof Row as K extends string ? K : never]: Column<Row[K]> & Fields<Row[K]>;
+    }>;
+}
+export declare function createVirtualTable<Definition>(data: VirtualTableData): VirtualTable<Definition>;
+export {};

package/dist/define/VirtualTable.js

@@ -0,0 +1,41 @@
+// src/define/VirtualTable.ts
+import { BinOpType, Expr, ExprData } from "./Expr.js";
+var { create, entries } = Object;
+var DATA = Symbol("VirtualTable.Data");
+var VirtualTable;
+((VirtualTable2) => {
+  VirtualTable2.Data = DATA;
+})(VirtualTable || (VirtualTable = {}));
+function createVirtualTable(data) {
+  const cache = create(null);
+  function call(...args) {
+    const isConditionalRecord = args.length === 1 && !Expr.isExpr(args[0]);
+    const conditions = isConditionalRecord ? entries(args[0]).map(([key, value]) => {
+      return new Expr(
+        new ExprData.BinOp(
+          BinOpType.Equals,
+          new ExprData.Field(new ExprData.Row(data.target), key),
+          ExprData.create(value)
+        )
+      );
+    }) : args;
+    return data.select(conditions);
+  }
+  return new Proxy(call, {
+    get(_, column) {
+      if (column === DATA)
+        return data;
+      if (column === Expr.ToExpr)
+        return new Expr(new ExprData.Row(data.target));
+      if (column in cache)
+        return cache[column];
+      return (cache[column] = new Expr(
+        new ExprData.Field(new ExprData.Row(data.target), column)
+      )).dynamic();
+    }
+  });
+}
+export {
+  VirtualTable,
+  createVirtualTable
+};

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

@@ -0,0 +1,7 @@
+import { Query, QueryData } from '../Query';
+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>;
+}