pqb 0.41.2 → 0.41.4

package/dist/index.d.ts

@@ -5431,7 +5431,7 @@ interface QueryBatchResult {
     parent: any;
     key: PropertyKey;
 }
-declare const addParserForSelectItem: <T extends PickQueryMeta>(q: T, as: string | getValueKey | undefined, key: string, arg: SelectableOrExpression<T> | Query) => string | Expression | Query | undefined;
+declare const addParserForSelectItem: <T extends PickQueryMeta>(q: T, as: string | getValueKey | undefined, key: string, arg: SelectableOrExpression<T> | Query, joinQuery?: boolean) => string | Expression | Query | undefined;
 declare const processSelectArg: <T extends SelectSelf>(q: T, as: string | undefined, arg: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem | undefined | false;
 declare const setParserForSelectedString: (q: PickQueryQAndInternal, arg: string, as: string | getValueKey | undefined, columnAs?: string | getValueKey) => string | undefined;
 declare const getShapeFromSelect: (q: QueryBase, isSubQuery?: boolean) => QueryColumns;

package/dist/index.js

@@ -3406,20 +3406,18 @@ class Transaction {
       sql.text = `BEGIN${options.level ? ` ISOLATION LEVEL ${options.level}` : ""}${options.readOnly !== void 0 ? ` READ ${options.readOnly ? "ONLY" : "WRITE"}` : ""}${options.deferrable !== void 0 ? ` ${options.deferrable ? "" : "NOT "}DEFERRABLE` : ""}`;
       if (log)
         logData = log.beforeQuery(sql);
-      try {
-        const result = await this.q.adapter.transaction(sql, callback);
-        if (log)
-          log.afterQuery(commitSql$1, logData);
-        await runAfterCommit(
-          trx.afterCommit,
-          result
-        );
-        return result;
-      } catch (err) {
+      const result = await this.q.adapter.transaction(sql, callback).catch((err) => {
         if (log)
           log.afterQuery(rollbackSql$1, logData);
         throw err;
-      }
+      });
+      if (log)
+        log.afterQuery(commitSql$1, logData);
+      await runAfterCommit(
+        trx.afterCommit,
+        result
+      );
+      return result;
     } else {
       try {
         sql.text = `SAVEPOINT "${transactionId}"`;
@@ -4318,172 +4316,175 @@ const addParsersForSelectJoined = (q, arg, as = arg) => {
     );
   }
 };
-const addParserForSelectItem = (q, as, key, arg) => {
-  var _a, _b, _c, _d;
+const addParserForSelectItem = (q, as, key, arg, joinQuery) => {
+  var _a, _b, _c, _d, _e;
   if (typeof arg === "object" || typeof arg === "function") {
-    if (orchidCore.isExpression(arg)) {
-      addParserForRawExpression(q, key, arg);
-    } else {
-      const { q: query } = arg;
-      if (query.batchParsers) {
-        const batchParsers = (_b = (_a = q.q).batchParsers) != null ? _b : _a.batchParsers = [];
-        for (const bp of query.batchParsers) {
-          batchParsers.push({ path: [key, ...bp.path], fn: bp.fn });
-        }
-      }
-      if (query.hookSelect || query.parsers || query.transform) {
-        const batchParsers = (_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = [];
-        batchParsers.push({
-          path: [key],
-          fn: (path, queryResult) => {
-            var _a2, _b2, _c2;
-            const { rows } = queryResult;
-            const originalReturnType = query.returnType || "all";
-            let returnType = originalReturnType;
-            const { hookSelect } = query;
-            const batches = [];
-            const last = path.length;
-            if (returnType === "value" || returnType === "valueOrThrow") {
-              if (hookSelect) {
-                batches.push = (item) => {
-                  if (!(key in item)) {
-                    returnType = returnType === "value" ? "one" : "oneOrThrow";
-                  }
-                  batches.push = Array.prototype.push;
-                  return batches.push(item);
-                };
-              }
+    const { q: query } = arg;
+    if (query.batchParsers) {
+      const batchParsers = (_b = (_a = q.q).batchParsers) != null ? _b : _a.batchParsers = [];
+      for (const bp of query.batchParsers) {
+        batchParsers.push({ path: [key, ...bp.path], fn: bp.fn });
+      }
+    }
+    if (query.hookSelect || query.parsers || query.transform) {
+      const batchParsers = (_d = (_c = q.q).batchParsers) != null ? _d : _c.batchParsers = [];
+      batchParsers.push({
+        path: [key],
+        fn: (path, queryResult) => {
+          var _a2, _b2, _c2;
+          const { rows } = queryResult;
+          const originalReturnType = query.returnType || "all";
+          let returnType = originalReturnType;
+          const { hookSelect } = query;
+          const batches = [];
+          const last = path.length;
+          if (returnType === "value" || returnType === "valueOrThrow") {
+            if (hookSelect) {
+              batches.push = (item) => {
+                if (!(key in item)) {
+                  returnType = returnType === "value" ? "one" : "oneOrThrow";
+                }
+                batches.push = Array.prototype.push;
+                return batches.push(item);
+              };
             }
-            collectNestedSelectBatches(batches, rows, path, last);
-            switch (returnType) {
-              case "all": {
-                const { parsers } = query;
-                if (parsers) {
-                  for (const { data } of batches) {
-                    for (const one of data) {
-                      parseRecord(parsers, one);
-                    }
+          }
+          collectNestedSelectBatches(batches, rows, path, last);
+          switch (returnType) {
+            case "all": {
+              const { parsers } = query;
+              if (parsers) {
+                for (const { data } of batches) {
+                  for (const one of data) {
+                    parseRecord(parsers, one);
                   }
                 }
-                break;
               }
-              case "one":
-              case "oneOrThrow": {
-                const { parsers } = query;
-                if (parsers) {
-                  if (returnType === "one") {
-                    for (const { data } of batches) {
-                      if (data)
-                        parseRecord(parsers, data);
-                    }
-                  } else {
-                    for (const { data } of batches) {
-                      if (!data)
-                        throw new NotFoundError(arg);
+              break;
+            }
+            case "one":
+            case "oneOrThrow": {
+              const { parsers } = query;
+              if (parsers) {
+                if (returnType === "one") {
+                  for (const { data } of batches) {
+                    if (data)
                       parseRecord(parsers, data);
-                    }
                   }
-                } else if (returnType !== "one") {
+                } else {
                   for (const { data } of batches) {
                     if (!data)
                       throw new NotFoundError(arg);
+                    parseRecord(parsers, data);
                   }
                 }
-                if (hookSelect) {
-                  for (const batch of batches) {
-                    batch.data = [batch.data];
-                  }
+              } else if (returnType !== "one") {
+                for (const { data } of batches) {
+                  if (!data)
+                    throw new NotFoundError(arg);
                 }
-                break;
               }
-              case "pluck": {
-                const parse = (_a2 = query.parsers) == null ? void 0 : _a2.pluck;
-                if (parse) {
-                  for (const { data } of batches) {
-                    for (let i = 0; i < data.length; i++) {
-                      data[i] = parse(data[i]);
-                    }
+              if (hookSelect) {
+                for (const batch of batches) {
+                  batch.data = [batch.data];
+                }
+              }
+              break;
+            }
+            case "pluck": {
+              const parse = (_a2 = query.parsers) == null ? void 0 : _a2.pluck;
+              if (parse) {
+                for (const { data } of batches) {
+                  for (let i = 0; i < data.length; i++) {
+                    data[i] = parse(data[i]);
                   }
                 }
-                break;
               }
-              case "value":
-              case "valueOrThrow": {
-                const parse = (_b2 = query.parsers) == null ? void 0 : _b2[orchidCore.getValueKey];
-                if (parse) {
-                  if (returnType === "value") {
-                    for (const item of batches) {
-                      item.parent[item.key] = item.data = item.data === void 0 ? arg.q.notFoundDefault : parse(item.data);
-                    }
-                  } else {
-                    for (const item of batches) {
-                      if (item.data === void 0)
-                        throw new NotFoundError(arg);
-                      item.parent[item.key] = item.data = parse(item.data);
-                    }
+              break;
+            }
+            case "value":
+            case "valueOrThrow": {
+              const parse = (_b2 = query.parsers) == null ? void 0 : _b2[orchidCore.getValueKey];
+              if (parse) {
+                if (returnType === "value") {
+                  for (const item of batches) {
+                    item.parent[item.key] = item.data = item.data === void 0 ? query.notFoundDefault : parse(item.data);
                   }
-                } else if (returnType !== "value") {
-                  for (const { data } of batches) {
-                    if (data === void 0)
+                } else {
+                  for (const item of batches) {
+                    if (item.data === void 0)
                       throw new NotFoundError(arg);
+                    item.parent[item.key] = item.data = parse(item.data);
                   }
                 }
-                if (hookSelect) {
-                  for (const batch of batches) {
-                    batch.data = [batch.data];
-                  }
+              } else if (returnType !== "value") {
+                for (const { data } of batches) {
+                  if (data === void 0)
+                    throw new NotFoundError(arg);
                 }
-                break;
               }
-            }
-            if (hookSelect) {
-              let tempColumns;
-              let renames;
-              for (const column of hookSelect.keys()) {
-                const as2 = hookSelect.get(column).as;
-                if (as2)
-                  (renames != null ? renames : renames = {})[column] = as2;
-                (_c2 = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _c2.add(as2 || column);
+              if (hookSelect) {
+                for (const batch of batches) {
+                  batch.data = [batch.data];
+                }
               }
-              if (renames) {
-                for (const { data } of batches) {
-                  for (const record of data) {
-                    if (record) {
-                      for (const a in renames) {
-                        const value = record[renames[a]];
-                        record[renames[a]] = record[a];
-                        record[a] = value;
-                      }
+              break;
+            }
+          }
+          if (hookSelect) {
+            let tempColumns;
+            let renames;
+            for (const column of hookSelect.keys()) {
+              const as2 = hookSelect.get(column).as;
+              if (as2)
+                (renames != null ? renames : renames = {})[column] = as2;
+              (_c2 = tempColumns != null ? tempColumns : tempColumns = /* @__PURE__ */ new Set()) == null ? void 0 : _c2.add(as2 || column);
+            }
+            if (renames) {
+              for (const { data } of batches) {
+                for (const record of data) {
+                  if (record) {
+                    for (const a in renames) {
+                      const value = record[renames[a]];
+                      record[renames[a]] = record[a];
+                      record[a] = value;
                     }
                   }
                 }
               }
-              if (query.selectedComputeds) {
-                const maybePromise = processComputedBatches(
-                  query,
-                  batches,
-                  originalReturnType,
-                  returnType,
-                  tempColumns,
-                  renames,
-                  key
-                );
-                if (maybePromise)
-                  return maybePromise;
-              }
-              finalizeNestedHookSelect(
+            }
+            if (query.selectedComputeds) {
+              const maybePromise = processComputedBatches(
+                query,
                 batches,
                 originalReturnType,
+                returnType,
                 tempColumns,
                 renames,
                 key
               );
+              if (maybePromise)
+                return maybePromise;
             }
-            applyBatchTransforms(query, batches);
-            return;
+            finalizeNestedHookSelect(
+              batches,
+              originalReturnType,
+              tempColumns,
+              renames,
+              key
+            );
           }
-        });
-      }
+          applyBatchTransforms(query, batches);
+          return;
+        }
+      });
+    }
+    if (!joinQuery && ((_e = arg.q) == null ? void 0 : _e.subQuery) && arg.q.expr) {
+      arg = arg.q.expr;
+    }
+    if (orchidCore.isExpression(arg)) {
+      addParserForRawExpression(q, key, arg);
+      return arg;
     }
     return arg;
   }
@@ -4518,7 +4519,7 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a, _b;
+  var _a;
   if (typeof arg === "string") {
     return setParserForSelectedString(q, arg, as, columnAs);
   }
@@ -4526,13 +4527,16 @@ const processSelectArg = (q, as, arg, columnAs) => {
   let aliases;
   for (const key in arg) {
     let value = arg[key];
+    let joinQuery;
     if (typeof value === "function") {
       value = resolveSubQueryCallback(q, value);
       if (isQueryNone(value)) {
         if (value.q.innerJoinLateral) {
           return false;
         }
-      } else if (!orchidCore.isExpression(value) && value.joinQuery) {
+      }
+      if (!orchidCore.isExpression(value) && value.joinQuery) {
+        joinQuery = true;
         value = value.joinQuery(value, q);
         let query;
         const returnType = value.q.returnType;
@@ -4570,8 +4574,6 @@ const processSelectArg = (q, as, arg, columnAs) => {
           (q2) => q2,
           key
         );
-      } else if (((_b = value.q) == null ? void 0 : _b.subQuery) && value.q.expr) {
-        value = value.q.expr;
       }
     }
     if (aliases)
@@ -4580,7 +4582,8 @@ const processSelectArg = (q, as, arg, columnAs) => {
       q,
       as,
       key,
-      value
+      value,
+      joinQuery
     );
   }
   return { selectAs };