effect-qb 0.15.0 → 0.16.0

package/src/postgres/internal/dsl.ts

@@ -40,6 +40,7 @@ import {
   type ExpressionInput,
   type ExtractDialect,
   type ExtractRequired,
+  type FactsOfPlan,
   type GroupByInput,
   type GroupedOfPlan,
   type GroupedKeysFromValues,
@@ -55,6 +56,7 @@ import {
   type PlanDialectOf,
   type PresenceWitnessKeysOfSource,
   type PredicateInput,
+  type PredicateStateOfPlan,
   type KindOf,
   type QueryPlan,
   type OutputOfSelection,
@@ -117,7 +119,7 @@ import type {
   JsonValueAtPath,
   NormalizeJsonLiteral
 } from "../../internal/json/types.js"
-import type { AssumeTrue } from "../../internal/predicate/analysis.js"
+import type { AssumePredicateStateTrue, EmptyFacts, PredicateStateFacts, PredicateStateFormula } from "../../internal/predicate/analysis.js"
 import type { FormulaOfPredicate } from "../../internal/predicate/normalize.js"
 import type { TrueFormula } from "../../internal/predicate/formula.js"
 import { assumeFormulaTrue, formulaOfExpression as formulaOfExpressionRuntime, trueFormula } from "../../internal/predicate/runtime.js"
@@ -762,6 +764,18 @@ type DialectExpressionTuple<
   readonly [K in keyof Values]: DialectAsExpression<Values[K], Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
 }
 
+type DialectExpressionArray<
+  Values extends readonly ExpressionInput[],
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = DialectExpressionTuple<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> extends infer Tuple extends readonly Expression.Any[]
+  ? Tuple
+  : never
+
 /** Normalized expression tuple for generic string operator inputs. */
 type DialectStringExpressionTuple<
   Values extends readonly ExpressionInput[],
@@ -778,7 +792,7 @@ type DialectStringExpressionTuple<
 /** Names of sources already available to a plan. */
 type AvailableNames<Available extends Record<string, Plan.AnySource>> = Extract<keyof Available, string>
 
-type PlanAssumptionsAfterWhere<
+type PlanPredicateStateAfterWhere<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Predicate extends PredicateInput,
   Dialect extends string,
@@ -787,12 +801,34 @@ type PlanAssumptionsAfterWhere<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = AssumeTrue<
-  AssumptionsOfPlan<PlanValue>,
+> = AssumePredicateStateTrue<
+  PredicateStateOfPlan<PlanValue>,
   DialectAsExpression<Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
 >
 
-type PlanAssumptionsAfterHaving<
+type PlanAssumptionsAfterWhere<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends PredicateInput,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFormula<PlanPredicateStateAfterWhere<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
+
+type PlanFactsAfterWhere<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends PredicateInput,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFacts<PlanPredicateStateAfterWhere<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
+
+type PlanPredicateStateAfterHaving<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Predicate extends HavingPredicateInput,
   Dialect extends string,
@@ -801,12 +837,34 @@ type PlanAssumptionsAfterHaving<
   BoolDb extends Expression.DbType.Any,
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
-> = AssumeTrue<
-  AssumptionsOfPlan<PlanValue>,
+> = AssumePredicateStateTrue<
+  PredicateStateOfPlan<PlanValue>,
   DialectAsExpression<Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
 >
 
-type PlanAssumptionsAfterJoin<
+type PlanAssumptionsAfterHaving<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends HavingPredicateInput,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFormula<PlanPredicateStateAfterHaving<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
+
+type PlanFactsAfterHaving<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends HavingPredicateInput,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFacts<PlanPredicateStateAfterHaving<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
+
+type PlanPredicateStateAfterJoin<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Predicate extends PredicateInput,
   Kind extends QueryAst.JoinKind,
@@ -817,11 +875,35 @@ type PlanAssumptionsAfterJoin<
   TimestampDb extends Expression.DbType.Any,
   NullDb extends Expression.DbType.Any
 > = Kind extends "inner"
-  ? AssumeTrue<
-      AssumptionsOfPlan<PlanValue>,
+  ? AssumePredicateStateTrue<
+      PredicateStateOfPlan<PlanValue>,
       DialectAsExpression<Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     >
-  : AssumptionsOfPlan<PlanValue>
+  : PredicateStateOfPlan<PlanValue>
+
+type PlanAssumptionsAfterJoin<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends PredicateInput,
+  Kind extends QueryAst.JoinKind,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFormula<PlanPredicateStateAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
+
+type PlanFactsAfterJoin<
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
+  Predicate extends PredicateInput,
+  Kind extends QueryAst.JoinKind,
+  Dialect extends string,
+  TextDb extends Expression.DbType.Any,
+  NumericDb extends Expression.DbType.Any,
+  BoolDb extends Expression.DbType.Any,
+  TimestampDb extends Expression.DbType.Any,
+  NullDb extends Expression.DbType.Any
+> = PredicateStateFacts<PlanPredicateStateAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>
 
 type ScalarSubqueryInput<
   PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
@@ -960,6 +1042,16 @@ type JsonPathInput = JsonPath.Path<any> | JsonPath.CanonicalSegment
 
 type JsonQueryInput = JsonPath.Path<any> | StringExpressionInput
 
+type JsonPathSegmentsOf<Target extends JsonPathInput> =
+  Target extends JsonPath.Path<any>
+    ? JsonPath.SegmentsOf<Target>
+    : readonly [Target]
+
+type JsonTextAccessKind<Target extends JsonPathInput> =
+  Target extends JsonPath.Path<any>
+    ? JsonPath.IsExactPath<Target> extends true ? "jsonPathText" : "jsonTraverseText"
+    : Target extends JsonPath.ExactSegment ? "jsonGetText" : "jsonAccessText"
+
 type JsonPathOutputOf<
   Root,
   Target extends JsonPathInput,
@@ -1480,6 +1572,42 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
     >
   }
 
