pqb 0.48.6 → 0.49.1

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';
 
@@ -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);
                 }
@@ -4066,7 +4076,16 @@ const handleComputed = (q, computeds, column) => {
 };
 const getShapeFromSelect = (q, isSubQuery) => {
   const query = q.q;
-  const { select, shape } = query;
+  const { shape } = query;
+  let select;
+  if (query.selectedComputeds) {
+    select = query.select ? [...query.select] : [];
+    for (const key in query.selectedComputeds) {
+      select.push(...query.selectedComputeds[key].deps);
+    }
+  } else {
+    select = query.select;
+  }
   let result;
   if (!select) {
     if (isSubQuery) {
@@ -4125,18 +4144,33 @@ const addColumnToShapeFromSelect = (q, arg, shape, query, result, isSubQuery, ke
       result[key || column] = shape[column];
     } else {
       const it = query.joinedShapes?.[table]?.[column];
-      if (it) result[key || column] = maybeUnNameColumn(it, isSubQuery);
+      if (it)
+        result[key || column] = mapSubSelectColumn(
+          it,
+          isSubQuery
+        );
     }
   } else if (arg === "*") {
     for (const key2 in shape) {
-      result[key2] = maybeUnNameColumn(shape[key2], isSubQuery);
+      result[key2] = mapSubSelectColumn(
+        shape[key2],
+        isSubQuery
+      );
     }
   } else {
-    result[key || arg] = maybeUnNameColumn(shape[arg], isSubQuery);
+    result[key || arg] = mapSubSelectColumn(
+      shape[arg],
+      isSubQuery
+    );
   }
 };
-const maybeUnNameColumn = (column, isSubQuery) => {
-  return isSubQuery && column?.data.name ? orchidCore.setColumnData(column, "name", void 0) : column;
+const mapSubSelectColumn = (column, isSubQuery) => {
+  if (!isSubQuery || !column || !column.data.name && !column.data.explicitSelect) {
+    return column;
+  }
+  const cloned = Object.create(column);
+  cloned.data = { ...column.data, name: void 0, explicitSelect: void 0 };
+  return cloned;
 };
 function _querySelect(q, args) {
   var _a;