pqb 0.35.0 → 0.35.2

package/dist/index.d.ts

@@ -58,15 +58,12 @@ declare class TransactionAdapter implements Adapter {
 type RelationJoinQuery = (joiningQuery: Query, baseQuery: Query) => Query;
 interface RelationConfigBase {
     query: Query;
-    methodQuery: Query;
     joinQuery: RelationJoinQuery;
-    one: boolean;
     omitForeignKeyInCreate: PropertyKey;
     dataForCreate?: RelationConfigDataForCreate;
     optionalDataForCreate: unknown;
     dataForUpdate: unknown;
     dataForUpdateOne: unknown;
-    params: RecordUnknown;
 }
 interface RelationConfigDataForCreate {
     columns: RecordUnknown;
@@ -78,7 +75,7 @@ interface RelationsBase {
 interface RelationQueryBase extends Query {
     relationConfig: RelationConfigBase;
 }
-type RelationQuery<Config extends RelationConfigBase = RelationConfigBase> = ((params: Config['params']) => Config['methodQuery']) & Config['query'] & {
+type RelationQuery<Config extends RelationConfigBase = RelationConfigBase, Params = never, Required = never, One = never> = ((params: Params) => One extends true ? Required extends true ? SetQueryReturnsOne<Config['query']> : SetQueryReturnsOneOptional<Config['query']> : Config['query']) & Config['query'] & {
     relationConfig: Config;
 };
 
@@ -3256,14 +3253,14 @@ type QueryDefaultReturnData<Shape extends QueryColumnsInit> = {
     [K in DefaultSelectColumns<Shape>[number]]: Shape[K]['outputType'];
 }[];
 declare const anyShape: QueryColumnsInit;
-interface Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, Relations extends RelationsBase = EmptyObject, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape, Scopes extends CoreQueryScopes | undefined = EmptyObject> extends DbBase<Adapter, Table, Shape, ColumnTypes, ShapeWithComputed>, QueryMethods<ColumnTypes>, QueryBase {
+interface Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape, Scopes extends CoreQueryScopes | undefined = EmptyObject> extends DbBase<Adapter, Table, Shape, ColumnTypes, ShapeWithComputed>, QueryMethods<ColumnTypes>, QueryBase {
     result: Pick<Shape, DefaultSelectColumns<Shape>[number]>;
     queryBuilder: Db;
     returnType: undefined;
     then: QueryThen<QueryDefaultReturnData<Shape>>;
     windows: Query['windows'];
     defaultSelectColumns: DefaultSelectColumns<Shape>;
-    relations: Relations;
+    relations: EmptyObject;
     withData: Query['withData'];
     error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
     meta: {
@@ -3283,7 +3280,7 @@ interface Db<Table extends string | undefined = undefined, Shape extends QueryCo
     }[keyof Shape] | keyof PrimaryKeys, UniqueColumnTuples, UniqueConstraints>;
     catch: QueryCatch;
 }
-declare class Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, Relations extends RelationsBase = EmptyObject, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape> implements Query {
+declare class Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape> implements Query {
     adapter: Adapter;
     queryBuilder: Db;
     table: Table;
@@ -3349,11 +3346,11 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Que
      */
     queryArrays<R extends any[] = any[]>(...args: SQLQueryArgs): Promise<QueryArraysResult<R>>;
 }
-type DbTableConstructor<ColumnTypes> = <Table extends string, Shape extends QueryColumnsInit, Data extends MaybeArray<TableDataItem>, Options extends DbTableOptions<ColumnTypes, Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, tableData?: TableDataFn<Shape, Data>, options?: Options) => Db<Table, Shape, keyof ShapeColumnPrimaryKeys<Shape> extends never ? never : ShapeColumnPrimaryKeys<Shape>, ShapeUniqueColumns<Shape> | TableDataItemsUniqueColumns<Shape, Data>, TableDataItemsUniqueColumnTuples<Shape, Data>, UniqueConstraints<Shape> | TableDataItemsUniqueConstraints<Data>, EmptyObject, ColumnTypes, Shape & ComputedColumnsFromOptions<Options['computed']>, MapTableScopesOption<Options['scopes'], Options['softDelete']>>;
+type DbTableConstructor<ColumnTypes> = <Table extends string, Shape extends QueryColumnsInit, Data extends MaybeArray<TableDataItem>, Options extends DbTableOptions<ColumnTypes, Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, tableData?: TableDataFn<Shape, Data>, options?: Options) => Db<Table, Shape, keyof ShapeColumnPrimaryKeys<Shape> extends never ? never : ShapeColumnPrimaryKeys<Shape>, ShapeUniqueColumns<Shape> | TableDataItemsUniqueColumns<Shape, Data>, TableDataItemsUniqueColumnTuples<Shape, Data>, UniqueConstraints<Shape> | TableDataItemsUniqueConstraints<Data>, ColumnTypes, Shape & ComputedColumnsFromOptions<Options['computed']>, MapTableScopesOption<Options['scopes'], Options['softDelete']>>;
 type MapTableScopesOption<Scopes extends CoreQueryScopes | undefined, SoftDelete extends true | PropertyKey | undefined> = {
     [K in keyof Scopes | (SoftDelete extends true | PropertyKey ? 'nonDeleted' : never)]: unknown;
 };
-interface DbResult<ColumnTypes> extends Db<string, never, never, never, never, never, EmptyObject, ColumnTypes>, DbTableConstructor<ColumnTypes> {
+interface DbResult<ColumnTypes> extends Db<string, never, never, never, never, never, ColumnTypes>, DbTableConstructor<ColumnTypes> {
     adapter: Adapter;
     close: Adapter['close'];
 }
@@ -5033,7 +5030,7 @@ type SelectArg<T extends SelectSelf> = '*' | keyof T['meta']['selectable'];
 type SelectArgs<T extends SelectSelf> = ('*' | keyof T['meta']['selectable'])[];
 interface SelectAsArg<T extends SelectSelf> {
     [K: string]: keyof T['meta']['selectable'] | Expression | ((q: {
-        [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K]['relationConfig']['methodQuery'] : T[K];
+        [K in keyof T]: K extends keyof T['relations'] ? T[K] extends (...args: any[]) => any ? ReturnType<T[K]> : never : T[K];
     }) => (QueryBase & {
         returnType: Exclude<QueryReturnType, 'rows'>;
     }) | Expression);
@@ -5542,7 +5539,7 @@ type UpdateData<T extends UpdateSelf> = {
     [K in keyof T['inputType'] | keyof T['relations']]?: K extends keyof T['inputType'] ? UpdateColumn<T, K> : UpdateRelationData<T, T['relations'][K]['relationConfig']>;
 };
 type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['inputType'][Key] | QueryOrExpression<T['inputType'][Key]> | ((q: T) => QueryOrExpression<T['inputType'][Key]>);
-type UpdateRelationData<T extends UpdateSelf, Rel extends RelationConfigBase> = T['returnType'] extends undefined | 'all' ? Rel['dataForUpdate'] : Rel['one'] extends true ? Rel['dataForUpdate'] | Rel['dataForUpdateOne'] : Rel['dataForUpdate'] & Rel['dataForUpdateOne'];
+type UpdateRelationData<T extends UpdateSelf, Rel extends RelationConfigBase> = T['returnType'] extends undefined | 'all' ? Rel['dataForUpdate'] : Rel['dataForUpdateOne'];
 type UpdateArg<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? UpdateData<T> : never;
 type UpdateRawArgs<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? SQLQueryArgs : never;
 type UpdateResult<T extends UpdateSelf> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'update'> : SetQueryReturnsRowCount<T, 'update'>;