+  const retargetLiteralExpression = (
+    value: Expression.Any,
+    target: Expression.Any
+  ): Expression.Any => {
+    const ast = (value as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    if (ast.kind !== "literal") {
+      return value
+    }
+    const targetState = target[Expression.TypeId]
+    return makeExpression({
+      runtime: value[Expression.TypeId].runtime,
+      dbType: targetState.dbType,
+      runtimeSchema: targetState.runtimeSchema,
+      driverValueMapping: targetState.driverValueMapping,
+      nullability: value[Expression.TypeId].nullability,
+      dialect: targetState.dialect,
+      kind: "scalar",
+      dependencies: {}
+    }, ast)
+  }
+
+  const alignBinaryPredicateExpressions = (
+    left: Expression.Any,
+    right: Expression.Any
+  ): readonly [Expression.Any, Expression.Any] => {
+    const leftAst = (left as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    const rightAst = (right as unknown as { readonly [ExpressionAst.TypeId]: ExpressionAst.Any })[ExpressionAst.TypeId]
+    if (leftAst.kind === "literal" && rightAst.kind !== "literal") {
+      return [retargetLiteralExpression(left, right), right]
+    }
+    if (rightAst.kind === "literal" && leftAst.kind !== "literal") {
+      return [left, retargetLiteralExpression(right, left)]
+    }
+    return [left, right]
+  }
+
   const toDialectStringExpression = <Value extends StringExpressionInput>(
     value: Value
   ): DialectAsStringExpression<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> =>
@@ -1657,8 +1785,10 @@ type BinaryPredicateExpression<
     kind: Kind,
     nullability: Nullability = "maybe" as Nullability,
   ): any => {
-    const leftExpression = toDialectExpression(left)
-    const rightExpression = toDialectExpression(right)
+    const [leftExpression, rightExpression] = alignBinaryPredicateExpressions(
+      toDialectExpression(left),
+      toDialectExpression(right)
+    )
     return (makeExpression as any)({
       runtime: true as boolean,
       dbType: profile.boolDb as BoolDb,
@@ -1681,17 +1811,21 @@ type BinaryPredicateExpression<
     kind: ExpressionAst.VariadicKind
   ): Expression.Any => {
     const expressions = values.map((value) => toDialectExpression(value as any)) as readonly Expression.Any[]
+    const [head, ...tail] = expressions
+    const alignedExpressions = (head !== undefined && (kind === "in" || kind === "notIn" || kind === "between"))
+      ? [head, ...tail.map((value) => retargetLiteralExpression(value, head))]
+      : expressions
     return makeExpression({
       runtime: true as boolean,
       dbType: profile.boolDb as BoolDb,
       nullability: "maybe",
-      dialect: (expressions.find((value) => value[Expression.TypeId].dialect !== undefined)?.[Expression.TypeId].dialect ?? profile.dialect) as Dialect,
+      dialect: (alignedExpressions.find((value) => value[Expression.TypeId].dialect !== undefined)?.[Expression.TypeId].dialect ?? profile.dialect) as Dialect,
       kind: "scalar",
 
-      dependencies: mergeManyDependencies(expressions)
+      dependencies: mergeManyDependencies(alignedExpressions)
     }, {
       kind,
-      values: expressions
+      values: alignedExpressions
     })
   }
 
@@ -1997,6 +2131,7 @@ type BinaryPredicateExpression<
       runtime: undefined as unknown as RuntimeOfDbType<Target>,
       dbType: target as Target,
       runtimeSchema: undefined,
+      driverValueMapping: (target as Expression.DbType.Any).driverValueMapping,
       nullability: expression[Expression.TypeId].nullability,
       dialect: expression[Expression.TypeId].dialect,
       kind: expression[Expression.TypeId].kind,
@@ -2076,6 +2211,14 @@ type BinaryPredicateExpression<
     kind
   })
 
+  const driverValueMapping = <Db extends Expression.DbType.Any>(
+    dbType: Db,
+    mapping: Expression.DriverValueMapping
+  ): Db => ({
+    ...dbType,
+    driverValueMapping: mapping
+  })
+
   const type = {
     ...profile.type,
     array,
@@ -2085,7 +2228,8 @@ type BinaryPredicateExpression<
     domain,
     enum: enum_,
     set,
-    custom
+    custom,
+    driverValueMapping
   }
 
   const makeJsonDb = <Kind extends string>(
@@ -2273,7 +2417,7 @@ type BinaryPredicateExpression<
     DialectOf<Base>,
     KindOf<Base>,
     DependenciesOf<Base>,
-    JsonNode
+    ExpressionAst.JsonAccessNode<JsonTextAccessKind<Target>, Base, JsonPathSegmentsOf<Target>>
   > => {
     const segments = normalizeJsonPathInput(target)
     const kind = isJsonPathValue(target)
@@ -2300,7 +2444,7 @@ type BinaryPredicateExpression<
       DialectOf<Base>,
       KindOf<Base>,
       DependenciesOf<Base>,
-      JsonNode
+      ExpressionAst.JsonAccessNode<JsonTextAccessKind<Target>, Base, JsonPathSegmentsOf<Target>>
     >
   }
 
@@ -3027,12 +3171,12 @@ type BinaryPredicateExpression<
   }
 
   const and = <
-    Values extends readonly [ExpressionInput, ...ExpressionInput[]]
+    const Values extends readonly [ExpressionInput, ...ExpressionInput[]]
   >(
     ...values: Values
   ): VariadicBooleanExpression<
     "and",
-    { readonly [K in keyof Values]: DialectAsExpression<Values[K], Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> } & readonly Expression.Any[],
+    DialectExpressionArray<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     Dialect,
     TextDb,
     NumericDb,
@@ -3042,16 +3186,16 @@ type BinaryPredicateExpression<
   > =>
     makeVariadicBooleanExpression(
       "and",
-      values.map((value) => toDialectExpression(value)) as { readonly [K in keyof Values]: DialectAsExpression<Values[K], Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> } & readonly Expression.Any[]
+      values.map((value) => toDialectExpression(value)) as unknown as DialectExpressionArray<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     )
 
   const or = <
-    Values extends readonly [ExpressionInput, ...ExpressionInput[]]
+    const Values extends readonly [ExpressionInput, ...ExpressionInput[]]
   >(
     ...values: Values
   ): VariadicBooleanExpression<
     "or",
-    { readonly [K in keyof Values]: DialectAsExpression<Values[K], Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> } & readonly Expression.Any[],
+    DialectExpressionArray<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
     Dialect,
     TextDb,
     NumericDb,
@@ -3061,7 +3205,7 @@ type BinaryPredicateExpression<
   > =>
     makeVariadicBooleanExpression(
       "or",
-      values.map((value) => toDialectExpression(value)) as { readonly [K in keyof Values]: DialectAsExpression<Values[K], Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb> } & readonly Expression.Any[]
+      values.map((value) => toDialectExpression(value)) as unknown as DialectExpressionArray<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     )
 
   const not = <Value extends ExpressionInput>(
@@ -3295,6 +3439,8 @@ type BinaryPredicateExpression<
     return makeExpression({
       runtime: undefined as Expression.RuntimeOf<ScalarOutputOfPlan<PlanValue>> | null,
       dbType: expression[Expression.TypeId].dbType as Expression.DbTypeOf<ScalarOutputOfPlan<PlanValue>>,
+      runtimeSchema: expression[Expression.TypeId].runtimeSchema,
+      driverValueMapping: expression[Expression.TypeId].driverValueMapping,
       nullability: "maybe",
       dialect: profile.dialect as Dialect,
       kind: "scalar",
@@ -3838,6 +3984,7 @@ type BinaryPredicateExpression<
       runtime: undefined as Expression.RuntimeOf<Value>,
       dbType: value[Expression.TypeId].dbType as Expression.DbTypeOf<Value>,
       runtimeSchema: value[Expression.TypeId].runtimeSchema,
+      driverValueMapping: value[Expression.TypeId].driverValueMapping,
       nullability: value[Expression.TypeId].nullability as Expression.NullabilityOf<Value>,
       dialect: profile.dialect as Dialect,
       kind: "scalar",
@@ -3862,11 +4009,13 @@ type BinaryPredicateExpression<
     column: Expression.Any
   ): Expression.Any => {
     if (value !== null && typeof value === "object" && Expression.TypeId in value) {
-      return value as unknown as Expression.Any
+      return retargetLiteralExpression(value as unknown as Expression.Any, column)
     }
     return makeExpression({
       runtime: value as Value,
       dbType: column[Expression.TypeId].dbType,
+      runtimeSchema: column[Expression.TypeId].runtimeSchema,
+      driverValueMapping: column[Expression.TypeId].driverValueMapping,
       nullability: value === null ? "always" : "never",
       dialect: column[Expression.TypeId].dialect,
       kind: "scalar",
@@ -3941,6 +4090,7 @@ type BinaryPredicateExpression<
         runtime: undefined as never,
         dbType: state.dbType,
         runtimeSchema: state.runtimeSchema,
+        driverValueMapping: state.driverValueMapping,
         nullability: state.nullability,
         dialect: state.dialect,
         kind: "scalar",
@@ -4332,7 +4482,10 @@ type DistinctOnApi<Dialect extends string> = Dialect extends "postgres"
       OutstandingOfPlan<PlanValue>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
   : DistinctOnUnsupportedError<Dialect>
 
@@ -4641,7 +4794,10 @@ type SelectFromResult<
   Exclude<OutstandingOfPlan<PlanValue>, SourceNameOf<CurrentSource>>,
   AssumptionsOfPlan<PlanValue>,
   MergeCapabilities<CapabilitiesOfPlan<PlanValue>, SourceCapabilitiesOf<CurrentSource>>,
-  StatementOfPlan<PlanValue>
+  StatementOfPlan<PlanValue>,
+  MutationTargetOfPlan<PlanValue>,
+  InsertSourceStateOfPlan<PlanValue>,
+  FactsOfPlan<PlanValue>
 >
 
 type UpdateFromResult<
@@ -4663,7 +4819,10 @@ type UpdateFromResult<
   Exclude<OutstandingOfPlan<PlanValue>, SourceNameOf<CurrentSource>>,
   AssumptionsOfPlan<PlanValue>,
   MergeCapabilities<CapabilitiesOfPlan<PlanValue>, SourceCapabilitiesOf<CurrentSource>>,
-  StatementOfPlan<PlanValue>
+  StatementOfPlan<PlanValue>,
+  MutationTargetOfPlan<PlanValue>,
+  InsertSourceStateOfPlan<PlanValue>,
+  FactsOfPlan<PlanValue>
 >
 
 type InsertFromResult<
@@ -4684,7 +4843,8 @@ type InsertFromResult<
     : CapabilitiesOfPlan<PlanValue>,
   StatementOfPlan<PlanValue>,
   MutationTargetOfPlan<PlanValue>,
-  "ready"
+  "ready",
+  FactsOfPlan<PlanValue>
 >
 
 type FromPlanConstraint<
@@ -5046,7 +5206,10 @@ type AsCurriedResult<
     ExtractRequired<Selection>,
     TrueFormula,
     "read",
-    "select"
+    "select",
+    any,
+    "ready",
+    EmptyFacts
   >
 
   const {
@@ -5117,7 +5280,10 @@ type AsCurriedResult<
       AddExpressionRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, Predicate>,
       PlanAssumptionsAfterWhere<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      PlanFactsAfterWhere<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     >
 
   export type FromApi = <CurrentSource extends FromInput>(
@@ -5142,7 +5308,10 @@ type AsCurriedResult<
       AddExpressionRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, Predicate>,
       PlanAssumptionsAfterHaving<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      PlanFactsAfterHaving<PlanValue, Predicate, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     >
 
   type CrossJoinApi = <CurrentTable extends SourceLike>(
@@ -5204,7 +5373,10 @@ type AsCurriedResult<
       AddJoinRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, SourceNameOf<CurrentTable>, Predicate, Kind>,
       PlanAssumptionsAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
       MergeCapabilities<CapabilitiesOfPlan<PlanValue>, SourceCapabilitiesOf<CurrentTable>>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      PlanFactsAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     >
 
   type BinaryJoinApi<Kind extends QueryAst.JoinKind> = <
@@ -5236,7 +5408,10 @@ type AsCurriedResult<
       AddJoinRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, SourceNameOf<CurrentTable>, Predicate, Kind>,
       PlanAssumptionsAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
       MergeCapabilities<CapabilitiesOfPlan<PlanValue>, SourceCapabilitiesOf<CurrentTable>>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      PlanFactsAfterJoin<PlanValue, Predicate, Kind, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     >
 
   type OrderByApi = <Value extends ExpressionInput>(
@@ -5255,7 +5430,10 @@ type AsCurriedResult<
       AddExpressionRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, Value>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   interface LockApi {
@@ -5271,7 +5449,10 @@ type AsCurriedResult<
       OutstandingOfPlan<PlanValue>,
       AssumptionsOfPlan<PlanValue>,
       MergeCapabilities<CapabilitiesOfPlan<PlanValue>, "transaction">,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
     <Mode extends Dialect extends "mysql" ? "lowPriority" | "ignore" | "quick" : never>(
       mode: Mode,
@@ -5296,7 +5477,10 @@ type AsCurriedResult<
       OutstandingOfPlan<PlanValue>,
       AssumptionsOfPlan<PlanValue>,
       MergeCapabilities<CapabilitiesOfPlan<PlanValue>, "transaction">,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
   }
 
@@ -5313,7 +5497,10 @@ type AsCurriedResult<
       OutstandingOfPlan<PlanValue>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   type LimitApi = <Value extends NumericExpressionInput>(
@@ -5331,7 +5518,10 @@ type AsCurriedResult<
       AddExpressionRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, DialectAsNumericExpression<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   type OffsetApi = <Value extends NumericExpressionInput>(
@@ -5349,7 +5539,10 @@ type AsCurriedResult<
       AddExpressionRequired<OutstandingOfPlan<PlanValue>, AvailableOfPlan<PlanValue>, DialectAsNumericExpression<Value, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   const {
@@ -5448,7 +5641,7 @@ type AsCurriedResult<
         ...currentAst,
         distinct: true,
         distinctOn: expressions
-      }, currentQuery.assumptions, currentQuery.capabilities, currentQuery.statement as StatementOfPlan<PlanValue>)
+      }, currentQuery.assumptions, currentQuery.capabilities, currentQuery.statement as StatementOfPlan<PlanValue>, currentQuery.target, currentQuery.insertSource, currentQuery.facts)
     }
   }) as DistinctOnApi<Dialect>
 
@@ -5467,7 +5660,10 @@ type AsCurriedResult<
       Exclude<OutstandingOfPlan<PlanValue> | RequiredFromDependencies<TupleDependencies<Values>>, AvailableNames<AvailableOfPlan<PlanValue>>>,
       AssumptionsOfPlan<PlanValue>,
       CapabilitiesOfPlan<PlanValue>,
-      StatementOfPlan<PlanValue>
+      StatementOfPlan<PlanValue>,
+      MutationTargetOfPlan<PlanValue>,
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   type ReturningApi = <Selection extends SelectionShape>(
@@ -5487,7 +5683,8 @@ type AsCurriedResult<
       CapabilitiesOfPlan<PlanValue>,
       StatementOfPlan<PlanValue>,
       MutationTargetOfPlan<PlanValue>,
-      InsertSourceStateOfPlan<PlanValue>
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   export interface InsertApi {
@@ -5505,7 +5702,8 @@ type AsCurriedResult<
       "write",
       "insert",
       Target,
-      "missing"
+      "missing",
+      EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
       target: Target,
@@ -5522,7 +5720,8 @@ type AsCurriedResult<
       "write",
       "insert",
       Target,
-      "ready"
+      "ready",
+      EmptyFacts
     >
   }
 
@@ -5554,7 +5753,8 @@ type AsCurriedResult<
       CapabilitiesOfPlan<PlanValue>,
       StatementOfPlan<PlanValue>,
       MutationTargetOfPlan<PlanValue>,
-      InsertSourceStateOfPlan<PlanValue>
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     >
 
   interface UpdateApi {
@@ -5571,7 +5771,10 @@ type AsCurriedResult<
       Exclude<NestedMutationRequiredFromValues<Values>, MutationTargetNamesOf<Targets>>,
       TrueFormula,
       "write",
-      "update"
+      "update",
+      any,
+      "ready",
+      EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
       target: Target,
@@ -5586,7 +5789,10 @@ type AsCurriedResult<
       Exclude<MutationRequiredFromValues<Values>, SourceNameOf<Target>>,
       TrueFormula,
       "write",
-      "update"
+      "update",
+      any,
+      "ready",
+      EmptyFacts
     >
   }
 
@@ -5612,7 +5818,8 @@ type AsCurriedResult<
     "write",
     "insert",
     Target,
-    "ready"
+    "ready",
+    EmptyFacts
   >
 
   interface DeleteApi {
@@ -5628,7 +5835,10 @@ type AsCurriedResult<
       never,
       TrueFormula,
       "write",
-      "delete"
+      "delete",
+      any,
+      "ready",
+      EmptyFacts
     >
     <Targets extends MutationTargetTuple>(
       target: Dialect extends "mysql" ? Targets : never
@@ -5642,7 +5852,10 @@ type AsCurriedResult<
       never,
       TrueFormula,
       "write",
-      "delete"
+      "delete",
+      any,
+      "ready",
+      EmptyFacts
     >
   }
 
@@ -5659,7 +5872,10 @@ type AsCurriedResult<
     never,
     TrueFormula,
     "write",
-    "truncate"
+    "truncate",
+    any,
+    "ready",
+    EmptyFacts
   >
 
   type MergeApi = <
@@ -5713,7 +5929,10 @@ type AsCurriedResult<
     >,
     TrueFormula,
     MergeCapabilities<"write", SourceCapabilitiesOf<Source>>,
-    "merge"
+    "merge",
+    any,
+    "ready",
+    EmptyFacts
   >
 
   const mutationRuntime = makeDslMutationRuntime({
@@ -5768,7 +5987,8 @@ type AsCurriedResult<
       CapabilitiesOfPlan<PlanValue>,
       StatementOfPlan<PlanValue>,
       MutationTargetOfPlan<PlanValue>,
-      InsertSourceStateOfPlan<PlanValue>
+      InsertSourceStateOfPlan<PlanValue>,
+      FactsOfPlan<PlanValue>
     > => mutationRuntime.onConflict(target, options)(plan)
 
   const update: UpdateApi = ((
@@ -5798,7 +6018,8 @@ type AsCurriedResult<
     "write",
     "insert",
     Target,
-    "ready"
+    "ready",
+    EmptyFacts
   > => mutationRuntime.upsert(target, values, conflictColumns as string | readonly string[], updateValues)
 
   const delete_: DeleteApi = ((
@@ -5820,7 +6041,10 @@ type AsCurriedResult<
     never,
     TrueFormula,
     "write",
-    "truncate"
+    "truncate",
+    any,
+    "ready",
+    EmptyFacts
   > => mutationRuntime.truncate(target, options)
 
   const merge: MergeApi = <
@@ -5874,7 +6098,10 @@ type AsCurriedResult<
     >,
     TrueFormula,
     MergeCapabilities<"write", SourceCapabilitiesOf<Source>>,
-    "merge"
+    "merge",
+    any,
+    "ready",
+    EmptyFacts
   > => mutationRuntime.merge(target, source, on, options)
 
   type TransactionApi = (options?: TransactionOptions) => QueryPlan<