pqb 0.18.23 → 0.18.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -94,13 +94,13 @@ type RelationsBase = Record<string, RelationQueryBase>;
94
94
  type RelationQueryBase = Query & {
95
95
  relationConfig: RelationConfigBase;
96
96
  };
97
- type RelationQuery<Name extends PropertyKey = PropertyKey, Config extends RelationConfigBase = RelationConfigBase, T extends Query = Query, Q = {
97
+ type RelationQuery<Name extends PropertyKey = PropertyKey, Config extends RelationConfigBase = RelationConfigBase, T extends Query = Query, Q extends Query = {
98
98
  [K in keyof T | 'relationConfig']: K extends 'meta' ? Omit<T['meta'], 'as'> & {
99
99
  as: StringKey<Name>;
100
100
  defaults: Record<Config['populate'], true>;
101
101
  hasWhere: true;
102
- } : 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] : Config;
103
- }> = ((params: Config['params']) => Q) & Q;
102
+ } : 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;
103
+ }> = ((params: Config['params']) => Config['one'] extends true ? Config['required'] extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q> : Q) & Q;
104
104
 
105
105
  declare const checkIfASimpleQuery: (q: Query) => boolean;
106
106
  type WithItem = [
@@ -3866,7 +3866,10 @@ declare const parseRecord: (parsers: ColumnsParsers, row: any) => any;
3866
3866
 
3867
3867
  type SelectArg<T extends Query> = '*' | keyof T['selectable'];
3868
3868
  type SelectAsArg<T extends Query> = Record<string, SelectAsValue<T>>;
3869
- type SelectAsValue<T extends Query> = StringKey<keyof T['selectable']> | Expression | ((q: T) => QueryBase) | ((q: T) => Expression) | ((q: T) => QueryBase | Expression);
3869
+ type SelectAsValue<T extends Query> = StringKey<keyof T['selectable']> | Expression | ((q: SelectSubQueryArg<T>) => QueryBase | Expression);
3870
+ type SelectSubQueryArg<T extends Query> = {
3871
+ [K in keyof T]: K extends keyof T['relations'] ? T[K] extends (...args: any) => any ? ReturnType<T[K]> : T[K] : T[K];
3872
+ };
3870
3873
  type SelectResult<T extends Query, Columns extends SelectArg<T>[], Result extends ColumnsShapeBase = {
3871
3874
  [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | PrevResultKeys<T> as K extends keyof T['selectable'] ? T['selectable'][K]['as'] : K]: K extends keyof T['selectable'] ? T['selectable'][K]['column'] : K extends keyof T['result'] ? T['result'][K] : never;
3872
3875
  }, Data = GetQueryResult<T['returnType'], Result>> = {