pqb 0.56.11 → 0.56.13

package/dist/index.d.ts

@@ -400,6 +400,10 @@ interface QueryData extends QueryDataBase {
     distinct?: SelectableOrExpression[];
     only?: boolean;
     join?: JoinItem[];
+    joinValueDedup?: Map<string, {
+        q: Query;
+        a: string;
+    }>;
     group?: (string | Expression)[];
     having?: HavingItem[];
     window?: WindowItem[];
@@ -3259,8 +3263,8 @@ interface DefaultSchemaConfig extends ColumnSchemaConfig<ColumnType> {
     }) => Types): {
         [K in keyof T]: K extends keyof Types ? Types[K] : T[K];
     };
-    narrowType<T extends ColumnInputOutputQueryTypes, Types extends ColumnInputOutputQueryTypes>(this: T, _fn: (type: <Type extends T['inputType'] & T['outputType'] & T['queryType']>() => {
-        inputType: Type;
+    narrowType<T extends ColumnInputOutputQueryTypes, Types extends ColumnInputOutputQueryTypes>(this: T, _fn: (type: <Type extends T['inputType'] extends T['outputType'] & T['queryType'] ? T['outputType'] & T['queryType'] : T['inputType'] & T['outputType'] & T['queryType']>() => {
+        inputType: T['inputType'] extends never ? never : Type;
         outputType: Type;
         queryType: Type;
     }) => Types): {

package/dist/index.js

@@ -1080,6 +1080,9 @@ const quoteValue = (arg, ctx, quotedAs, IN) => {
     if ("toSQL" in arg) {
       return `(${getSqlText(arg.toSQL(ctx))})`;
     }
+    if (!(arg instanceof Date) && !Array.isArray(arg)) {
+      arg = JSON.stringify(arg);
+    }
   }
   return orchidCore.addValue(ctx.values, arg);
 };
@@ -2594,7 +2597,7 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
     );
   }
   if (!select && data.joinedShapes?.[column]) {
-    return `"${column}".r`;
+    return `"${column}"."${column}"`;
   }
   return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
 };
@@ -2604,7 +2607,7 @@ const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
     return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
   } else {
     if (data.joinedShapes?.[column]) {
-      return `"${column}".r`;
+      return `"${column}"."${column}"`;
     }
     if (data.select) {
       for (const s of data.select) {
@@ -2909,7 +2912,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
           } else {
             column = query.joinedShapes?.[key]?.value;
-            quotedColumn = `"${key}".r`;
+            quotedColumn = `"${key}"."${key}"`;
           }
           if (!column || !quotedColumn) {
             throw new Error(`Unknown column ${key} provided to condition`);
@@ -2982,7 +2985,7 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       query,
       args.a
     )}"`;
-    on = `${args.i ? `"${args.a}".r IS NOT NULL` : "true"}`;
+    on = `${args.i ? `"${args.a}"."${args.a}" IS NOT NULL` : "true"}`;
     ctx.aliasValue = aliasValue;
   } else if ("j" in args) {
     const { j, s, r } = args;
@@ -4564,11 +4567,38 @@ const _joinLateral = (self, type, arg, as, innerJoinLateral) => {
   }
   as || (as = getQueryAs(arg));
   orchidCore.setObjectValueImmutable(q.q, "joinedComputeds", as, arg.q.runtimeComputeds);
+  const joinArgs = {
+    l: arg,
+    a: as,
+    i: innerJoinLateral
+  };
+  if (arg.q.returnType === "value" || arg.q.returnType === "valueOrThrow") {
+    const map = q.q.joinValueDedup ? new Map(q.q.joinValueDedup) : /* @__PURE__ */ new Map();
+    q.q.joinValueDedup = map;
+    const select = arg.q.select[0];
+    arg.q.select = [];
+    const dedupKey = getSqlText(arg.toSQL());
+    const existing = map.get(dedupKey);
+    if (existing) {
+      existing.q.q.select = [
+        {
+          selectAs: {
+            ...existing.q.q.select[0].selectAs,
+            [joinKey]: select
+          }
+        }
+      ];
+      return existing.a;
+    } else {
+      arg.q.select = [{ selectAs: { [joinKey]: select } }];
+      map.set(dedupKey, { q: arg, a: as });
+    }
+  }
   orchidCore.pushQueryValueImmutable(q, "join", {
     type: `${type} LATERAL`,
-    args: { l: arg, a: as, i: innerJoinLateral }
+    args: joinArgs
   });
-  return q;
+  return joinKey;
 };
 
 const escape = (value, migration, nested) => {
@@ -6026,12 +6056,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
             subQuery = value;
           }
         }
