rado 0.1.23 → 0.1.25

package/dist/lib/Expr.d.ts

@@ -1,154 +1,154 @@
-import { Cursor } from './Cursor';
-import { Fields } from './Fields';
-import { OrderBy } from './OrderBy';
-import { ParamData } from './Param';
-import { Query } from './Query';
-import { Selection } from './Selection';
-import { Target } from './Target';
-export declare enum UnOp {
-    Not = "Not",
-    IsNull = "IsNull"
-}
-export declare enum BinOp {
-    Add = "Add",
-    Subt = "Subt",
-    Mult = "Mult",
-    Mod = "Mod",
-    Div = "Div",
-    Greater = "Greater",
-    GreaterOrEqual = "GreaterOrEqual",
-    Less = "Less",
-    LessOrEqual = "LessOrEqual",
-    Equals = "Equals",
-    NotEquals = "NotEquals",
-    And = "And",
-    Or = "Or",
-    Like = "Like",
-    Glob = "Glob",
-    Match = "Match",
-    In = "In",
-    NotIn = "NotIn",
-    Concat = "Concat"
-}
-export declare enum ExprType {
-    UnOp = "UnOp",
-    BinOp = "BinOp",
-    Field = "Field",
-    Param = "Param",
-    Call = "Call",
-    Query = "Query",
-    Record = "Record",
-    Row = "Row",
-    Map = "Map",
-    Filter = "Filter",
-    Merge = "Merge",
-    Case = "Case"
-}
-export type ExprData = {
-    type: ExprType.UnOp;
-    op: UnOp;
-    expr: ExprData;
-} | {
-    type: ExprType.BinOp;
-    op: BinOp;
-    a: ExprData;
-    b: ExprData;
-} | {
-    type: ExprType.Field;
-    expr: ExprData;
-    field: string;
-} | {
-    type: ExprType.Param;
-    param: ParamData;
-} | {
-    type: ExprType.Call;
-    method: string;
-    params: Array<ExprData>;
-} | {
-    type: ExprType.Query;
-    query: Query.Select;
-} | {
-    type: ExprType.Record;
-    fields: Record<string, ExprData>;
-} | {
-    type: ExprType.Merge;
-    a: ExprData;
-    b: ExprData;
-} | {
-    type: ExprType.Row;
-    target: Target;
-} | {
-    type: ExprType.Map;
-    target: Target;
-    result: ExprData;
-} | {
-    type: ExprType.Filter;
-    target: Target;
-    condition: ExprData;
-} | {
-    type: ExprType.Case;
-    expr: ExprData;
-    cases: Record<string, ExprData>;
-    defaultCase?: ExprData;
-};
-export declare const ExprData: {
-    UnOp(op: UnOp, expr: ExprData): ExprData;
-    BinOp(op: BinOp, a: ExprData, b: ExprData): ExprData;
-    Field(expr: ExprData, field: string): ExprData;
-    Param(param: ParamData): ExprData;
-    Call(method: string, params: Array<ExprData>): ExprData;
-    Query(query: Query.Select): ExprData;
-    Record(fields: Record<string, ExprData>): ExprData;
-    Merge(a: ExprData, b: ExprData): ExprData;
-    Row(target: Target): ExprData;
-    Map(target: Target, result: ExprData): ExprData;
-    Filter(target: Target, condition: ExprData): ExprData;
-    Case(expr: ExprData, cases: Record<string, ExprData>, defaultCase?: ExprData): ExprData;
-    create(input: any): ExprData;
-};
-/** Expression or value of type T */
-export type EV<T> = Expr<T> | T;
-export declare class Expr<T> {
-    expr: ExprData;
-    static NULL: ExprData;
-    static value<T>(value: T): Expr<T>;
-    static create<T>(input: EV<T>): Expr<T>;
-    static and(...conditions: Array<EV<boolean>>): Expr<boolean>;
-    static or(...conditions: Array<EV<boolean>>): Expr<boolean>;
-    constructor(expr: ExprData);
-    asc(): OrderBy;
-    desc(): OrderBy;
-    not(): Expr<boolean>;
-    or(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
-    and(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
-    isNull(): Expr<boolean>;
-    isNotNull(): Expr<boolean>;
-    isNot(that: EV<T>): Expr<boolean>;
-    is(that: EV<T> | Cursor.SelectSingle<T>): Expr<boolean>;
-    isIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
-    isNotIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
-    add(this: Expr<number>, that: EV<number>): Expr<number>;
-    substract(this: Expr<number>, that: EV<number>): Expr<number>;
-    multiply(this: Expr<number>, that: EV<number>): Expr<number>;
-    remainder(this: Expr<number>, that: EV<number>): Expr<number>;
-    divide(this: Expr<number>, that: EV<number>): Expr<number>;
-    greater(that: EV<any>): Expr<boolean>;
-    greaterOrEqual(that: EV<any>): Expr<boolean>;
-    less(that: EV<any>): Expr<boolean>;
-    lessOrEqual(that: EV<any>): Expr<boolean>;
-    concat(this: Expr<string>, that: EV<string>): Expr<string>;
-    like(this: Expr<string>, that: EV<string>): Expr<boolean>;
-    glob(this: Expr<string>, that: EV<string>): Expr<boolean>;
-    match(this: Expr<string>, that: EV<string>): Expr<boolean>;
-    with<X extends Selection>(that: X): Selection.With<T, X>;
-    at<T>(this: Expr<Array<T>>, index: number): Expr<T | null>;
-    filter<T>(this: Expr<Array<T>>, fn: (cursor: Fields<T>) => Expr<boolean>): Expr<Array<T>>;
-    map<T, X extends Selection>(this: Expr<Array<T>>, fn: (cursor: Fields<T>) => X): Expr<Array<Selection.Infer<X>>>;
-    sure(): Expr<NonNullable<T>>;
-    get<T>(name: string): Expr<T>;
-}
-export declare namespace Expr {
-    type Record<T> = Expr<T> & {
-        [K in keyof T]: Expr<T[K]>;
-    };
-}
+import { Cursor } from './Cursor';
+import { Fields } from './Fields';
+import { OrderBy } from './OrderBy';
+import { ParamData } from './Param';
+import { Query } from './Query';
+import { Selection } from './Selection';
+import { Target } from './Target';
+export declare enum UnOp {
+    Not = "Not",
+    IsNull = "IsNull"
+}
+export declare enum BinOp {
+    Add = "Add",
+    Subt = "Subt",
+    Mult = "Mult",
+    Mod = "Mod",
+    Div = "Div",
+    Greater = "Greater",
+    GreaterOrEqual = "GreaterOrEqual",
+    Less = "Less",
+    LessOrEqual = "LessOrEqual",
+    Equals = "Equals",
+    NotEquals = "NotEquals",
+    And = "And",
+    Or = "Or",
+    Like = "Like",
+    Glob = "Glob",
+    Match = "Match",
+    In = "In",
+    NotIn = "NotIn",
+    Concat = "Concat"
+}
+export declare enum ExprType {
+    UnOp = "UnOp",
+    BinOp = "BinOp",
+    Field = "Field",
+    Param = "Param",
+    Call = "Call",
+    Query = "Query",
+    Record = "Record",
+    Row = "Row",
+    Map = "Map",
+    Filter = "Filter",
+    Merge = "Merge",
+    Case = "Case"
+}
+export type ExprData = {
+    type: ExprType.UnOp;
+    op: UnOp;
+    expr: ExprData;
+} | {
+    type: ExprType.BinOp;
+    op: BinOp;
+    a: ExprData;
+    b: ExprData;
+} | {
+    type: ExprType.Field;
+    expr: ExprData;
+    field: string;
+} | {
+    type: ExprType.Param;
+    param: ParamData;
+} | {
+    type: ExprType.Call;
+    method: string;
+    params: Array<ExprData>;
+} | {
+    type: ExprType.Query;
+    query: Query.Select;
+} | {
+    type: ExprType.Record;
+    fields: Record<string, ExprData>;
+} | {
+    type: ExprType.Merge;
+    a: ExprData;
+    b: ExprData;
+} | {
+    type: ExprType.Row;
+    target: Target;
+} | {
+    type: ExprType.Map;
+    target: Target;
+    result: ExprData;
+} | {
+    type: ExprType.Filter;
+    target: Target;
+    condition: ExprData;
+} | {
+    type: ExprType.Case;
+    expr: ExprData;
+    cases: Record<string, ExprData>;
+    defaultCase?: ExprData;
+};
+export declare const ExprData: {
+    UnOp(op: UnOp, expr: ExprData): ExprData;
+    BinOp(op: BinOp, a: ExprData, b: ExprData): ExprData;
+    Field(expr: ExprData, field: string): ExprData;
+    Param(param: ParamData): ExprData;
+    Call(method: string, params: Array<ExprData>): ExprData;
+    Query(query: Query.Select): ExprData;
+    Record(fields: Record<string, ExprData>): ExprData;
+    Merge(a: ExprData, b: ExprData): ExprData;
+    Row(target: Target): ExprData;
+    Map(target: Target, result: ExprData): ExprData;
+    Filter(target: Target, condition: ExprData): ExprData;
+    Case(expr: ExprData, cases: Record<string, ExprData>, defaultCase?: ExprData): ExprData;
+    create(input: any): ExprData;
+};
+/** Expression or value of type T */
+export type EV<T> = Expr<T> | T;
+export declare class Expr<T> {
+    expr: ExprData;
+    static NULL: ExprData;
+    static value<T>(value: T): Expr<T>;
+    static create<T>(input: EV<T>): Expr<T>;
+    static and(...conditions: Array<EV<boolean>>): Expr<boolean>;
+    static or(...conditions: Array<EV<boolean>>): Expr<boolean>;
+    constructor(expr: ExprData);
+    asc(): OrderBy;
+    desc(): OrderBy;
+    not(): Expr<boolean>;
+    or(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
+    and(this: Expr<boolean>, that: EV<boolean>): Expr<boolean>;
+    isNull(): Expr<boolean>;
+    isNotNull(): Expr<boolean>;
+    isNot(that: EV<T>): Expr<boolean>;
+    is(that: EV<T> | Cursor.SelectSingle<T>): Expr<boolean>;
+    isIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
+    isNotIn(that: EV<Array<T>> | Cursor<T>): Expr<boolean>;
+    add(this: Expr<number>, that: EV<number>): Expr<number>;
+    substract(this: Expr<number>, that: EV<number>): Expr<number>;
+    multiply(this: Expr<number>, that: EV<number>): Expr<number>;
+    remainder(this: Expr<number>, that: EV<number>): Expr<number>;
+    divide(this: Expr<number>, that: EV<number>): Expr<number>;
+    greater(that: EV<any>): Expr<boolean>;
+    greaterOrEqual(that: EV<any>): Expr<boolean>;
+    less(that: EV<any>): Expr<boolean>;
+    lessOrEqual(that: EV<any>): Expr<boolean>;
+    concat(this: Expr<string>, that: EV<string>): Expr<string>;
+    like(this: Expr<string>, that: EV<string>): Expr<boolean>;
+    glob(this: Expr<string>, that: EV<string>): Expr<boolean>;
+    match(this: Expr<string>, that: EV<string>): Expr<boolean>;
+    with<X extends Selection>(that: X): Selection.With<T, X>;
+    at<T>(this: Expr<Array<T>>, index: number): Expr<T | null>;
+    filter<T>(this: Expr<Array<T>>, fn: (cursor: Fields<T>) => Expr<boolean>): Expr<Array<T>>;
+    map<T, X extends Selection>(this: Expr<Array<T>>, fn: (cursor: Fields<T>) => X): Expr<Array<Selection.Infer<X>>>;
+    sure(): Expr<NonNullable<T>>;
+    get<T>(name: string): Expr<T>;
+}
+export declare namespace Expr {
+    type Record<T> = Expr<T> & {
+        [K in keyof T]: Expr<T[K]>;
+    };
+}

package/dist/lib/Fields.d.ts

@@ -1,13 +1,13 @@
-import { Column, PrimaryKey } from './Column';
-import { Expr } from './Expr';
-type ObjectUnion<T> = {
-    [K in T extends infer P ? keyof P : never]: T extends infer P ? K extends keyof P ? P[K] : never : never;
-};
-type RecordField<T> = Expr<T> & FieldsOf<ObjectUnion<T>>;
-type Field<T> = [T] extends [Array<any>] ? Expr<T> : [T] extends [Column.IsPrimary<infer V, infer K>] ? Expr<PrimaryKey<V, K>> : [T] extends [Column.IsOptional<infer V>] ? Field<V> : [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> ? {
-    [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 {};
+import { Column, PrimaryKey } from './Column';
+import { Expr } from './Expr';
+type ObjectUnion<T> = {
+    [K in T extends infer P ? keyof P : never]: T extends infer P ? K extends keyof P ? P[K] : never : never;
+};
+type RecordField<T> = Expr<T> & FieldsOf<ObjectUnion<T>>;
+type Field<T> = [T] extends [Array<any>] ? Expr<T> : [T] extends [Column.IsPrimary<infer V, infer K>] ? Expr<PrimaryKey<V, K>> : [T] extends [Column.IsOptional<infer V>] ? Field<V> : [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> ? {
+    [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 {};

package/dist/lib/Formatter.d.ts

@@ -1,56 +1,56 @@
-import { ColumnData, ColumnType } from './Column';
-import { ExprData } from './Expr';
-import { OrderBy } from './OrderBy';
-import { Query } from './Query';
-import { Sanitizer } from './Sanitizer';
-import { Statement } from './Statement';
-import { Target } from './Target';
-export interface FormatContext {
-    nameResult?: string;
-    skipTableName?: boolean;
-    forceInline?: boolean;
-    formatAsJson?: boolean;
-    formatSubject?: (subject: Statement) => Statement;
-}
-export declare abstract class Formatter implements Sanitizer {
-    constructor();
-    abstract escapeValue(value: any): string;
-    abstract escapeIdentifier(ident: string): string;
-    abstract formatSqlAccess(on: Statement, field: string): Statement;
-    abstract formatJsonAccess(on: Statement, field: string): Statement;
-    formatAccess(on: Statement, field: string, formatAsJson?: boolean): Statement;
-    compile<T>(query: Query<T>, formatInline?: boolean): Statement.Compiled;
-    format<T>(query: Query<T>, ctx?: FormatContext): Statement;
-    formatSelect(query: Query.Select, ctx: FormatContext): Statement;
-    formatInsert(query: Query.Insert, ctx: FormatContext): Statement;
-    formatUpdate(query: Query.Update, ctx: FormatContext): Statement;
-    formatDelete(query: Query.Delete, ctx: FormatContext): Statement;
-    formatCreateTable(query: Query.CreateTable, ctx: FormatContext): Statement;
-    formatCreateIndex(query: Query.CreateIndex, ctx?: FormatContext): Statement;
-    formatDropIndex(query: Query.DropIndex, ctx: FormatContext): Statement;
-    formatAlterTable(query: Query.AlterTable, ctx: FormatContext): Statement;
-    formatTransaction({ op, id }: Query.Transaction, ctx: FormatContext): Statement;
-    formatBatch(queries: Query[], ctx: FormatContext): Statement;
-    formatRaw({ strings, params }: Query.Raw, ctx: FormatContext): Statement;
-    formatColumn(column: ColumnData): Statement;
-    formatContraintReference(reference: ExprData): Statement;
-    formatType(type: ColumnType): Statement;
-    formatInsertRow(columns: Record<string, ColumnData>, row: Record<string, any>): Statement;
-    formatColumnValue(column: ColumnData, columnValue: any): Statement;
-    formatTarget(target: Target, ctx: FormatContext): Statement;
-    formatWhere(expr: ExprData | undefined, ctx: FormatContext): Statement | undefined;
-    formatHaving(expr: ExprData | undefined, ctx: FormatContext): Statement | undefined;
-    formatGroupBy(groupBy: Array<ExprData> | undefined, ctx: FormatContext): Statement | undefined;
-    formatOrderBy(orderBy: Array<OrderBy> | undefined, ctx: FormatContext): Statement | undefined;
-    formatLimit({ limit, offset, singleResult }: Query.QueryBase, ctx: FormatContext): Statement | undefined;
-    formatSelection(selection: ExprData, ctx: FormatContext): Statement;
-    formatExprValue(expr: ExprData, ctx: FormatContext): Statement;
-    formatIn(expr: ExprData, ctx: FormatContext): Statement;
-    formatUnwrapArray(stmt: Statement): Statement;
-    retrieveField(expr: ExprData, field: string): ExprData | undefined;
-    formatField(expr: ExprData, field: string, ctx: FormatContext): Statement;
-    formatString(input: string): Statement;
-    formatInlineValue(rawValue: any): Statement;
-    formatValue(rawValue: any, ctx: FormatContext): Statement;
-    formatExpr(expr: ExprData, ctx: FormatContext): Statement;
-}
+import { ColumnData, ColumnType } from './Column';
+import { ExprData } from './Expr';
+import { OrderBy } from './OrderBy';
+import { Query } from './Query';
+import { Sanitizer } from './Sanitizer';
+import { Statement } from './Statement';
+import { Target } from './Target';
+export interface FormatContext {
+    nameResult?: string;
+    skipTableName?: boolean;
+    forceInline?: boolean;
+    formatAsJson?: boolean;
+    formatSubject?: (subject: Statement) => Statement;
+}
+export declare abstract class Formatter implements Sanitizer {
+    constructor();
+    abstract escapeValue(value: any): string;
+    abstract escapeIdentifier(ident: string): string;
+    abstract formatSqlAccess(on: Statement, field: string): Statement;
+    abstract formatJsonAccess(on: Statement, field: string): Statement;
+    formatAccess(on: Statement, field: string, formatAsJson?: boolean): Statement;
+    compile<T>(query: Query<T>, formatInline?: boolean): import("./Statement").CompiledStatement;
+    format<T>(query: Query<T>, ctx?: FormatContext): Statement;
+    formatSelect(query: Query.Select, ctx: FormatContext): Statement;
+    formatInsert(query: Query.Insert, ctx: FormatContext): Statement;
+    formatUpdate(query: Query.Update, ctx: FormatContext): Statement;
+    formatDelete(query: Query.Delete, ctx: FormatContext): Statement;
+    formatCreateTable(query: Query.CreateTable, ctx: FormatContext): Statement;
+    formatCreateIndex(query: Query.CreateIndex, ctx?: FormatContext): Statement;
+    formatDropIndex(query: Query.DropIndex, ctx: FormatContext): Statement;
+    formatAlterTable(query: Query.AlterTable, ctx: FormatContext): Statement;
+    formatTransaction({ op, id }: Query.Transaction, ctx: FormatContext): Statement;
+    formatBatch(queries: Query[], ctx: FormatContext): Statement;
+    formatRaw({ strings, params }: Query.Raw, ctx: FormatContext): Statement;
+    formatColumn(column: ColumnData): Statement;
+    formatContraintReference(reference: ExprData): Statement;
+    formatType(type: ColumnType): Statement;
+    formatInsertRow(columns: Record<string, ColumnData>, row: Record<string, any>): Statement;
+    formatColumnValue(column: ColumnData, columnValue: any): Statement;
+    formatTarget(target: Target, ctx: FormatContext): Statement;
+    formatWhere(expr: ExprData | undefined, ctx: FormatContext): Statement | undefined;
+    formatHaving(expr: ExprData | undefined, ctx: FormatContext): Statement | undefined;
+    formatGroupBy(groupBy: Array<ExprData> | undefined, ctx: FormatContext): Statement | undefined;
+    formatOrderBy(orderBy: Array<OrderBy> | undefined, ctx: FormatContext): Statement | undefined;
+    formatLimit({ limit, offset, singleResult }: Query.QueryBase, ctx: FormatContext): Statement | undefined;
+    formatSelection(selection: ExprData, ctx: FormatContext): Statement;
+    formatExprValue(expr: ExprData, ctx: FormatContext): Statement;
+    formatIn(expr: ExprData, ctx: FormatContext): Statement;
+    formatUnwrapArray(stmt: Statement): Statement;
+    retrieveField(expr: ExprData, field: string): ExprData | undefined;
+    formatField(expr: ExprData, field: string, ctx: FormatContext): Statement;
+    formatString(input: string): Statement;
+    formatInlineValue(rawValue: any): Statement;
+    formatValue(rawValue: any, ctx: FormatContext): Statement;
+    formatExpr(expr: ExprData, ctx: FormatContext): Statement;
+}

package/dist/lib/Formatter.js

@@ -1,6 +1,6 @@
 // src/lib/Formatter.ts
 import { ColumnType } from "./Column.js";
-import { BinOp, ExprData, ExprType, UnOp } from "./Expr.js";
+import { BinOp, Expr, ExprData, ExprType, UnOp } from "./Expr.js";
 import { OrderDirection } from "./OrderBy.js";
 import { ParamType } from "./Param.js";
 import { Query, QueryType } from "./Query.js";
@@ -9,6 +9,7 @@ import {
   call,
   identifier,
   newline,
+  param,
   parenthesis,
   raw,
   separated,
@@ -163,7 +164,14 @@ var Formatter = class {
     );
   }
   formatRaw({ strings, params }, ctx) {
-    return Statement.tag(strings, ...params);
+    return Statement.tag(
+      strings,
+      params.map((param2) => {
+        if (param2 instanceof Expr)
+          return this.formatExpr(param2.expr, ctx);
+        return this.formatValue(param2, ctx);
+      })
+    );
   }
   formatColumn(column) {
     return identifier(column.name).add(this.formatType(column.type)).addIf(column.unique, "UNIQUE").addIf(column.autoIncrement, "AUTOINCREMENT").addIf(column.primaryKey, "PRIMARY KEY").addIf(!column.nullable, "NOT NULL").addIf(
@@ -209,6 +217,8 @@ var Formatter = class {
     );
   }
   formatColumnValue(column, columnValue) {
+    if (columnValue instanceof Expr)
+      return this.formatExprValue(columnValue.expr, {});
     const isNull = columnValue === void 0 || columnValue === null;
     const isOptional = column.nullable || column.autoIncrement || column.primaryKey;
     if (isNull) {
@@ -231,7 +241,7 @@ var Formatter = class {
       case ColumnType.Boolean:
         if (typeof columnValue !== "boolean")
           throw new TypeError(`Expected boolean for column ${column.name}`);
-        return value(columnValue);
+        return raw(this.escapeValue(columnValue));
       case ColumnType.Json:
         if (typeof columnValue !== "object")
           throw new TypeError(`Expected object for column ${column.name}`);
@@ -409,7 +419,7 @@ var Formatter = class {
           case ParamType.Value:
             return this.formatValue(expr.param.value, ctx);
           case ParamType.Named:
-            throw new Error("todo");
+            return param(expr.param.name);
         }
       case ExprType.Field:
         return this.formatField(expr.expr, expr.field, ctx);

package/dist/lib/Functions.d.ts

@@ -1,7 +1,7 @@
-import { EV, Expr } from './Expr';
-export declare const Functions: Functions;
-/** These will have to be supported in every driver */
-export type Functions = {
-    count(x?: Expr<any>): Expr<number>;
-    iif<T>(x: EV<boolean>, y: EV<T>, z: EV<T>): Expr<T>;
-};
+import { EV, Expr } from './Expr';
+export declare const Functions: Functions;
+/** These will have to be supported in every driver */
+export type Functions = {
+    count(x?: Expr<any>): Expr<number>;
+    iif<T>(x: EV<boolean>, y: EV<T>, z: EV<T>): Expr<T>;
+};

package/dist/lib/Id.d.ts

@@ -1,3 +1,3 @@
-export type Id<T extends {
-    id: any;
-}> = T['id'];
+export type Id<T extends {
+    id: any;
+}> = T['id'];

package/dist/lib/Index.d.ts

@@ -1,17 +1,17 @@
-import { Expr, ExprData } from './Expr';
-interface PartialIndexData {
-    on: Array<ExprData>;
-    where?: ExprData;
-    unique?: boolean;
-}
-export interface IndexData extends PartialIndexData {
-    name: string;
-}
-export declare class Index {
-    data: PartialIndexData;
-    constructor(data: PartialIndexData);
-    where(where: Expr<boolean>): Index;
-    unique(): Index;
-}
-export declare function index(...on: Array<Expr<any>>): Index;
-export {};
+import { Expr, ExprData } from './Expr';
+interface PartialIndexData {
+    on: Array<ExprData>;
+    unique?: boolean;
+    where?: ExprData;
+}
+export interface IndexData extends PartialIndexData {
+    name: string;
+}
+export declare class Index {
+    data: PartialIndexData;
+    constructor(data: PartialIndexData);
+    unique(): Index;
+    where(where: Expr<boolean>): Index;
+}
+export declare function index(...on: Array<Expr<any>>): Index;
+export {};

package/dist/lib/Index.js

@@ -4,12 +4,12 @@ var Index = class {
   constructor(data) {
     this.data = data;
   }
-  where(where) {
-    return new Index({ ...this.data, where: ExprData.create(where) });
-  }
   unique() {
     return new Index({ ...this.data, unique: true });
   }
+  where(where) {
+    return new Index({ ...this.data, where: ExprData.create(where) });
+  }
 };
 function index(...on) {
   return new Index({ on: on.map(ExprData.create) });

package/dist/lib/Ops.d.ts

@@ -1,8 +1,8 @@
-import { Cursor } from './Cursor';
-import { Table } from './Table';
-export declare function selectAll<Row>(table: Table<Row>): Cursor.SelectMultiple<Row>;
-export declare function selectFirst<Row>(table: Table<Row>): Cursor.SelectSingle<Row>;
-export declare function update<Row>(table: Table<Row>): Cursor.Update<Row>;
-export declare function insertInto<Row>(table: Table<Row>): Cursor.Insert<Row>;
-export declare function deleteFrom<Row>(table: Table<Row>): Cursor.Delete<Row>;
-export declare function create(...tables: Array<Table<any>>): Cursor.Batch;
+import { Cursor } from './Cursor';
+import { Table } from './Table';
+export declare function selectAll<Row>(table: Table<Row>): Cursor.SelectMultiple<Row>;
+export declare function selectFirst<Row>(table: Table<Row>): Cursor.SelectSingle<Row>;
+export declare function update<Row>(table: Table<Row>): Cursor.Update<Row>;
+export declare function insertInto<Row>(table: Table<Row>): Cursor.Insert<Row>;
+export declare function deleteFrom<Row>(table: Table<Row>): Cursor.Delete;
+export declare function create(...tables: Array<Table<any>>): Cursor.Batch;

package/dist/lib/OrderBy.d.ts

@@ -1,9 +1,9 @@
-import { ExprData } from './Expr';
-export declare enum OrderDirection {
-    Asc = "Asc",
-    Desc = "Desc"
-}
-export type OrderBy = {
-    expr: ExprData;
-    order: OrderDirection;
-};
+import { ExprData } from './Expr';
+export declare enum OrderDirection {
+    Asc = "Asc",
+    Desc = "Desc"
+}
+export type OrderBy = {
+    expr: ExprData;
+    order: OrderDirection;
+};