pqb 0.48.5 → 0.49.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, PickQueryReturnType, RecordUnknown, Expression, MaybeArray, ColumnTypesBase, TemplateLiteralArgs, EmptyObject, QueryColumns, QueryColumn, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, HookSelect, BatchParsers, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThenByQuery, ColumnShapeInput, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, QueryThen, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, QueryThenShallowSimplifyArr, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, UnionToIntersection, getValueKey, QueryThenByReturnType, QueryMetaIsSubQuery, QueryThenShallowSimplifyOptional, QueryThenShallowSimplify, PickQueryResultReturnType, PickQueryResultReturnTypeUniqueColumns, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, ShallowSimplify, Codes, ColumnDataCheckBase } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, PickQueryReturnType, RecordUnknown, Expression, MaybeArray, ColumnTypesBase, TemplateLiteralArgs, EmptyObject, QueryColumns, QueryColumn, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, HookSelect, BatchParsers, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThenByQuery, ColumnShapeInput, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, QueryThen, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, QueryThenShallowSimplifyArr, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, UnionToIntersection, getValueKey, QueryThenByReturnType, QueryMetaIsSubQuery, QueryReturnTypeAll, QueryReturnTypeOptional, QueryThenShallowSimplifyOptional, QueryThenShallowSimplify, PickQueryResultReturnType, PickQueryResultReturnTypeUniqueColumns, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, ShallowSimplify, Codes, ColumnDataCheckBase } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -373,7 +373,7 @@ interface CommonQueryData {
         aliases: string[];
     };
     selectAllColumns?: string[];
-    selectAllKeys?: RecordUnknown;
+    selectableShape: RecordUnknown;
     /**
      * column type for query with 'value' or 'valueOrThrow' return type
      * Is needed in {@link getShapeFromSelect} to get shape of sub-select that returns a single value.
@@ -7105,22 +7105,31 @@ declare class QueryMap {
      *
      * @param fn - function to transform an individual record
      */
