pqb 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -1037,10 +1037,13 @@ declare class QueryGet {
 declare type SelectArg<T extends QueryBase> = keyof T['selectable'] | (T['relations'] extends Record<string, Relation> ? keyof T['relations'] : never) | RelationQueryBase | SelectAsArg<T>;
 declare type SelectAsArg<T extends QueryBase> = Record<string, keyof T['selectable'] | Query | RawExpression>;
 declare type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectAsArgs = SimpleSpread<FilterTuple<Args, SelectAsArg<QueryBase>>>> = AddQuerySelect<T, {
-    [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : Arg extends keyof T['relations'] ? Arg : Arg extends RelationQueryBase ? Arg['tableAlias'] extends string ? Arg['tableAlias'] : never : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['returnType'] extends 'all' ? ArrayOfColumnsObjects<Arg['result']> : Arg['returnType'] extends 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? PluckResultColumnType<Arg['result']['pluck']> : Arg[isRequiredRelationKey] extends true ? ColumnsObject<Arg['result']> : NullableColumn<ColumnsObject<Arg['result']>> : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['returns'] extends 'many' ? ArrayOfColumnsObjects<T['relations'][Arg]['model']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['model']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['model']['result']>> : never : never;
+    [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : Arg extends keyof T['relations'] ? Arg : Arg extends RelationQueryBase ? Arg['tableAlias'] extends string ? Arg['tableAlias'] : never : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? SelectSubQueryResult<Arg> : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['returns'] extends 'many' ? ArrayOfColumnsObjects<T['relations'][Arg]['model']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['model']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['model']['result']>> : never : never;
 } & {
-    [K in keyof SelectAsArgs]: SelectAsArgs[K] extends keyof T['selectable'] ? T['selectable'][SelectAsArgs[K]]['column'] : SelectAsArgs[K] extends RawExpression ? SelectAsArgs[K]['__column'] : SelectAsArgs[K] extends Query ? SelectAsArgs[K]['returnType'] extends 'all' ? ArrayOfColumnsObjects<SelectAsArgs[K]['result']> : ColumnsObject<SelectAsArgs[K]['result']> : never;
+    [K in keyof SelectAsArgs]: SelectAsArgs[K] extends keyof T['selectable'] ? T['selectable'][SelectAsArgs[K]]['column'] : SelectAsArgs[K] extends RawExpression ? SelectAsArgs[K]['__column'] : SelectAsArgs[K] extends Query ? SelectSubQueryResult<SelectAsArgs[K]> : never;
 }>;
+declare type SelectSubQueryResult<Arg extends Query & {
+    [isRequiredRelationKey]?: boolean;
+}> = Arg['returnType'] extends 'all' ? ArrayOfColumnsObjects<Arg['result']> : Arg['returnType'] extends 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? PluckResultColumnType<Arg['result']['pluck']> : Arg[isRequiredRelationKey] extends true ? ColumnsObject<Arg['result']> : NullableColumn<ColumnsObject<Arg['result']>>;
 declare const addParserForRawExpression: (q: Query, key: string | getValueKey, raw: RawExpression) => void;
 declare const addParserForSelectItem: <T extends Query>(q: T, as: string | getValueKey | undefined, key: string, item: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | keyof T["selectable"]) => void;
 declare const addParserToQuery: (query: QueryData, key: string | getValueKey, parser: ColumnParser) => void;
@@ -1456,10 +1459,10 @@ declare class QueryMethods {
     _wrap<T extends Query, Q extends Query, As extends string = 't'>(this: T, query: Q, as?: As): SetQueryTableAlias<Q, As>;
     order<T extends Query>(this: T, ...args: OrderArg<T>[]): T;
     _order<T extends Query>(this: T, ...args: OrderArg<T>[]): T;
-    limit<T extends Query>(this: T, arg: number): T;
-    _limit<T extends Query>(this: T, arg: number): T;
-    offset<T extends Query>(this: T, arg: number): T;
-    _offset<T extends Query>(this: T, arg: number): T;
+    limit<T extends Query>(this: T, arg: number | undefined): T;
+    _limit<T extends Query>(this: T, arg: number | undefined): T;
+    offset<T extends Query>(this: T, arg: number | undefined): T;
+    _offset<T extends Query>(this: T, arg: number | undefined): T;
     exists<T extends Query>(this: T): SetQueryReturnsValueOptional<T, NumberColumn>;
     _exists<T extends Query>(this: T): SetQueryReturnsValueOptional<T, NumberColumn>;
     truncate<T extends Query>(this: T, options?: {

package/dist/index.esm.js

@@ -2515,43 +2515,10 @@ const selectToSql = (model, query, values, quotedAs) => {
           item === "*" ? ((_a2 = query.join) == null ? void 0 : _a2.length) ? `${quotedAs}.*` : "*" : quoteFullColumn(item, quotedAs)
         );
       } else if ((_b = item.query) == null ? void 0 : _b[relationQueryKey]) {
-        let relationQuery = item.clone();
-        const as = q(getQueryAs(relationQuery));
+        const relationQuery = item.clone();
+        const as = getQueryAs(relationQuery);
         relationQuery._as(relationQuery.query[relationQueryKey]);
-        const { returnType } = relationQuery.query;
-        switch (returnType) {
-          case "all":
-          case "one":
-          case "oneOrThrow":
-            relationQuery = relationQuery._json();
-            break;
-          case "pluck": {
-            const { select } = relationQuery.query;
-            const first = select == null ? void 0 : select[0];
-            if (!select || !first) {
-              throw new PormInternalError(`Nothing was selected for pluck`);
-            }
-            select.length = 0;
-            select[0] = { selectAs: { c: first } };
-            relationQuery = relationQuery._wrap(
-              relationQuery.__model.clone()
-            );
-            relationQuery._getOptional(
-              raw(`COALESCE(json_agg("c"), '[]')`)
-            );
-            delete relationQuery.query.take;
-            break;
-          }
-          case "rows":
-          case "value":
-          case "valueOrThrow":
-          case "rowCount":
-          case "void":
-            break;
-          default:
-            throw new UnhandledTypeError(returnType);
-        }
-        list.push(`(${relationQuery.toSql(values).text}) AS ${as}`);
+        pushSubQuerySql(relationQuery, as, values, list);
       } else {
         if ("selectAs" in item) {
           const obj = item.selectAs;
@@ -2561,8 +2528,7 @@ const selectToSql = (model, query, values, quotedAs) => {
               if (isRaw(value)) {
                 list.push(`${getRaw(value, values)} AS ${q(as)}`);
               } else {
-                const sql = value.json().toSql(values);
-                list.push(`(${sql.text}) AS ${q(as)}`);
+                pushSubQuerySql(value, as, values, list);
               }
             } else {
               list.push(
@@ -2595,6 +2561,38 @@ const selectToSql = (model, query, values, quotedAs) => {
     return ((_a = query.join) == null ? void 0 : _a.length) ? `${quotedAs}.*` : "*";
   }
 };
+const pushSubQuerySql = (query, as, values, list) => {
+  const { returnType } = query.query;
+  switch (returnType) {
+    case "all":
+    case "one":
+    case "oneOrThrow":
+      query = query._json();
+      break;
+    case "pluck": {
+      const { select } = query.query;
+      const first = select == null ? void 0 : select[0];
+      if (!select || !first) {
+        throw new PormInternalError(`Nothing was selected for pluck`);
+      }
+      select.length = 0;
+      select[0] = { selectAs: { c: first } };
+      query = query._wrap(query.__model.clone());
+      query._getOptional(raw(`COALESCE(json_agg("c"), '[]')`));
+      delete query.query.take;
+      break;
+    }
+    case "rows":
+    case "value":
+    case "valueOrThrow":
+    case "rowCount":
+    case "void":
+      break;
+    default:
+      throw new UnhandledTypeError(returnType);
+  }
+  list.push(`(${query.toSql(values).text}) AS ${q(as)}`);
+};
 
 const aggregateOptionNames = [
   "distinct",