pqb 0.49.0 → 0.49.1

package/dist/index.js

@@ -4076,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) {
@@ -4135,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;