pqb 0.18.29 → 0.18.30

package/dist/index.d.ts

@@ -82,7 +82,7 @@ type RelationConfigBase = {
     dataForUpdate: unknown;
     dataForUpdateOne: unknown;
     params: Record<string, unknown>;
-    populate: string;
+    populate: Record<string, true>;
     chainedCreate: boolean;
     chainedDelete: boolean;
 };
@@ -97,7 +97,7 @@ type RelationQueryBase = Query & {
 type RelationQuery<Name extends PropertyKey = PropertyKey, Config extends RelationConfigBase = RelationConfigBase, T extends Query = Query, Q extends Query = {
     [K in keyof T | 'relationConfig']: K extends 'meta' ? Omit<T['meta'], 'as' | 'defaults'> & {
         as: StringKey<Name>;
-        defaults: T['meta']['defaults'] | Config['populate'];
+        defaults: T['meta']['defaults'] & Config['populate'];
         hasWhere: true;
     } : K extends 'join' ? <T extends Query>(this: T) => T : K extends CreateMethodsNames ? Config['chainedCreate'] extends true ? T[K] : never : K extends DeleteMethodsNames ? Config['chainedDelete'] extends true ? T[K] : never : K extends keyof T ? T[K] : K extends 'relationConfig' ? Config : never;
 }> = ((params: Config['params']) => Config['one'] extends true ? Config['required'] extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q> : Q) & Q;
@@ -516,8 +516,8 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
     meta: {
         kind: 'select';
         defaults: {
-            [K in keyof Shape]: undefined | unknown extends Shape[K]['data']['default'] ? never : K;
-        }[keyof Shape];
+            [K in keyof Shape as unknown extends Shape[K]['data']['default'] ? never : K]: true;
+        };
     };
 }
 declare class Db<Table extends string | undefined = undefined, Shape extends ColumnsShapeBase = Record<string, never>, Relations extends RelationsBase = EmptyObject, ColumnTypes = DefaultColumnTypes, ShapeWithComputed extends ColumnsShapeBase = Shape> implements Query {
@@ -1258,13 +1258,13 @@ declare class CopyMethods {
 
 type CreateData<T extends Query, Data = SetOptional<{
     [K in keyof T['inputType']]: CreateColumn<T, K>;
-}, T['meta']['defaults']>> = [keyof T['relations']] extends [never] ? Data : CreateRelationsData<T, T['relations'], Data>;
+}, keyof T['meta']['defaults']>> = [keyof T['relations']] extends [never] ? Data : CreateRelationsData<T, T['relations'], Data>;
 type CreateColumn<T extends Query, Key extends keyof T['inputType']> = Expression | T['inputType'][Key] | {
     [K in keyof Query]: K extends 'then' ? QueryThen<T['inputType'][Key]> : Query[K];
 };
 type CreateRelationsData<T extends Query, Relations extends RelationsBase, Data> = Omit<Data, Relations[keyof Relations]['relationConfig']['omitForeignKeyInCreate']> & CreateRelationsDataOmittingFKeys<T, Relations> & Relations[keyof Relations]['relationConfig']['optionalDataForCreate'];
 type CreateRelationsDataOmittingFKeys<T extends Query, Relations extends RelationsBase, Union extends [Record<string, unknown>] = {
-    [K in keyof Relations]: CreateRelationDataOmittingFKeys<Relations[K]['relationConfig'], T['meta']['defaults']>;
+    [K in keyof Relations]: CreateRelationDataOmittingFKeys<Relations[K]['relationConfig'], keyof T['meta']['defaults']>;
 }[keyof Relations]> = (Union extends any ? (u: Union) => void : never) extends (u: [infer Obj]) => void ? Obj : never;
 type CreateRelationDataOmittingFKeys<RelationConfig extends RelationConfigBase, Defaults extends PropertyKey, Data extends RelationConfigDataForCreate | undefined = RelationConfig['dataForCreate']> = Data extends RelationConfigDataForCreate ? [
     keyof Data['columns'] extends Defaults ? Omit<Data['columns'], Defaults> & {
@@ -1289,7 +1289,7 @@ type CreateManyRawData<T extends Query> = {
     values: Expression[];
 };
 type RawRequiredColumns<T extends Query> = {
-    [K in keyof T['inputType'] as K extends T['meta']['defaults'] ? never : null extends T['inputType'][K] ? never : undefined extends T['inputType'][K] ? never : K]: true;
+    [K in keyof T['inputType'] as K extends keyof T['meta']['defaults'] ? never : null extends T['inputType'][K] ? never : undefined extends T['inputType'][K] ? never : K]: true;
 };
 type CreateRawArgs<T extends Query, Arg extends {
     columns: (keyof T['shape'])[];
@@ -1297,9 +1297,9 @@ type CreateRawArgs<T extends Query, Arg extends {
     `Missing required columns: ${Exclude<StringKey<keyof RawRequiredColumns<T>>, Arg['columns'][number]>}`
 ];
 type OnConflictArg<T extends Query> = keyof T['shape'] | (keyof T['shape'])[] | Expression;
-type AddQueryDefaults<T extends Query, Defaults extends PropertyKey> = {
+type AddQueryDefaults<T extends Query, Defaults extends Record<string, true>> = {
     [K in keyof T]: K extends 'meta' ? {
-        [K in keyof T['meta']]: K extends 'defaults' ? T['meta']['defaults'] | Defaults : T['meta'][K];
+        [K in keyof T['meta']]: K extends 'defaults' ? T['meta']['defaults'] & Defaults : T['meta'][K];
     } : T[K];
 };
 /**
@@ -1537,8 +1537,8 @@ declare class Create {
      *
      * @param data - default values for `create` and `createMany` which will follow `defaults`
      */
-    defaults<T extends Query, Data extends Partial<CreateData<T>>>(this: T, data: Data): AddQueryDefaults<T, keyof Data>;
-    _defaults<T extends Query, Data extends Partial<CreateData<T>>>(this: T, data: Data): AddQueryDefaults<T, keyof Data>;
+    defaults<T extends Query, Data extends Partial<CreateData<T>>>(this: T, data: Data): AddQueryDefaults<T, Record<keyof Data, true>>;
+    _defaults<T extends Query, Data extends Partial<CreateData<T>>>(this: T, data: Data): AddQueryDefaults<T, Record<keyof Data, true>>;
     /**
      * A modifier for creating queries that specify alternative behavior in the case of a conflict.
      * A conflict occurs when a table has a `PRIMARY KEY` or a `UNIQUE` index on a column