pqb 0.30.6 → 0.30.7

package/dist/index.d.ts

@@ -615,7 +615,7 @@ type JoinFirstArg<T extends PickQueryRelationsWithData> = PickQueryTableMetaResu
  * Arguments of `join` methods (not `joinLateral`).
  * See {@link join}
  */
-type JoinArgs<T extends PickQueryMetaShapeRelationsWithData, Arg extends JoinFirstArg<T>> = [JoinCallback<T, Arg>] | (Arg extends PickQueryTableMetaResult ? JoinQueryArgs<T, Arg> : Arg extends keyof T['relations'] ? EmptyTuple : Arg extends keyof T['withData'] ? JoinWithArgs<T, Arg> : never);
+type JoinArgs<T extends PickQueryMetaShapeRelationsWithData, Arg extends JoinFirstArg<T>> = [on?: JoinCallback<T, Arg>] | (Arg extends PickQueryTableMetaResult ? JoinQueryArgs<T, Arg> : Arg extends keyof T['relations'] ? EmptyTuple : Arg extends keyof T['withData'] ? JoinWithArgs<T, Arg> : never);
 /**
  * Column names of the joined table that can be used to join.
  * Derived from 'result', not from 'shape',
@@ -1382,7 +1382,7 @@ declare const _queryJoinOnJsonPathEquals: <T extends PickQueryMeta>(q: T, args:
  */
 type JoinQueryBuilder<T extends PickQueryMetaShape = PickQueryMetaShape, J extends PickQueryTableMetaResult = PickQueryTableMetaResult> = {
     [K in keyof J]: K extends 'meta' ? {
-        [K in keyof J['meta']]: K extends 'selectable' ? J['meta']['selectable'] & Omit<T['meta']['selectable'], keyof T['shape']> : J['meta'][K];
+        [K in keyof J['meta']]: K extends 'selectable' ? SelectableFromShape<J['result'], AliasOrTable<J>> & Omit<T['meta']['selectable'], keyof T['shape']> : J['meta'][K];
     } : J[K];
 } & OnMethods;
 declare class OnMethods {
@@ -3798,19 +3798,16 @@ interface CreateSelf extends QueryBase {
 }
 type CreateData<T extends CreateSelf, BelongsToData = CreateBelongsToData<T>> = RelationsBase extends T['relations'] ? CreateDataWithDefaults<T, keyof T['meta']['defaults']> : CreateRelationsData<T, BelongsToData>;
 type CreateDataWithDefaults<T extends CreateSelf, Defaults extends PropertyKey> = {
-    [K in keyof T['inputType'] as K extends Defaults ? never : K]: K extends Defaults ? never : CreateColumn<T['inputType'], K>;
+    [K in keyof T['inputType'] as K extends Defaults ? never : K]: K extends Defaults ? never : CreateColumn<T, K>;
 } & {
-    [K in Defaults]?: K extends keyof T['inputType'] ? CreateColumn<T['inputType'], K> : never;
+    [K in Defaults]?: K extends keyof T['inputType'] ? CreateColumn<T, K> : never;
 };
 type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends keyof T['inputType'], OmitFKeys extends PropertyKey> = {
-    [K in keyof T['inputType'] as K extends Defaults | OmitFKeys ? never : K]: K extends Defaults | OmitFKeys ? never : CreateColumn<T['inputType'], K>;
+    [K in keyof T['inputType'] as K extends Defaults | OmitFKeys ? never : K]: K extends Defaults | OmitFKeys ? never : CreateColumn<T, K>;
 } & {
-    [K in Defaults as K extends OmitFKeys ? never : K]?: CreateColumn<T['inputType'], K>;
-};
-type CreateColumn<InputType, Key extends keyof InputType> = Expression | InputType[Key] | {
-    __isQuery: true;
-    then: QueryThen<InputType[Key]>;
+    [K in Defaults as K extends OmitFKeys ? never : K]?: CreateColumn<T, K>;
 };
+type CreateColumn<T extends CreateSelf, K extends keyof T['inputType']> = T['inputType'][K] | QueryOrExpression<T['inputType'][K]> | ((q: T) => QueryOrExpression<T['inputType'][K]>);
 type CreateRelationsData<T extends CreateSelf, BelongsToData> = CreateDataWithDefaultsForRelations<T, keyof T['meta']['defaults'], T['relations'][keyof T['relations']]['relationConfig']['omitForeignKeyInCreate']> & BelongsToData & T['relations'][keyof T['relations']]['relationConfig']['optionalDataForCreate'];
 type CreateBelongsToData<T extends CreateSelf> = CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['relationConfig']['dataForCreate']>;
 type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union extends RelationConfigDataForCreate ? (u: keyof Union['columns'] extends keyof T['meta']['defaults'] ? Omit<Union['columns'], keyof T['meta']['defaults']> & {
@@ -3918,7 +3915,7 @@ declare class Create {
      *
      * await db.table.create({
      *   // raw SQL
-     *   column1: sql`'John' || ' ' || 'Doe'`,
+     *   column1: (q) => q.sql`'John' || ' ' || 'Doe'`,
      *
      *   // query that returns a single value
      *   // returning multiple values will result in Postgres error
@@ -5237,26 +5234,24 @@ declare class Union {
 }
 
 type UpdateSelf = {
-    [K in 'meta' | 'inputType' | 'relations' | 'shape' | 'result' | 'returnType' | keyof JsonModifiers]: Query[K];
+    [K in 'inputType' | 'relations' | UpdateColumnArgKeys]: Query[K];
 };
 type UpdateData<T extends UpdateSelf> = {
     [K in keyof T['inputType']]?: UpdateColumn<T, K>;
 } & {
     [K in keyof T['relations']]?: UpdateRelationData<T, T['relations'][K]['relationConfig']>;
 };
-type UpdateColumnArgKeys = keyof JsonModifiers | 'meta' | 'shape' | 'result' | 'returnType';
-type UpdateColumnCallbackResult = JsonItem | ResultRelationQueryBase;
-interface ResultRelationQueryBaseMeta extends QueryMetaBase {
-    kind: 'select';
-}
-interface ResultRelationQueryBase extends RelationQueryBase {
-    meta: ResultRelationQueryBaseMeta;
+type UpdateColumnArgKeys = keyof JsonModifiers | keyof ExpressionMethods | 'sql' | 'meta' | 'shape' | 'result' | 'returnType' | 'columnTypes';
+interface UpdateQueryOrExpression<T> extends QueryOrExpression<T> {
+    meta: {
+        kind: 'select';
+    };
 }
-type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['inputType'][Key] | Expression | {
+type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['inputType'][Key] | QueryOrExpression<T['inputType'][Key]> | {
     [K in keyof Query]: K extends 'then' ? QueryThen<T['inputType'][Key]> : Query[K];
 } | ((q: {
     [K in keyof T['relations'] | UpdateColumnArgKeys]: K extends keyof T['relations'] ? T['relations'][K] : K extends UpdateColumnArgKeys ? T[K] : never;
-}) => UpdateColumnCallbackResult);
+}) => JsonItem | UpdateQueryOrExpression<T['inputType'][Key]>);
 type UpdateRelationData<T extends UpdateSelf, Rel extends RelationConfigBase> = QueryReturnsAll<T['returnType']> extends true ? Rel['dataForUpdate'] : Rel['one'] extends true ? Rel['dataForUpdate'] | Rel['dataForUpdateOne'] : Rel['dataForUpdate'] & Rel['dataForUpdateOne'];
 type UpdateArg<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? UpdateData<T> : never;
 type UpdateRawArgs<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? SQLQueryArgs : never;
@@ -5330,7 +5325,7 @@ declare class Update {
      *   column1: 123,
      *
      *   // use raw SQL to update the column
-     *   column2: sql`2 + 2`,
+     *   column2: (q) => q.sql`2 + 2`,
      *
      *   // use query that returns a single value
      *   // returning multiple values will result in Postgres error
@@ -5439,7 +5434,7 @@ declare class Update {
      */
     update<T extends UpdateSelf>(this: T, arg: UpdateArg<T>): UpdateResult<T>;
     /**
-     * `updateRaw` is for updating records with raw expression.
+     * `updateSql` is for updating records with raw expression.
      *
      * The behavior is the same as a regular `update` method has:
      * `find` or `where` must precede calling this method,
@@ -5450,14 +5445,14 @@ declare class Update {
      * const value = 'new name';
      *
      * // update with SQL template string
-     * const updatedCount = await db.table.find(1).updateRaw`name = ${value}`;
+     * const updatedCount = await db.table.find(1).updateSql`name = ${value}`;
      *
      * // or update with `sql` function:
-     * await db.table.find(1).updateRaw(sql`name = ${value}`);
+     * await db.table.find(1).updateSql(sql`name = ${value}`);
      * ```
      * @param args - raw SQL via a template string or by using a `sql` method
      */
-    updateRaw<T extends UpdateSelf>(this: T, ...args: UpdateRawArgs<T>): UpdateResult<T>;
+    updateSql<T extends UpdateSelf>(this: T, ...args: UpdateRawArgs<T>): UpdateResult<T>;
     /**
      * To make sure that at least one row was updated use `updateOrThrow`:
      *
@@ -6690,10 +6685,7 @@ declare class QueryMethods<ColumnTypes> {
      *   pets: (q) => q.pets.join().none(),
      * });
      *
-     * await db.user.join(
-     *   (q) => q.pets.none(),
-     *   (q) => q,
-     * );
+     * await db.user.join((q) => q.pets.none());
      *
      * await db.user.join('pets', (q) => q.none());
      * ```

package/dist/index.js

@@ -2379,25 +2379,14 @@ const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
   }).text}) ${outerAs || innerAs}`;
 };
 const processArgs = (args, ctx, query, joinAs, joinShape, quotedAs) => {
-  if (args.length === 1) {
-    return getObjectOrRawConditions(
-      ctx,
-      query,
-      args[0],
-      quotedAs,
-      joinAs,
-      joinShape
-    );
-  } else {
-    return getConditionsFor3Or4LengthItem(
-      ctx,
-      query,
-      joinAs,
-      quotedAs,
-      args,
-      joinShape
-    );
-  }
+  return args.length === 1 ? getObjectOrRawConditions(ctx, query, args[0], quotedAs, joinAs, joinShape) : getConditionsFor3Or4LengthItem(
+    ctx,
+    query,
+    joinAs,
+    quotedAs,
+    args,
+    joinShape
+  );
 };
 const getConditionsFor3Or4LengthItem = (ctx, query, target, quotedAs, args, joinShape) => {
   const [leftColumn, opOrRightColumn, maybeRightColumn] = args;
@@ -2550,7 +2539,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
       );
       return { w: first, r, s: joinSubQuery || getIsJoinSubQuery(r) };
     }
-  } else if (typeof args[0] === "function") {
+  }
+  const args0 = args.length ? args[0] : orchidCore.returnArg;
+  if (typeof args0 === "function") {
     const q = first;
     if (q.joinQueryAfterCallback) {
       let base = q.baseQuery;
@@ -2568,7 +2559,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
     const joinedShapes = __spreadProps$4(__spreadValues$c({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
-    const r = args[0](
+    const r = args0(
       makeJoinQueryBuilder(
         q,
         q.q.joinedShapes ? __spreadValues$c(__spreadValues$c({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
@@ -6366,7 +6357,7 @@ class Create {
    *
    * await db.table.create({
    *   // raw SQL
-   *   column1: sql`'John' || ' ' || 'Doe'`,
+   *   column1: (q) => q.sql`'John' || ' ' || 'Doe'`,
    *
    *   // query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -9442,7 +9433,7 @@ class Update {
    *   column1: 123,
    *
    *   // use raw SQL to update the column
-   *   column2: sql`2 + 2`,
+   *   column2: (q) => q.sql`2 + 2`,
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -9556,7 +9547,7 @@ class Update {
     );
   }
   /**
-   * `updateRaw` is for updating records with raw expression.
+   * `updateSql` is for updating records with raw expression.
    *
    * The behavior is the same as a regular `update` method has:
    * `find` or `where` must precede calling this method,
@@ -9567,14 +9558,14 @@ class Update {
    * const value = 'new name';
    *
    * // update with SQL template string
-   * const updatedCount = await db.table.find(1).updateRaw`name = ${value}`;
+   * const updatedCount = await db.table.find(1).updateSql`name = ${value}`;
    *
    * // or update with `sql` function:
-   * await db.table.find(1).updateRaw(sql`name = ${value}`);
+   * await db.table.find(1).updateSql(sql`name = ${value}`);
    * ```
    * @param args - raw SQL via a template string or by using a `sql` method
    */
-  updateRaw(...args) {
+  updateSql(...args) {
     return _queryUpdateRaw(
       this.clone(),
       sqlQueryArgsToExpression(args)
@@ -11149,10 +11140,7 @@ class QueryMethods {
    *   pets: (q) => q.pets.join().none(),
    * });
    *
-   * await db.user.join(
-   *   (q) => q.pets.none(),
-   *   (q) => q,
-   * );
+   * await db.user.join((q) => q.pets.none());
    *
    * await db.user.join('pets', (q) => q.none());
    * ```