-        value.q.joinedForSelect = orchidCore._copyQueryAliasToQuery(
-          value,
-          q,
-          key
-        );
-        _joinLateral(
+        const as2 = _joinLateral(
           q,
           innerJoinLateral ? "JOIN" : "LEFT JOIN",
           subQuery,
@@ -6040,6 +6065,13 @@ const processSelectArg = (q, as, arg, columnAs) => {
           // `JOIN` will handle it on itself.
           innerJoinLateral && returnType !== "one" && returnType !== "oneOrThrow"
         );
+        if (as2) {
+          value.q.joinedForSelect = orchidCore._copyQueryAliasToQuery(
+            value,
+            q,
+            as2
+          );
+        }
       }
     }
     selectAs[key] = addParserForSelectItem(
@@ -6164,7 +6196,7 @@ const getShapeFromSelect = (q, isSubQuery) => {
             const { returnType } = it.q;
             if (returnType === "value" || returnType === "valueOrThrow") {
               const type = it.q.getColumn;
-              result[key] = type || UnknownColumn.instance;
+              result[key] = type ? mapSubSelectColumn(type, isSubQuery) : UnknownColumn.instance;
             } else {
               result[key] = new JSONTextColumn(defaultSchemaConfig);
             }
@@ -7061,7 +7093,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
             }
           }
         } else {
-          list.push(selectedObjectToSQL(ctx, quotedAs, item));
+          const sql = item.toSQL(ctx, quotedAs);
+          list.push(ctx.aliasValue ? `${sql} ${quotedAs}` : sql);
           aliases?.push("");
         }
       }
@@ -7119,10 +7152,6 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
   }
   return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs, jsonList);
 };
-function selectedObjectToSQL(ctx, quotedAs, item) {
-  const sql = item.toSQL(ctx, quotedAs);
-  return ctx.aliasValue ? `${sql} r` : sql;
-}
 const selectAllSql = (query, quotedAs, jsonList) => {
   if (jsonList) {
     Object.assign(jsonList, query.selectAllShape);
@@ -7169,14 +7198,14 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
         break;
       }
       case "all":
-      case "pluck":
       case "value":
+      case "pluck":
       case "rows":
-        sql = `"${query.q.joinedForSelect}".r`;
+        sql = `"${query.q.joinedForSelect}"."${as}"`;
         break;
       case "valueOrThrow":
         if (query.q.returning) return;
-        sql = `"${query.q.joinedForSelect}".r`;
+        sql = `"${query.q.joinedForSelect}"."${as}"`;
         break;
       case "void":
         return;
@@ -10762,11 +10791,12 @@ class Join {
    */
   joinLateral(arg, cb) {
     const q = _clone(this);
-    return _joinLateral(
+    _joinLateral(
       q,
       "JOIN",
       _joinLateralProcessArg(q, arg, cb)
     );
+    return q;
   }
   /**
    * The same as {@link joinLateral}, but when no records found for the join it will result in `null`:
@@ -10785,11 +10815,12 @@ class Join {
    */
   leftJoinLateral(arg, cb) {
     const q = _clone(this);
-    return _joinLateral(
-      _clone(this),
+    _joinLateral(
+      q,
       "LEFT JOIN",
       _joinLateralProcessArg(q, arg, cb)
     );
+    return q;
   }
   /**
    * This method may be useful