pqb 0.18.15 → 0.18.17

package/dist/index.d.ts

@@ -493,14 +493,14 @@ type DbTableOptions = {
 } & QueryLogOptions;
 type QueryDefaultReturnData<Shape extends ColumnsShapeBase> = Pick<ColumnShapeOutput<Shape>, DefaultSelectColumns<Shape>[number]>[];
 declare const anyShape: Record<string, ColumnType<unknown, BaseOperators, unknown, unknown, unknown>>;
-interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends RelationsBase = EmptyObject, CT extends ColumnTypesBase = DefaultColumnTypes, Data = QueryDefaultReturnData<Shape>> extends DbBase<Adapter, Table, Shape, CT>, QueryMethods<CT> {
+interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends RelationsBase = EmptyObject, CT extends ColumnTypesBase = DefaultColumnTypes, ShapeWithComputed extends ColumnsShape = Shape, Data = QueryDefaultReturnData<Shape>> extends DbBase<Adapter, Table, Shape, CT, ShapeWithComputed>, QueryMethods<CT> {
     new (adapter: Adapter, queryBuilder: Db<Table, Shape, Relations, CT>, table?: Table, shape?: Shape, options?: DbTableOptions): this;
     internal: Query['internal'];
     queryBuilder: Db;
     onQueryBuilder: Query['onQueryBuilder'];
     primaryKeys: Query['primaryKeys'];
     q: QueryData;
-    selectable: SelectableFromShape<Shape, Table>;
+    selectable: SelectableFromShape<ShapeWithComputed, Table>;
     returnType: Query['returnType'];
     then: QueryThen<Data>;
     catch: QueryCatch<Data>;
@@ -516,13 +516,13 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
         }[keyof Shape], true>;
     };
 }
