pqb 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -233,7 +233,7 @@ declare class WhereQueryBuilder<Q extends QueryBase = QueryBase> extends Where i
 declare type OptionalKeys<T extends Query> = {
     [K in keyof T['shape']]: T['shape'][K]['isPrimaryKey'] extends true ? K : T['shape'][K]['isNullable'] extends true ? K : never;
 }[keyof T['shape']];
-declare type InsertData<T extends Query, DefaultKeys extends string = T[defaultsKey] extends string ? T[defaultsKey] : never, Data = SetOptional<SetOptional<T['inputType'], OptionalKeys<T>>, DefaultKeys>> = [keyof T['relations']] extends [never] ? Data : Omit<Data, {
+declare type InsertData<T extends Query, DefaultKeys extends PropertyKey = keyof T[defaultsKey], Data = SetOptional<SetOptional<T['inputType'], OptionalKeys<T>>, DefaultKeys>> = [keyof T['relations']] extends [never] ? Data : Omit<Data, {
     [K in keyof T['relations']]: T['relations'][K] extends BelongsToRelation ? T['relations'][K]['options']['foreignKey'] : never;
 }[keyof T['relations']]> & {
     [Key in keyof T['relations']]: T['relations'][Key] extends BelongsToRelation ? SetOptional<{
@@ -284,10 +284,10 @@ declare class Insert {
         values: RawExpression;
     }): SetQueryReturnsAll<T>;
     defaults<T extends Query, Data extends Partial<InsertData<T>>>(this: T, data: Data): T & {
-        [defaultsKey]: keyof Data;
+        [defaultsKey]: Record<keyof Data, true>;
     };
     _defaults<T extends Query, Data extends Partial<InsertData<T>>>(this: T, data: Data): T & {
-        [defaultsKey]: keyof Data;
+        [defaultsKey]: Record<keyof Data, true>;
     };
     onConflict<T extends Query, Arg extends OnConflictArg<T>>(this: T, arg?: Arg): OnConflictQueryBuilder<T, Arg>;
     _onConflict<T extends Query, Arg extends OnConflictArg<T> | undefined = undefined>(this: T, arg?: Arg): OnConflictQueryBuilder<T, Arg>;
@@ -496,7 +496,7 @@ declare type RelationQuery<RelationName extends PropertyKey = string, Params ext
     [isRequiredRelationKey]: Required;
     [relationQueryKey]: string;
 }> = ((params: Params) => Q & {
-    [defaultsKey]: Pick<T['type'], Populate>;
+    [defaultsKey]: Record<Populate, true>;
 }) & Q;
 
 interface QueryResultRow {
@@ -1202,7 +1202,9 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
     withData: Query['withData'];
     joinedTables: Query['joinedTables'];
     relations: Relations;
-    [defaultsKey]: Query[defaultsKey];
+    [defaultsKey]: Record<{
+        [K in keyof Shape]: Shape[K]['hasDefault'] extends true ? K : never;
+    }[keyof Shape], true>;
 }
 declare class Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations']> implements Query {
     adapter: Adapter;
@@ -1305,8 +1307,12 @@ declare const createDb: <CT extends ColumnTypesBase = {
     timestamps<T_14 extends ColumnType<unknown, Operators, unknown>>(this: {
         timestamp(): T_14;
     }): {
-        createdAt: T_14;
-        updatedAt: T_14;
+        createdAt: T_14 & {
+            hasDefault: true;
+        };
+        updatedAt: T_14 & {
+            hasDefault: true;
+        };
     };
     primaryKey(columns: string[], options?: {
         name?: string | undefined;
@@ -1530,7 +1536,7 @@ declare type Query = QueryMethods & {
     columnsParsers?: ColumnsParsers;
     relations: RelationsBase;
     withData: WithDataBase;
-    [defaultsKey]?: string;
+    [defaultsKey]: {};
 };
 declare type Selectable<T extends QueryBase> = StringKey<keyof T['selectable']>;
 declare type QueryWithTable = Query & {
@@ -2286,6 +2292,7 @@ declare abstract class ColumnType<Type = unknown, Ops extends Operators = Operat
     isPrimaryKey: boolean;
     isHidden: boolean;
     isNullable: boolean;
+    hasDefault: boolean;
     encodeFn?: (input: any) => unknown;
     parseFn?: (input: unknown) => unknown;
     parseItem?: (input: string) => unknown;
@@ -2310,8 +2317,10 @@ declare abstract class ColumnType<Type = unknown, Ops extends Operators = Operat
         type: Output;
     };
     toSQL(): string;
-    default<T extends ColumnType>(this: T, value: T['type'] | RawExpression): T;
-    index<T extends ColumnType>(this: T, options?: Omit<SingleColumnIndexOptions, 'column'>): any;
+    default<T extends ColumnType>(this: T, value: T['type'] | RawExpression): T & {
+        hasDefault: true;
+    };
+    index<T extends ColumnType>(this: T, options?: Omit<SingleColumnIndexOptions, 'column'>): T;
     unique<T extends ColumnType>(this: T, options?: Omit<SingleColumnIndexOptions, 'column' | 'unique'>): T;
     comment<T extends ColumnType>(this: T, comment: string): T;
     validationDefault<T extends ColumnType>(this: T, value: T['type']): T;
@@ -4248,8 +4257,12 @@ declare const columnTypes: {
     timestamps<T_1 extends ColumnType<unknown, Operators, unknown>>(this: {
         timestamp(): T_1;
     }): {
-        createdAt: T_1;
-        updatedAt: T_1;
+        createdAt: T_1 & {
+            hasDefault: true;
+        };
+        updatedAt: T_1 & {
+            hasDefault: true;
+        };
     };
     primaryKey(columns: string[], options?: {
         name?: string;

package/dist/index.esm.js

@@ -25,6 +25,7 @@ class ColumnType {
     this.isPrimaryKey = false;
     this.isHidden = false;
     this.isNullable = false;
+    this.hasDefault = false;
     this.chain = [];
   }
   primaryKey() {