-    map<T extends PickQueryReturnType, Result>(this: T, fn: (input: T['returnType'] extends undefined | 'all' | 'pluck' ? T extends {
+    map<T extends PickQueryReturnType, Result>(this: T, fn: T extends {
+        returnType: 'valueOrThrow';
+        then: QueryThen<infer Data | null>;
+    } ? (input: Data) => Result : (input: T['returnType'] extends QueryReturnTypeAll | 'pluck' ? T extends {
         then: QueryThen<(infer Data)[]>;
     } ? Data : never : T extends {
         then: QueryThen<infer Data | undefined>;
     } ? Data : never) => Result): Result extends RecordUnknown ? {
         [K in keyof T]: K extends 'result' ? {
             [K in keyof Result]: QueryColumn<Result[K]>;
-        } : K extends 'then' ? QueryThen<T['returnType'] extends undefined | 'all' ? Result[] : Result> : T[K];
+        } : K extends 'then' ? QueryThen<T['returnType'] extends QueryReturnTypeAll ? Result[] : T['returnType'] extends QueryReturnTypeOptional ? Result | undefined : Result> : T[K];
     } : {
-        [K in keyof T]: K extends 'returnType' ? T['returnType'] extends undefined | 'all' | 'pluck' ? 'pluck' : T['returnType'] extends 'one' ? 'value' : 'valueOrThrow' : K extends 'result' ? T['returnType'] extends undefined | 'all' | 'pluck' ? {
+        [K in keyof T]: K extends 'returnType' ? T['returnType'] extends QueryReturnTypeAll | 'pluck' ? 'pluck' : T['returnType'] extends 'one' ? 'value' : 'valueOrThrow' : K extends 'result' ? T['returnType'] extends QueryReturnTypeAll | 'pluck' ? {
             pluck: QueryColumn<Result>;
-        } : T['returnType'] extends 'one' | 'value' ? {
+        } : T['returnType'] extends QueryReturnTypeOptional ? {
             value: QueryColumn<Result | undefined>;
         } : {
-            value: QueryColumn<Result>;
-        } : K extends 'then' ? QueryThen<T['returnType'] extends undefined | 'all' | 'pluck' ? Result[] : Result> : T[K];
+            value: QueryColumn<T extends {
+                returnType: 'valueOrThrow';
+                then: QueryThen<unknown | null>;
+            } ? Result | null : Result>;
+        } : K extends 'then' ? QueryThen<T['returnType'] extends QueryReturnTypeAll | 'pluck' ? Result[] : T['returnType'] extends QueryReturnTypeOptional ? Result | undefined : T extends {
+            returnType: 'valueOrThrow';
+            then: QueryThen<unknown | null>;
+        } ? Result | null : Result> : T[K];
     };
 }
 

package/dist/index.js

@@ -3002,7 +3002,12 @@ const runAfterCommit = async (afterCommit, result) => {
 const applyBatchTransforms = (q, batches) => {
   if (q.transform) {
     for (const item of batches) {
-      item.parent[item.key] = item.data === null ? void 0 : orchidCore.applyTransforms(q, q.returnType, q.transform, item.data);
+      item.parent[item.key] = orchidCore.applyTransforms(
+        q,
+        q.returnType,
+        q.transform,
+        item.data
+      );
     }
   }
 };
@@ -3784,8 +3789,9 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
               const { parsers } = query;
               if (parsers) {
                 if (returnType === "one") {
-                  for (const { data } of batches) {
-                    if (data) parseRecord(parsers, data);
+                  for (const batch of batches) {
+                    if (batch.data) parseRecord(parsers, batch.data);
+                    else batch.data = void 0;
                   }
                 } else {
                   for (const { data } of batches) {
@@ -3793,7 +3799,11 @@ const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
                     parseRecord(parsers, data);
                   }
                 }
-              } else if (returnType !== "one") {
+              } else if (returnType === "one") {
+                for (const batch of batches) {
+                  if (!batch.data) batch.data = void 0;
+                }
+              } else {
                 for (const { data } of batches) {
                   if (!data) throw new NotFoundError(arg);
                 }
@@ -4337,14 +4347,14 @@ function queryFrom(self, arg) {
     data.batchParsers = q.q.batchParsers;
   }
   data.from = arg;
-  data.selectAllColumns = data.selectAllKeys = data.scopes = void 0;
+  data.selectAllColumns = data.scopes = void 0;
   return self;
 }
 function queryFromSql(self, args) {
   const data = self.q;
   data.as || (data.as = "t");
   data.from = sqlQueryArgsToExpression(args);
-  data.selectAllColumns = data.selectAllKeys = void 0;
+  data.selectAllColumns = void 0;
   return self;
 }
 class FromMethods {
@@ -4816,7 +4826,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         if (item === "*") {
           if (hookSelect) {
             selected ?? (selected = {});
-            for (const key in query.selectAllKeys || query.shape) {
+            for (const key in query.selectableShape) {
               selected[key] = quotedAs;
             }
           }
@@ -4942,10 +4952,7 @@ function selectedObjectToSQL(ctx, quotedAs, item) {
 }
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
-    Object.assign(
-      jsonList,
-      query.selectAllKeys || query.shape
-    );
+    Object.assign(jsonList, query.selectableShape);
   }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
@@ -10249,7 +10256,7 @@ const mergableObjects = /* @__PURE__ */ new Set([
   "joinedBatchParsers",
   "selectedComputeds"
 ]);
-const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns", "selectAllKeys"]);
+const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns"]);
 class MergeQueryMethods {
   merge(q) {
     const query = _clone(this);
@@ -12751,20 +12758,26 @@ class Db extends QueryMethods {
     );
     this.columns = columns;
     if (options.computed) applyComputedColumns(this, options.computed);
+    const selectableShape = this.q.selectableShape = {};
     if (prepareSelectAll) {
       const list = [];
-      const keys = {};
       for (const key in shape) {
         const column = shape[key];
-        if (!column.data.explicitSelect) {
+        if (!column.data.explicitSelect && !(column instanceof VirtualColumn)) {
           list.push(
             column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`
           );
-          keys[key] = column;
+          selectableShape[key] = column;
         }
       }
       this.q.selectAllColumns = list;
-      this.q.selectAllKeys = keys;
+    } else {
+      for (const key in shape) {
+        const column = shape[key];
+        if (column instanceof VirtualColumn) {
+          selectableShape[key] = column;
+        }
+      }
     }
     if (modifyQuery) {
       for (const cb of modifyQuery) {