rado 0.2.24 → 0.2.26

package/dist/define/Expr.d.ts

@@ -1,9 +1,10 @@
 import { Fields } from './Fields';
 import { OrderBy } from './OrderBy';
 import { ParamData } from './Param';
-import { Query, QueryData } from './Query';
+import { QueryData } from './Query';
 import { Selection } from './Selection';
 import { Target } from './Target';
+import { SelectMultiple, SelectSingle } from './query/Select';
 declare const DATA: unique symbol;
 declare const TO_EXPR: unique symbol;
 declare const IS_EXPR: unique symbol;
@@ -127,13 +128,13 @@ export declare class Expr<T> {
     not(): Expr<boolean>;
     or(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
     and(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
-    is(that: EV<T> | Query.SelectSingle<T>): Expr<boolean>;
+    is(that: EV<T> | SelectSingle<T>): Expr<boolean>;
     isConstant(value: T): boolean;
     isNot(that: EV<T>): Expr<boolean>;
     isNull(): Expr<boolean>;
     isNotNull(): Expr<boolean>;
-    isIn(that: EV<Array<T>> | Query.SelectMultiple<T>): Expr<boolean>;
-    isNotIn(that: EV<Array<T>> | Query.SelectMultiple<T>): Expr<boolean>;
+    isIn(that: EV<Array<T>> | SelectMultiple<T>): Expr<boolean>;
+    isNotIn(that: EV<Array<T>> | SelectMultiple<T>): Expr<boolean>;
     isGreater(that: EV<any>): Expr<boolean>;
     isGreaterOrEqual(that: EV<any>): Expr<boolean>;
     isLess(that: EV<any>): Expr<boolean>;

package/dist/define/Expr.js

@@ -1,4 +1,5 @@
 // src/define/Expr.ts
+import { randomAlias } from "../util/Alias.js";
 import { OrderDirection } from "./OrderBy.js";
 import { ParamData, ParamType } from "./Param.js";
 import { Target } from "./Target.js";
@@ -336,7 +337,7 @@ var Expr = class {
     return Expr.create(value).isIn(this);
   }
   filter(fn) {
-    const alias = `__${Math.random().toString(36).slice(2, 9)}`;
+    const alias = randomAlias();
     const target = new Target.Expr(this[DATA], alias);
     return new Expr(
       new ExprData.Filter(
@@ -346,7 +347,7 @@ var Expr = class {
     );
   }
   map(fn) {
-    const alias = `__${Math.random().toString(36).slice(2, 9)}`;
+    const alias = randomAlias();
     const target = new Target.Expr(this[DATA], alias);
     return new Expr(
       new ExprData.Map(

package/dist/define/Fields.d.ts

@@ -4,9 +4,9 @@ type ObjectUnion<T> = {
 };
 type RecordField<T> = Expr<T> & FieldsOf<ObjectUnion<T>>;
 type Field<T> = [T] extends [Array<any>] ? Expr<T> : [T] extends [number | string | boolean] ? Expr<T> : [T] extends [Record<string, any> | null] ? RecordField<T> : Expr<T>;
-type FieldsOf<Row> = Row extends Record<string, any> ? {
+type FieldsOf<Row> = [Row] extends [Record<string, any>] ? {
     [K in keyof Row]-?: Field<Row[K]>;
 } : never;
 type IsStrictlyAny<T> = (T extends never ? true : false) extends false ? false : true;
-export type Fields<T> = IsStrictlyAny<T> extends true ? any : T extends object ? FieldsOf<T> : Field<T>;
+export type Fields<T> = IsStrictlyAny<T> extends true ? any : [T] extends [object] ? FieldsOf<T> : Field<T>;
 export {};

package/dist/define/Ops.d.ts

@@ -1,9 +1,15 @@
-import { Query } from './Query';
 import { Selection } from './Selection';
 import { Table } from './Table';
-export declare function select<X extends Selection>(selection: X): Query.SelectMultiple<Selection.Infer<X>>;
-export declare function from<Row>(source: Table<Row> | Query.SelectMultiple<Row>): Query.SelectMultiple<Row>;
-export declare function update<Row>(table: Table<Row>): Query.Update<Row>;
-export declare function insertInto<Row>(table: Table<Row>): Query.Insert<Row>;
-export declare function deleteFrom<Row>(table: Table<Row>): Query.Delete;
-export declare function create(...tables: Array<Table<any>>): Query.Batch;
+import { Batch } from './query/Batch';
+import { Delete } from './query/Delete';
+import { Insert } from './query/Insert';
+import { SelectMultiple } from './query/Select';
+import { RecursiveUnion } from './query/Union';
+import { Update } from './query/Update';
+export declare function withRecursive<Row>(initialSelect: SelectMultiple<Row>): RecursiveUnion<Row>;
+export declare function select<X extends Selection>(selection: X): SelectMultiple<Selection.Infer<X>>;
+export declare function from<Row>(source: Table<Row> | SelectMultiple<Row>): SelectMultiple<Row>;
+export declare function update<Row>(table: Table<Row>): Update<Row>;
+export declare function insertInto<Row>(table: Table<Row>): Insert<Row>;
+export declare function deleteFrom<Row>(table: Table<Row>): Delete;
+export declare function create(...tables: Array<Table<any>>): Batch;

package/dist/define/Ops.js

@@ -4,8 +4,17 @@ import { Query, QueryData } from "./Query.js";
 import { Schema } from "./Schema.js";
 import { Table } 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 { SelectMultiple } 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]);
+}
 function select(selection) {
-  return new Query.SelectMultiple(
+  return new SelectMultiple(
     new QueryData.Select({
       selection: ExprData.create(selection)
     })
@@ -13,7 +22,7 @@ function select(selection) {
 }
 function from(source) {
   const target = Query.isQuery(source) ? new Target.Query(source[Query.Data]) : new Target.Table(source[Table.Data]);
-  return new Query.SelectMultiple(
+  return new SelectMultiple(
     new QueryData.Select({
       from: target,
       selection: new ExprData.Row(target)
@@ -21,16 +30,16 @@ function from(source) {
   );
 }
 function update(table) {
-  return new Query.Update(new QueryData.Update({ table: table[Table.Data] }));
+  return new Update(new QueryData.Update({ table: table[Table.Data] }));
 }
 function insertInto(table) {
-  return new Query.Insert(table[Table.Data]);
+  return new Insert(table[Table.Data]);
 }
 function deleteFrom(table) {
-  return new Query.Delete(new QueryData.Delete({ table: table[Table.Data] }));
+  return new Delete(new QueryData.Delete({ table: table[Table.Data] }));
 }
 function create(...tables) {
-  return new Query.Batch(
+  return new Batch(
     tables.flatMap((table) => Schema.create(table[Table.Data]).queries)
   );
 }
@@ -40,5 +49,6 @@ export {
   from,
   insertInto,
   select,
-  update
+  update,
+  withRecursive
 };

package/dist/define/Query.d.ts

@@ -1,11 +1,11 @@
 import { Driver } from '../lib/Driver';
 import { CompileOptions } from '../lib/Formatter';
 import { ColumnData } from './Column';
-import { EV, Expr, ExprData } from './Expr';
+import { EV, ExprData } from './Expr';
 import { IndexData } from './Index';
 import { OrderBy } from './OrderBy';
 import { Selection } from './Selection';
-import { Table, TableData } from './Table';
+import { TableData } from './Table';
 import { Target } from './Target';
 declare const DATA: unique symbol;
 export declare enum QueryType {
@@ -49,7 +49,7 @@ export declare namespace QueryData {
         type: QueryType.Union;
         a: Select | Union;
         operator: UnionOperation;
-        b: Select | Union;
+        b: Select | Union | (() => Select | Union);
     }
     export class Select extends Data<Select> {
         type: QueryType.Select;
@@ -139,115 +139,15 @@ export declare class Query<T> {
     [Selection.CursorType]: () => T;
     [DATA]: QueryData;
     constructor(query: QueryData);
-    static all(strings: TemplateStringsArray, ...params: Array<any>): Query<any>;
     next<T>(cursor: Query<T>): Query<T>;
     on(driver: Driver.Sync): T;
     on(driver: Driver.Async): Promise<T>;
     toSql(driver: Driver, options?: CompileOptions): string;
     toJSON(): QueryData;
-}
-export declare namespace Query {
-    class Delete extends Query<{
-        rowsAffected: number;
-    }> {
-        [DATA]: QueryData.Delete;
-        where(...where: Array<EV<boolean>>): Delete;
-        take(limit: number | undefined): Delete;
-        skip(offset: number | undefined): Delete;
-    }
-    class Update<Definition> extends Query<{
-        rowsAffected: number;
-    }> {
-        [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>;
-    }
-    class InsertValuesReturning<T> extends Query<T> {
-    }
-    class Inserted extends Query<{
-        rowsAffected: number;
-    }> {
-        [DATA]: QueryData.Insert;
-        constructor(query: QueryData.Insert);
-        returning<X extends Selection>(selection: X): InsertValuesReturning<Selection.Infer<X>>;
-    }
-    class Insert<Definition> {
-        protected into: TableData;
-        constructor(into: TableData);
-        selection(query: Query.SelectMultiple<Table.Select<Definition>>): Inserted;
-        values(...data: Array<Table.Insert<Definition>>): Inserted;
-    }
-    class CreateTable extends Query<void> {
-        protected table: TableData;
-        constructor(table: TableData);
-    }
-    class Batch<T = void> extends Query<T> {
-        protected queries: Array<QueryData>;
-        [DATA]: QueryData.Batch;
-        constructor(queries: Array<QueryData>);
-        next<T>(cursor: Query<T>): Query<T>;
-    }
-    class Union<Row> extends Query<Array<Row>> {
-        [DATA]: QueryData.Union | QueryData.Select;
-        union(query: SelectMultiple<Row> | Union<Row>): Union<Row>;
-        unionAll(query: SelectMultiple<Row> | Union<Row>): Union<Row>;
-        except(query: SelectMultiple<Row> | Union<Row>): Union<Row>;
-        intersect(query: SelectMultiple<Row> | Union<Row>): Union<Row>;
-    }
-    class SelectMultiple<Row> extends Union<Row> {
-        [DATA]: QueryData.Select;
-        constructor(query: QueryData.Select);
-        from(table: Table<any>): SelectMultiple<Row>;
-        leftJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectMultiple<Row>;
-        innerJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectMultiple<Row>;
-        select<X extends Selection>(selection: X): SelectMultiple<Selection.Infer<X>>;
-        count(): SelectSingle<number>;
-        orderBy(...orderBy: Array<Expr<any> | OrderBy>): SelectMultiple<Row>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectMultiple<Row>;
-        maybeFirst(): SelectSingle<Row | undefined>;
-        first(): SelectSingle<Row>;
-        where(...where: Array<EV<boolean>>): SelectMultiple<Row>;
-        take(limit: number | undefined): SelectMultiple<Row>;
-        skip(offset: number | undefined): SelectMultiple<Row>;
-        recursiveUnion<T extends {}>(this: SelectMultiple<T>, create: (fields: Record<string, Table.Of<T>>) => SelectMultiple<T> | Union<T>): SelectMultiple<T>;
-        recursiveUnionAll<T extends {}>(this: SelectMultiple<T>, create: (fields: Record<string, Table.Of<T>>) => SelectMultiple<T> | Union<T>): SelectMultiple<T>;
-        [Expr.ToExpr](): Expr<Row>;
-    }
-    class TableSelect<Definition> extends SelectMultiple<Table.Select<Definition>> {
-        protected table: TableData;
-        [DATA]: QueryData.Select;
-        constructor(table: TableData, conditions?: Array<EV<boolean>>);
-        as(alias: string): Table<Definition>;
-        create(): CreateTable;
-        insertSelect(query: SelectMultiple<Table.Insert<Definition>>): Inserted;
-        insertOne(record: Table.Insert<Definition>): Query<Table.Select<Definition>>;
-        insertAll(data: Array<Table.Insert<Definition>>): Inserted;
-        set(data: Table.Update<Definition>): Update<Definition>;
-        delete(): Delete;
-        get(name: string): Expr<any>;
-    }
-    class SelectSingle<Row> extends Query<Row> {
-        [DATA]: QueryData.Select;
-        constructor(query: QueryData.Select);
-        from(table: Table<any>): SelectMultiple<Row>;
-        leftJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectSingle<Row>;
-        innerJoin<C>(that: Table<C> | TableSelect<C>, ...on: Array<EV<boolean>>): SelectSingle<Row>;
-        select<X extends Selection>(selection: X): SelectSingle<Selection.Infer<X>>;
-        orderBy(...orderBy: Array<OrderBy>): SelectSingle<Row>;
-        groupBy(...groupBy: Array<Expr<any>>): SelectSingle<Row>;
-        where(...where: Array<EV<boolean>>): SelectSingle<Row>;
-        take(limit: number | undefined): SelectSingle<Row>;
-        skip(offset: number | undefined): SelectSingle<Row>;
-        all(): SelectMultiple<Row>;
-        [Expr.ToExpr](): Expr<Row>;
-    }
+    protected addWhere(where: Array<EV<boolean>>): this[typeof DATA];
 }
 export declare namespace Query {
     const Data: typeof DATA;
     function isQuery<T>(input: any): input is Query<T>;
-    function isSingle<T>(input: any): input is Query.SelectSingle<T>;
-    function isMultiple<T>(input: any): input is Query.SelectMultiple<T>;
 }
 export {};