-declare class Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends RelationsBase = EmptyObject, CT extends ColumnTypesBase = DefaultColumnTypes> implements Query {
+declare class Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends RelationsBase = EmptyObject, CT extends ColumnTypesBase = DefaultColumnTypes, ShapeWithComputed extends ColumnsShape = Shape> implements Query {
     adapter: Adapter;
     queryBuilder: Db;
     table: Table;
-    shape: Shape;
+    shape: ShapeWithComputed;
     columnTypes: CT;
-    constructor(adapter: Adapter, queryBuilder: Db, table: Table, shape: Shape, columnTypes: CT, transactionStorage: AsyncLocalStorage<TransactionState>, options: DbTableOptions);
+    constructor(adapter: Adapter, queryBuilder: Db, table: Table, shape: ShapeWithComputed, columnTypes: CT, transactionStorage: AsyncLocalStorage<TransactionState>, options: DbTableOptions);
     [inspect.custom](): string;
     /**
      * Use `query` to perform raw SQL queries.
@@ -5908,6 +5908,7 @@ type Ord<Value> = Base<Value> & {
         Value | Query | Expression
     ], BooleanColumn>;
 };
+type Numeric = Ord<number>;
 type Text = Base<string> & {
     contains: Operator<string | Query | Expression, BooleanColumn>;
     containsSensitive: Operator<string | Query | Expression, BooleanColumn>;
@@ -5928,9 +5929,9 @@ type Json = Base<unknown> & {
 declare const Operators: {
     any: Base<any>;
     boolean: Bool;
-    number: Ord<number>;
-    date: Ord<number>;
-    time: Ord<number>;
+    number: Numeric;
+    date: Ord<Date | string>;
+    time: Numeric;
     text: Text;
     json: Json;
     array: Base<any>;
@@ -6773,16 +6774,16 @@ interface DateBaseColumn extends ColumnType<string, typeof Operators.date, strin
 declare abstract class DateBaseColumn extends ColumnType<string, typeof Operators.date, string | number | Date, string, string | number | Date> {
     data: DateColumnData;
     operators: {
-        equals: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        not: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        in: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | number[], BooleanColumn>;
-        notIn: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | number[], BooleanColumn>;
+        equals: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        not: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        in: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | (string | Date)[], BooleanColumn>;
+        notIn: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | (string | Date)[], BooleanColumn>;
     } & {
-        lt: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        lte: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        gt: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        gte: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        between: Operator<[number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query], BooleanColumn>;
+        lt: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        lte: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        gt: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        gte: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        between: Operator<[string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query], BooleanColumn>;
     };
     encodeFn: (input: string | number | Date) => Date;
     asNumber(): EncodeColumn<IntegerColumn, string | number | Date>;
@@ -6831,16 +6832,16 @@ declare class IntervalColumn<Fields extends string | undefined = undefined, Prec
         precision: Precision;
     };
     operators: {
-        equals: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        not: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        in: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | number[], BooleanColumn>;
-        notIn: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | number[], BooleanColumn>;
+        equals: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        not: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        in: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | (string | Date)[], BooleanColumn>;
+        notIn: Operator<orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query | (string | Date)[], BooleanColumn>;
     } & {
-        lt: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        lte: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        gt: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        gte: Operator<number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, BooleanColumn>;
-        between: Operator<[number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query, number | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Query], BooleanColumn>;
+        lt: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        lte: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        gt: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        gte: Operator<string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, BooleanColumn>;
+        between: Operator<[string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query, string | orchid_core.Expression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, unknown, unknown, orchid_core.ColumnDataBase>> | Date | Query], BooleanColumn>;
     };
     constructor(fields?: Fields, precision?: Precision);
     toCode(t: string): Code;

package/dist/index.js

@@ -2555,7 +2555,7 @@ const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
   }
   return addValue(ctx.values, arg);
 };
-const ops = {
+const base = {
   equals: make(
     (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -2567,7 +2567,17 @@ const ops = {
   ),
   notIn: make(
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
+  )
+};
+const boolean = __spreadProps$7(__spreadValues$b({}, base), {
+  and: make(
+    (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
+  or: make(
+    (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
+  )
+});
+const numeric = __spreadProps$7(__spreadValues$b({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -2580,6 +2590,15 @@ const ops = {
   gte: make(
     (key, value, ctx, quotedAs) => `${key} >= ${quoteValue(value, ctx, quotedAs)}`
   ),
+  between: make(
+    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
+      to,
+      ctx,
+      quotedAs
+    )}`
+  )
+});
+const text = __spreadProps$7(__spreadValues$b({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -2597,14 +2616,9 @@ const ops = {
   ),
   endsWithSensitive: make(
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue(value, ctx, quotedAs)}`
-  ),
-  between: make(
-    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
-      to,
-      ctx,
-      quotedAs
-    )}`
-  ),
+  )
+});
+const json = __spreadProps$7(__spreadValues$b({}, base), {
   jsonPath: make(
     (key, [path, op, value], ctx, quotedAs) => `jsonb_path_query_first(${key}, '${path}') #>> '{}' ${op} ${quoteValue(
       value,
@@ -2618,50 +2632,14 @@ const ops = {
   ),
   jsonSubsetOf: make(
     (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
-  ),
-  and: make(
-    (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
-  ),
-  or: make(
-    (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
-};
-const base = {
-  equals: ops.equals,
-  not: ops.not,
-  in: ops.in,
-  notIn: ops.notIn
-};
-const boolean = __spreadProps$7(__spreadValues$b({}, base), {
-  and: ops.and,
-  or: ops.or
-});
-const numeric = __spreadProps$7(__spreadValues$b({}, base), {
-  lt: ops.lt,
-  lte: ops.lte,
-  gt: ops.gt,
-  gte: ops.gte,
-  between: ops.between
-});
-const text = __spreadProps$7(__spreadValues$b({}, base), {
-  contains: ops.contains,
-  containsSensitive: ops.containsSensitive,
-  startsWith: ops.startsWith,
-  startsWithSensitive: ops.startsWithSensitive,
-  endsWith: ops.endsWith,
-  endsWithSensitive: ops.endsWithSensitive
-});
-const json = __spreadProps$7(__spreadValues$b({}, base), {
-  jsonPath: ops.jsonPath,
-  jsonSupersetOf: ops.jsonSupersetOf,
-  jsonSubsetOf: ops.jsonSubsetOf
 });
 const Operators = {
   any: base,
   boolean,
   number: numeric,
-  date: base,
-  time: base,
+  date: numeric,
+  time: numeric,
   text,
   json,
   array: base