pqb 0.11.1 → 0.11.2

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { Sql, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, NullableColumn, QueryInternal, QueryMetaBase, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, BaseNumberData, Code, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
+import { Sql, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, NullableColumn, QueryInternal, QueryMetaBase, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, BaseNumberData, Code, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, EncodeColumn, ParseColumn, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -3023,9 +3023,9 @@ declare class CitextColumn extends TextBaseColumn {
 }
 
 type DateMethods = typeof dateTypeMethods;
-interface DateBaseColumn extends ColumnType<string, typeof Operators.date, string | Date>, DateMethods {
+interface DateBaseColumn extends ColumnType<string, typeof Operators.date, string | number | Date>, DateMethods {
 }
-declare abstract class DateBaseColumn extends ColumnType<string, typeof Operators.date, string | Date> {
+declare abstract class DateBaseColumn extends ColumnType<string, typeof Operators.date, string | number | Date> {
     data: DateColumnData;
     operators: {
         lt: ((key: string, value: orchid_core.RawExpression | Date | Query, values: unknown[]) => string) & {
@@ -3056,10 +3056,9 @@ declare abstract class DateBaseColumn extends ColumnType<string, typeof Operator
             type: orchid_core.RawExpression | Query | Date[];
         };
     };
-    asNumber(): IntegerColumn;
-    asDate<T extends ColumnType>(this: T): Omit<T, "type"> & {
-        type: Date;
-    };
+    encodeFn: (input: string | number | Date) => Date;
+    asNumber(): EncodeColumn<IntegerColumn, string | number | Date>;
+    asDate<T extends ColumnType>(this: T): ParseColumn<T, Date>;
 }
 declare class DateColumn extends DateBaseColumn {
     dataType: "date";
@@ -3560,12 +3559,8 @@ declare abstract class ColumnType<Type = unknown, Ops extends BaseOperators = Ba
     };
     hidden<T extends ColumnType>(this: T): HiddenColumn<T>;
     nullable<T extends ColumnType>(this: T): NullableColumn<T>;
-    encode<T extends ColumnType, Input>(this: T, fn: (input: Input) => unknown): Omit<T, 'inputType'> & {
-        inputType: Input;
-    };
-    parse<T extends ColumnType, Output>(this: T, fn: (input: T['type']) => Output): Omit<T, 'type'> & {
-        type: Output;
-    };
+    encode<T extends ColumnType, Input>(this: T, fn: (input: Input) => unknown): EncodeColumn<T, Input>;
+    parse<T extends ColumnType, Output>(this: T, fn: (input: T['type']) => Output): ParseColumn<T, Output>;
     as<T extends ColumnType, C extends ColumnType<T['type'], BaseOperators, T['inputType']>>(this: T, column: C): C;
     toSQL(): string;
     index<T extends ColumnType>(this: T, options?: Omit<SingleColumnIndexOptions, 'column'>): T;
@@ -3636,7 +3631,7 @@ declare const foreignKeyArgumentToCode: (foreignKey: ForeignKey<string, string[]
 declare const columnIndexesToCode: (indexes: Exclude<ColumnData['indexes'], undefined>) => Code[];
 declare const columnCheckToCode: (t: string, check: RawExpression) => string;
 declare const identityToCode: (identity: TableData.Identity, dataType?: string) => Code[];
-declare const columnCode: (type: ColumnType, t: string, code: Code, data?: ColumnData) => Code;
+declare const columnCode: (type: ColumnType, t: string, code: Code, data?: ColumnData, skip?: Record<'encodeFn', unknown>) => Code;
 
 declare const columnsByType: Record<string, new (...args: never[]) => ColumnType>;
 

package/dist/index.js

@@ -677,7 +677,7 @@ const identityToCode = (identity, dataType) => {
   orchidCore.addCode(code, ")");
   return code;
 };
-const columnCode = (type, t, code, data = type.data) => {
+const columnCode = (type, t, code, data = type.data, skip) => {
   code = orchidCore.toArray(code);
   let prepend = `${t}.`;
   if (data.name) {
@@ -699,7 +699,7 @@ const columnCode = (type, t, code, data = type.data) => {
     orchidCore.addCode(code, ".hidden()");
   if (data.isNullable)
     orchidCore.addCode(code, ".nullable()");
-  if (type.encodeFn)
+  if (type.encodeFn && type.encodeFn !== (skip == null ? void 0 : skip.encodeFn))
     orchidCore.addCode(code, `.encode(${type.encodeFn.toString()})`);
   if (type.parseFn && !("hideFromCode" in type.parseFn))
     orchidCore.addCode(code, `.parse(${type.parseFn.toString()})`);
@@ -1231,13 +1231,18 @@ class CitextColumn extends TextBaseColumn {
   }
 }
 
+const dateTimeEncode = (input) => {
+  return typeof input === "object" ? input : new Date(input);
+};
+const skip = { encodeFn: dateTimeEncode };
 class DateBaseColumn extends ColumnType {
   constructor() {
     super(...arguments);
     this.operators = Operators.date;
+    this.encodeFn = dateTimeEncode;
   }
   asNumber() {
-    return this.encode((input) => new Date(input)).parse(Date.parse).as(
+    return this.parse(Date.parse).as(
       new IntegerColumn({ [orchidCore.nameKey]: this.data.name })
     );
   }
@@ -1252,7 +1257,13 @@ class DateColumn extends DateBaseColumn {
     this.dataType = "date";
   }
   toCode(t) {
-    return columnCode(this, t, `date()${orchidCore.dateDataToCode(this.data)}`);
+    return columnCode(
+      this,
+      t,
+      `date()${orchidCore.dateDataToCode(this.data)}`,
+      this.data,
+      skip
+    );
   }
 }
 class DateTimeBaseClass extends DateBaseColumn {
@@ -1281,7 +1292,9 @@ const timestampToCode = (self, t) => {
   return columnCode(
     self,
     t,
-    `${self instanceof TimestampColumn ? "timestampWithoutTimeZone" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data)}`
+    `${self instanceof TimestampColumn ? "timestampWithoutTimeZone" : "timestamp"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data)}`,
+    self.data,
+    skip
   );
 };
 class TimestampColumn extends DateTimeBaseClass {
@@ -1313,7 +1326,9 @@ class TimeColumn extends DateTimeBaseClass {
     return columnCode(
       this,
       t,
-      `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(this.data)}`
+      `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(this.data)}`,
+      this.data,
+      skip
     );
   }
 }
@@ -1330,7 +1345,9 @@ class IntervalColumn extends ColumnType {
     return columnCode(
       this,
       t,
-      `interval(${[fields && `'${fields}'`, precision && String(precision)].filter((part) => part).join(", ")})`
+      `interval(${[fields && `'${fields}'`, precision && String(precision)].filter((part) => part).join(", ")})`,
+      this.data,
+      skip
     );
   }
   toSQL() {