pqb 0.48.5 → 0.49.0

package/dist/index.mjs

@@ -3000,7 +3000,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 : applyTransforms(q, q.returnType, q.transform, item.data);
+      item.parent[item.key] = applyTransforms(
+        q,
+        q.returnType,
+        q.transform,
+        item.data
+      );
     }
   }
 };
@@ -3782,8 +3787,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) {
@@ -3791,7 +3797,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);
                 }
@@ -4335,14 +4345,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 {
@@ -4814,7 +4824,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;
             }
           }
@@ -4940,10 +4950,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(", ") || "*";
 };
@@ -10247,7 +10254,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);
@@ -12749,20 +12756,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) {