pqb 0.40.8 → 0.40.10

package/dist/index.d.ts

@@ -384,6 +384,8 @@ interface CommonQueryData {
     outerJoinOverrides?: JoinOverrides;
     schema?: string;
     select?: SelectItem[];
+    selectAllColumns?: string[];
+    selectAllKeys?: RecordUnknown;
     /**
      * column type for query with 'value' or 'valueOrThrow' return type
      * Is needed in {@link getShapeFromSelect} to get shape of sub-select that returns a single value.
@@ -1883,6 +1885,13 @@ interface QueryMetaHasWhere {
         hasWhere: true;
     };
 }
+interface QueryFnReturningSelect {
+    (q: never): {
+        meta: {
+            hasSelect: true;
+        };
+    };
+}
 /**
  * Mutative {@link Where.prototype.where}
  */
@@ -2483,6 +2492,10 @@ declare class Where {
      * // find by a relation name if it's defined
      * db.user.whereExists('account');
      *
+     * // find users who have an account with positive balance
+     * // `accounts` is a relation name
+     * db.user.whereExists((q) => q.accounts.where({ balance: { gt: 0 } }));
+     *
      * // find using a table and a join conditions
      * db.user.whereExists(db.account, 'account.id', 'user.id');
      *
@@ -2490,7 +2503,11 @@ declare class Where {
      * db.user.whereExists(db.account, (q) => q.on('account.id', '=', 'user.id'));
      * ```
      */
-    whereExists<T extends PickQueryMetaShapeRelationsWithData, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, ...args: JoinArgs<T, Arg>): WhereResult<T>;
+    whereExists<T extends PickQueryMetaShapeRelationsWithData, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): Arg extends QueryFnReturningSelect ? {
+        error: 'Cannot select in whereExists';
+    } : Args[0] extends QueryFnReturningSelect ? {
+        error: 'Cannot select in whereExists';
+    } : WhereResult<T>;
     /**
      * Acts as `whereExists`, but prepends the condition with `OR`:
      *
@@ -3345,29 +3362,29 @@ type DbTableOptionScopes<Table extends string | undefined, Shape extends QueryCo
     [K in Keys]: (q: ScopeArgumentQuery<Table, Shape>) => QueryBase;
 };
 type QueryDefaultReturnData<Shape extends QueryColumnsInit> = {
-    [K in DefaultSelectColumns<Shape>[number]]: Shape[K]['outputType'];
+    [K in DefaultSelectColumns<Shape>]: Shape[K]['outputType'];
 }[];
+interface TableMeta<Table extends string | undefined, Shape extends QueryColumnsInit, ShapeWithComputed extends QueryColumnsInit, Scopes extends RecordUnknown | undefined> extends QueryMetaBase<{
+    [K in keyof Scopes]: true;
+}> {
+    kind: 'select';
+    defaults: {
+        [K in keyof Shape as unknown extends Shape[K]['data']['default'] ? never : K]: true;
+    };
+    selectable: SelectableFromShape<ShapeWithComputed, Table>;
+    defaultSelect: DefaultSelectColumns<Shape>;
+}
 declare const anyShape: QueryColumnsInit;
 interface Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape, Scopes extends RecordUnknown | undefined = EmptyObject> extends DbBase<Adapter, Table, Shape, ColumnTypes, ShapeWithComputed>, QueryMethods<ColumnTypes>, QueryBase {
-    result: Pick<Shape, DefaultSelectColumns<Shape>[number]>;
+    result: Pick<Shape, DefaultSelectColumns<Shape>>;
     queryBuilder: Db;
     returnType: undefined;
     then: QueryThen<QueryDefaultReturnData<Shape>>;
     windows: Query['windows'];
-    defaultSelectColumns: DefaultSelectColumns<Shape>;
     relations: EmptyObject;
     withData: EmptyObject;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
-    meta: {
-        kind: 'select';
-        defaults: {
-            [K in keyof Shape as unknown extends Shape[K]['data']['default'] ? never : K]: true;
-        };
-        scopes: {
-            [K in keyof Scopes]: true;
-        };
-        selectable: SelectableFromShape<ShapeWithComputed, Table>;
-    };
+    meta: TableMeta<Table, Shape, ShapeWithComputed, Scopes>;
     internal: QueryInternal<{
         [K in keyof PrimaryKeys]: (keyof PrimaryKeys extends K ? never : keyof PrimaryKeys) extends never ? PrimaryKeys[K] : never;
     }[keyof PrimaryKeys], PrimaryKeys | UniqueColumns, {
@@ -4764,7 +4781,7 @@ type FromResult<T extends FromQuerySelf, Arg extends MaybeArray<FromArg<T>>> = A
     } : K extends 'result' ? T['withData'][Arg]['shape'] : K extends 'then' ? QueryThen<GetQueryResult<T, T['withData'][Arg]['shape']>> : T[K];
 } : SetQueryTableAlias<T, Arg> : Arg extends PickQueryTableMetaResultInputType ? {
     [K in keyof T]: K extends 'meta' ? {
-        [K in keyof T['meta']]: K extends 'as' ? AliasOrTable<Arg> : K extends 'selectable' ? SelectableFromShape<Arg['result'], AliasOrTable<Arg>> : K extends 'kind' ? 'select' : T['meta'][K];
+        [K in keyof T['meta']]: K extends 'as' ? AliasOrTable<Arg> : K extends 'selectable' ? SelectableFromShape<Arg['result'], AliasOrTable<Arg>> : K extends 'kind' ? 'select' : K extends 'defaultSelect' ? keyof Arg['result'] : T['meta'][K];
     } : K extends 'result' ? Arg['result'] : K extends 'shape' ? Arg['result'] : K extends 'inputType' ? Arg['inputType'] : K extends 'then' ? QueryThen<GetQueryResult<T, Arg['result']>> : T[K];
 } : Arg extends (infer A)[] ? {
     [K in keyof T]: K extends 'meta' ? {
@@ -5364,11 +5381,11 @@ interface SelectAsCheckReturnTypes {
 }
 type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
     [K in keyof T]: K extends 'result' ? ('*' extends Columns[number] ? {
-        [K in Columns[number] | keyof T['shape'] as K extends '*' ? never : T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
+        [K in Columns[number] | T['meta']['defaultSelect'] as K extends '*' ? never : T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     } : {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown) : K extends 'then' ? QueryThen<GetQueryResult<T, ('*' extends Columns[number] ? {
-        [K in Exclude<Columns[number], '*'> | keyof T['shape'] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
+        [K in Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     } : {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
@@ -5391,9 +5408,9 @@ type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey
         selectable: SelectAsSelectable<Obj>;
     } : K extends 'result' ? // Combine previously selected items, all columns if * was provided,
     {
-        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
+        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
     } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown) : K extends 'then' ? QueryThen<GetQueryResult<T, {
-        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
+        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
     } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 };
 type SelectAsSelectable<Arg> = {
@@ -7600,7 +7617,6 @@ interface Query extends QueryBase, QueryMethods<unknown> {
     then: QueryThen<unknown>;
     catch: QueryCatch;
     windows: EmptyObject;
-    defaultSelectColumns: string[];
     relations: RelationsBase;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError;
 }

package/dist/index.js

@@ -805,8 +805,8 @@ const columnCode = (type, ctx, key, code, data = type.data, skip) => {
       orchidCore.addCode(code, part);
     }
   }
-  if (data.isHidden)
-    orchidCore.addCode(code, ".hidden()");
+  if (data.explicitSelect)
+    orchidCore.addCode(code, ".select(false)");
   if (data.isNullable)
     orchidCore.addCode(code, ".nullable()");
   if (type.encodeFn && type.encodeFn !== (skip == null ? void 0 : skip.encodeFn))
@@ -2358,7 +2358,7 @@ const getArgQueryTarget = (ctx, first, joinSubQuery, cloned) => {
   }
 };
 const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
-  if (!jq.q.select && jq.internal.columnsForSelectAll) {
+  if (!jq.q.select && jq.q.selectAllColumns) {
     if (!cloned)
       jq = jq.clone();
     jq.q.select = [new RawSQL(`${innerAs}.*`)];
@@ -2578,6 +2578,13 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
     s: joinSubQuery
   };
 };
+const preprocessJoinArg = (q, arg) => {
+  if (typeof arg !== "function")
+    return arg;
+  arg = arg(q.relations);
+  arg.joinQueryAfterCallback = arg.joinQuery;
+  return arg;
+};
 const makeJoinQueryBuilder = (joinedQuery, joinedShapes, joinTo) => {
   const q = joinedQuery.baseQuery.clone();
   q.baseQuery = q;
@@ -2640,10 +2647,7 @@ const _join = (query, require2, type, first, args) => {
   let batchParsers;
   let computeds;
   let joinSubQuery = false;
-  if (typeof first === "function") {
-    first = first(query.relations);
-    first.joinQueryAfterCallback = first.joinQuery;
-  }
+  first = preprocessJoinArg(query, first);
   if (typeof first === "object") {
     if (require2 && isQueryNone(first)) {
       return _queryNone(query);
@@ -2695,7 +2699,7 @@ const _join = (query, require2, type, first, args) => {
   );
   if (joinKey && "s" in joinArgs && joinArgs.s) {
     const j = "j" in joinArgs ? (_b = joinArgs.r) != null ? _b : joinArgs.j : "r" in joinArgs ? joinArgs.r : joinArgs.q;
-    if (j.q.select || !j.internal.columnsForSelectAll) {
+    if (j.q.select || !j.q.selectAllColumns) {
       const shape2 = getShapeFromSelect(j, true);
       setQueryObjectValue(
         query,
@@ -4715,7 +4719,7 @@ class SelectItemExpression extends orchidCore.Expression {
   }
   // `makeSQL` acts similarly to how select args are handled
   makeSQL(ctx, quotedAs) {
-    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
+    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.q, quotedAs) : columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
   }
 }
 
@@ -4849,12 +4853,14 @@ function queryFrom(self, arg) {
     data.batchParsers = q.q.batchParsers;
   }
   data.from = arg;
+  data.selectAllColumns = data.selectAllKeys = 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;
   return self;
 }
 class FromMethods {
@@ -4969,11 +4975,11 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
         if (item === "*") {
           if (hookSelect) {
             selected != null ? selected : selected = {};
-            for (const key in table.internal.columnsKeysForSelectAll || query.shape) {
+            for (const key in query.selectAllKeys || query.shape) {
               selected[key] = quotedAs;
             }
           }
-          sql = selectAllSql(table, query, quotedAs);
+          sql = selectAllSql(query, quotedAs);
         } else {
           const index = item.indexOf(".");
           if (index !== -1) {
@@ -5075,15 +5081,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect)
       list.push(sql);
     }
   }
-  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(table, query, quotedAs);
+  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs);
 };
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
 }
-const selectAllSql = (table, query, quotedAs) => {
+const selectAllSql = (query, quotedAs) => {
   var _a, _b, _c;
-  return ((_a = query.join) == null ? void 0 : _a.length) ? ((_b = table.internal.columnsForSelectAll) == null ? void 0 : _b.map((item) => `${quotedAs}.${item}`).join(", ")) || `${quotedAs}.*` : ((_c = table.internal.columnsForSelectAll) == null ? void 0 : _c.join(", ")) || "*";
+  return ((_a = query.join) == null ? void 0 : _a.length) ? ((_b = query.selectAllColumns) == null ? void 0 : _b.map((item) => `${quotedAs}.${item}`).join(", ")) || `${quotedAs}.*` : ((_c = query.selectAllColumns) == null ? void 0 : _c.join(", ")) || "*";
 };
 const pushSubQuerySql = (ctx, query, as, list, quotedAs) => {
   var _a, _b, _c;
@@ -5277,7 +5283,7 @@ const pushWithSql = (ctx, items) => {
 
 const checkIfASimpleQuery = (q) => {
   var _a, _b;
-  if (q.q.returnType && q.q.returnType !== "all" || q.internal.columnsForSelectAll || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length) || q.q.scopes)
+  if (q.q.returnType && q.q.returnType !== "all" || q.q.selectAllColumns || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length) || q.q.scopes)
     return false;
   const keys = Object.keys(q.q);
   return !keys.some((key) => queryKeysOfNotSimpleQuery.includes(key));
@@ -5305,7 +5311,7 @@ const pushFromAndAs = (ctx, table, data, quotedAs) => {
   const from = getFrom(ctx, table, data, quotedAs);
   sql += from;
   if (data.as && quotedAs && quotedAs !== from) {
-    sql += ` AS ${quotedAs}`;
+    sql += ` ${quotedAs}`;
   }
   for (const as in data.sources) {
     const source = data.sources[as];
@@ -9439,16 +9445,17 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-const mergableObjects = {
-  shape: true,
-  withShapes: true,
-  parsers: true,
-  defaults: true,
-  joinedShapes: true,
-  joinedParsers: true,
-  joinedBatchParsers: true,
-  selectedComputeds: true
-};
+const mergableObjects = /* @__PURE__ */ new Set([
+  "shape",
+  "withShapes",
+  "parsers",
+  "defaults",
+  "joinedShapes",
+  "joinedParsers",
+  "joinedBatchParsers",
+  "selectedComputeds"
+]);
+const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns", "selectAllKeys"]);
 class MergeQueryMethods {
   merge(q) {
     const query = this.clone();
@@ -9464,8 +9471,10 @@ class MergeQueryMethods {
           break;
         case "object":
           if (Array.isArray(value)) {
-            a[key] = a[key] ? [...a[key], ...value] : value;
-          } else if (mergableObjects[key]) {
+            if (!dontMergeArrays.has(key)) {
+              a[key] = a[key] ? [...a[key], ...value] : value;
+            }
+          } else if (mergableObjects.has(key)) {
             a[key] = a[key] ? __spreadValues$5(__spreadValues$5({}, a[key]), value) : value;
           } else if (key === "union") {
             a[key] = a[key] ? {
@@ -9809,7 +9818,13 @@ const _queryWhereIn = (q, and, arg, values, not) => {
   return q;
 };
 const existsArgs = (self, q, args) => {
-  const joinArgs = processJoinArgs(self, q, args, false, true);
+  const joinArgs = processJoinArgs(
+    self,
+    preprocessJoinArg(self, q),
+    args,
+    false,
+    true
+  );
   return [
     {
       EXISTS: joinArgs
@@ -10452,6 +10467,10 @@ class Where {
    * // find by a relation name if it's defined
    * db.user.whereExists('account');
    *
+   * // find users who have an account with positive balance
+   * // `accounts` is a relation name
+   * db.user.whereExists((q) => q.accounts.where({ balance: { gt: 0 } }));
+   *
    * // find using a table and a join conditions
    * db.user.whereExists(db.account, 'account.id', 'user.id');
    *
@@ -11385,7 +11404,11 @@ class QueryUpsertOrCreate {
     if (!orchidCore.isObjectEmpty(updateData)) {
       _queryUpdate(q, updateData);
     }
-    return orCreate(q, data.create, updateData, mergeData);
+    const c = orCreate(q, data.create, updateData, mergeData);
+    if (!c.q.select) {
+      c.q.returnType = "void";
+    }
+    return c;
   }
   /**
    * `orCreate` creates a record only if it was not found by conditions.
@@ -12686,7 +12709,7 @@ class Db {
     const parsers = {};
     let hasParsers = false;
     let modifyQuery = void 0;
-    let hasCustomName = false;
+    let prepareSelectAll = false;
     const { snakeCase } = options;
     for (const key in shape) {
       const column = shape[key];
@@ -12696,14 +12719,17 @@ class Db {
         parsers[key] = column.parseFn;
       }
       if (column.data.name) {
-        hasCustomName = true;
+        prepareSelectAll = true;
       } else if (snakeCase) {
         const snakeName = orchidCore.toSnakeCase(key);
         if (snakeName !== key) {
-          hasCustomName = true;
+          prepareSelectAll = true;
           column.data.name = snakeName;
         }
       }
+      if (column.data.explicitSelect) {
+        prepareSelectAll = true;
+      }
       const { modifyQuery: mq } = column.data;
       if (mq) {
         modifyQuery = orchidCore.pushOrNewArray(modifyQuery, (q) => mq(q, column));
@@ -12723,17 +12749,6 @@ class Db {
         }
       }
     }
-    if (hasCustomName) {
-      const list = [];
-      for (const key in shape) {
-        const column = shape[key];
-        list.push(
-          column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
-        );
-      }
-      this.internal.columnsForSelectAll = list;
-      this.internal.columnsKeysForSelectAll = __spreadValues({}, shape);
-    }
     this.q = {
       adapter,
       shape,
@@ -12766,21 +12781,22 @@ class Db {
     const columns = Object.keys(
       shape
     );
-    const { toSQL } = this;
     this.columns = columns;
-    this.defaultSelectColumns = columns.filter(
-      (column) => !shape[column].data.isHidden
-    );
     if (options.computed)
       applyComputedColumns(this, options.computed);
-    const defaultSelect = this.defaultSelectColumns.length === columns.length ? void 0 : this.defaultSelectColumns;
-    this.toSQL = defaultSelect ? function(options2) {
-      const q = this.clone();
-      if (!q.q.select) {
-        q.q.select = defaultSelect;
-      }
-      return toSQL.call(q, options2);
-    } : toSQL;
+    if (prepareSelectAll) {
+      const list = [];
+      for (const key in shape) {
+        const column = shape[key];
+        if (!column.data.explicitSelect) {
+          list.push(
+            column.data.name ? `"${column.data.name}" AS "${key}"` : `"${key}"`
+          );
+        }
+      }
+      this.q.selectAllColumns = list;
+      this.q.selectAllKeys = __spreadValues({}, shape);
+    }
     if (modifyQuery) {
       for (const cb of modifyQuery) {
         cb(this);