pqb 0.48.6 → 0.49.1

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);
                 }
@@ -4064,7 +4074,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) {
@@ -4123,18 +4142,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 ? 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;