effect-qb 0.19.0 → 0.21.0

package/src/postgres/internal/dsl.ts

@@ -114,6 +114,7 @@ import * as ExpressionAst from "../../internal/expression-ast.js"
 import { presenceWitnessesOfSourceLike } from "../../internal/implication-runtime.js"
 import type { JsonNode } from "../../internal/json/ast.js"
 import type { JsonPathUsageError } from "../../internal/json/errors.js"
+import { withJsonPathAccess } from "../../internal/json/path-access.js"
 import * as JsonPath from "../../internal/json/path.js"
 import type {
   JsonConcatResult,
@@ -1553,11 +1554,14 @@ const profile: QueryDialectProfile<Dialect, TextDb, NumericDb, BoolDb, Timestamp
 
   const literalSchemaOf = <Value extends LiteralValue>(
     value: Value
-  ): Schema.Schema.Any | undefined => {
+  ): Schema.Top | undefined => {
     if (value === null || value instanceof Date) {
       return undefined
     }
-    return Schema.Literal(value) as Schema.Schema.Any
+    if (typeof value === "number" && !Number.isFinite(value)) {
+      return undefined
+    }
+    return Schema.Literal(value) as unknown as Schema.Top
   }
 
   const literal = <const Value extends LiteralValue>(
@@ -2402,7 +2406,7 @@ type BinaryPredicateExpression<
     MergeAggregationTuple<typeof expressions>,
     TupleDependencies<typeof expressions>,
     Ast
-  > => makeExpression({
+  > => withJsonPathAccess(makeExpression({
     runtime: state.runtime,
     dbType: state.dbType,
     nullability: state.nullability,
@@ -2410,7 +2414,7 @@ type BinaryPredicateExpression<
     kind: mergeAggregationManyRuntime(expressions) as MergeAggregationTuple<typeof expressions>,
 
     dependencies: mergeManyDependencies(expressions)
-  }, ast) as AstBackedExpression<
+  }, ast)) as AstBackedExpression<
     Runtime,
     Db,
     Nullability,
@@ -2431,7 +2435,7 @@ type BinaryPredicateExpression<
   const makeJsonLiteralExpression = <Value extends JsonLiteralInput>(
     value: Value,
     dbType: Expression.DbType.Json<any, any> = jsonDb
-  ) => makeExpression({
+  ) => withJsonPathAccess(makeExpression({
     runtime: value as JsonRuntime<Value>,
     dbType,
     nullability: (value === null ? "always" : "never") as JsonNullabilityOf<Value>,
@@ -2442,7 +2446,7 @@ type BinaryPredicateExpression<
   }, {
     kind: "literal",
     value
-  })
+  }))
 
   const wrapJsonExpression = (
     value: Expression.Any,
@@ -4523,6 +4527,83 @@ type ValidateTargetColumnInput<
   Columns extends DdlColumnInput
 > = ValidateTargetColumns<Target, NormalizeDdlColumns<Columns>> extends never ? never : Columns
 
+type SameColumnSet<
+  Left extends readonly string[],
+  Right extends readonly string[]
+> = string extends Left[number] | Right[number]
+  ? false
+  : Exclude<Left[number], Right[number]> extends never
+    ? Exclude<Right[number], Left[number]> extends never
+      ? true
+      : false
+    : false
+
+type ConflictArbitersOf<Target extends MutationTargetLike> =
+  Target[typeof Table.TypeId]["conflictArbiters"][number]
+
+type MatchingConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[],
+  AllowPartial extends boolean
+> = ConflictArbitersOf<Target> extends infer Arbiter extends Table.ConflictArbiter
+  ? Arbiter extends Table.ConflictArbiter
+    ? SameColumnSet<Arbiter["columns"], Columns> extends true
+      ? Arbiter["scope"] extends "unconditional"
+        ? true
+        : AllowPartial extends true ? true : never
+      : never
+    : never
+  : never
+
+type HasInlineConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[]
+> = Columns extends readonly [infer Column extends Extract<keyof Target[typeof Table.TypeId]["fields"], string>]
+  ? Target[typeof Table.TypeId]["fields"][Column] extends { readonly metadata: { readonly primaryKey: true } | { readonly unique: true } }
+    ? true
+    : false
+  : false
+
+type HasConflictArbiter<
+  Target extends MutationTargetLike,
+  Columns extends readonly string[],
+  AllowPartial extends boolean
+> = string extends Extract<keyof Target[typeof Table.TypeId]["fields"], string>
+  ? true
+  : HasInlineConflictArbiter<Target, Columns> extends true
+    ? true
+  : true extends MatchingConflictArbiter<Target, Columns, AllowPartial> ? true : false
+
+type ConflictTargetArbiterError<
+  Columns,
+  AllowPartial extends boolean
+> = {
+  readonly __effect_qb_error__: "effect-qb: conflict target columns must match a primary key, unique constraint, or unique index"
+  readonly __effect_qb_conflict_columns__: Columns
+  readonly __effect_qb_partial_target__: AllowPartial
+  readonly __effect_qb_hint__: "Declare the target columns as primaryKey/unique, add a table-level Unique.make(...), or use a simple Pg.Index.uniqueIndex(...)"
+}
+
+type ValidateConflictColumnInput<
+  Target extends MutationTargetLike,
+  Columns extends DdlColumnInput,
+  AllowPartial extends boolean
+> = ValidateTargetColumnInput<Target, Columns> extends never
+  ? never
+  : HasConflictArbiter<Target, NormalizeDdlColumns<Columns>, AllowPartial> extends true
+    ? Columns
+    : ConflictTargetArbiterError<NormalizeDdlColumns<Columns>, AllowPartial>
+
+type ConflictColumnPlanConstraint<
+  Target extends MutationTargetLike,
+  Columns extends DdlColumnInput,
+  AllowPartial extends boolean
+> = ValidateTargetColumnInput<Target, Columns> extends never
+  ? never
+  : HasConflictArbiter<Target, NormalizeDdlColumns<Columns>, AllowPartial> extends true
+    ? unknown
+    : ConflictTargetArbiterError<NormalizeDdlColumns<Columns>, AllowPartial>
+
 type CreateIndexOptions<Name extends string = string> = {
   readonly name?: NonEmptyStringInput<Name>
   readonly unique?: boolean
@@ -4961,6 +5042,21 @@ type ConflictConstraintNameConstraint<Target> =
     ? { readonly constraint: NonEmptyStringInput<Constraint> }
     : unknown
 
+type ConflictTargetHasPredicate<Target> =
+  Target extends { readonly where: PredicateInput } ? true : false
+
+type ConflictTargetPlanConstraint<
+  Target extends MutationTargetLike,
+  ConflictTarget
+> =
+  ConflictTarget extends { readonly constraint: string }
+    ? unknown
+    : ConflictTarget extends { readonly columns: infer Columns extends DdlColumnInput }
+      ? ConflictColumnPlanConstraint<Target, Columns, ConflictTargetHasPredicate<ConflictTarget>>
+      : ConflictTarget extends DdlColumnInput
+        ? ConflictColumnPlanConstraint<Target, ConflictTarget, false>
+        : unknown
+
 type ConflictActionInput<
   Target extends MutationTargetLike,
   Dialect extends string,
@@ -5114,6 +5210,11 @@ type MutationTargetTupleDialectConstraint<
   Dialect extends string
 > = Exclude<TableDialectOf<Targets[number]>, Dialect | "standard"> extends never ? unknown : never
 
+type TableDialectConstraint<
+  Target extends TableLike,
+  Dialect extends string
+> = Exclude<TableDialectOf<Target>, Dialect> extends never ? unknown : never
+
 type MutationRequiredFromValues<Values extends Record<string, unknown>> = {
   [K in keyof Values]: Values[K] extends Expression.Any ? RequiredFromDependencies<DependenciesOf<Values[K]>> : never
 }[keyof Values]
@@ -6268,7 +6369,7 @@ type AsCurriedResult<
 
   export interface InsertApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6285,7 +6386,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"insert", Target, Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6318,9 +6419,9 @@ type AsCurriedResult<
   >(
     target: ConflictTarget & ConflictConstraintNameConstraint<ConflictTarget>,
     options?: Options & ConflictActionUpdateNonEmptyConstraint<Options>
-  ) =>
+	  ) =>
     <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>>(
-      plan: PlanValue & RequireInsertStatement<PlanValue>
+      plan: PlanValue & RequireInsertStatement<PlanValue> & ConflictTargetPlanConstraint<MutationTargetOfPlan<PlanValue>, ConflictTarget>
     ) => QueryPlan<
       SelectionOfPlan<PlanValue>,
       Exclude<RequiredOfPlan<PlanValue> | ConflictRequired<UpdateValues, Options, ConflictTarget>, AvailableNames<AvailableOfPlan<PlanValue>>>,
@@ -6357,7 +6458,7 @@ type AsCurriedResult<
       EmptyFacts
     >
     <Target extends MutationTargetLike, Values extends Record<string, unknown>>(
-      target: Target,
+      target: Target & TableDialectConstraint<Target, Dialect>,
       values: MutationValuesInput<"update", Target, Values> & UpdateValuesNonEmptyConstraint<Values> & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
     ): QueryPlan<
       {},
@@ -6382,9 +6483,9 @@ type AsCurriedResult<
     const Columns extends DdlColumnInput,
     UpdateValues extends MutationInputOf<Table.UpdateOf<Target>> | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     values: Values & MutationValuesDialectConstraint<Values, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>,
-    conflictColumns: ValidateTargetColumnInput<Target, Columns>,
+    conflictColumns: ValidateConflictColumnInput<Target, Columns, false>,
     updateValues?: UpdateValues & UpdateValuesNonEmptyConstraint<Exclude<UpdateValues, undefined>> & MutationValuesDialectConstraint<Exclude<UpdateValues, undefined>, Dialect, TextDb, NumericDb, BoolDb, TimestampDb, NullDb>
   ) => QueryPlan<
     {},
@@ -6406,7 +6507,7 @@ type AsCurriedResult<
 
   interface DeleteApi {
     <Target extends MutationTargetLike>(
-      target: Target
+      target: Target & TableDialectConstraint<Target, Dialect>
     ): QueryPlan<
       {},
       never,
@@ -6442,7 +6543,7 @@ type AsCurriedResult<
   }
 
   type TruncateApi = <Target extends MutationTargetLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: TruncateOptions
   ) => QueryPlan<
     {},
@@ -6469,10 +6570,10 @@ type AsCurriedResult<
     MatchedPredicate extends PredicateInput | undefined = undefined,
     NotMatchedPredicate extends PredicateInput | undefined = undefined
   >(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     source: Source & (
       SourceRequiredOf<Source> extends never ? unknown : SourceRequirementError<Source>
-    ) & SourceDialectConstraint<Source, Dialect> & MergeSourceNameConstraint<Target, Source>,
+    ) & MergeSourceNameConstraint<Target, Source> & SourceDialectConstraint<Source, Dialect>,
     on: On,
     options: MergeOptions<Target, MatchedValues, InsertValues, MatchedPredicate, NotMatchedPredicate>
   ) => QueryPlan<
@@ -6674,7 +6775,7 @@ type AsCurriedResult<
   >
 
   type CreateTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: CreateTableOptions
   ) => QueryPlan<
     {},
@@ -6690,7 +6791,7 @@ type AsCurriedResult<
   >
 
   type DropTableApi = <Target extends SchemaTableLike>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     options?: DropTableOptions
   ) => QueryPlan<
     {},
@@ -6706,7 +6807,7 @@ type AsCurriedResult<
   >
 
   type CreateIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput, Name extends string = string>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: CreateIndexOptions<Name>
   ) => QueryPlan<
@@ -6723,7 +6824,7 @@ type AsCurriedResult<
   >
 
   type DropIndexApi = <Target extends SchemaTableLike, const Columns extends DdlColumnInput, Name extends string = string>(
-    target: Target,
+    target: Target & TableDialectConstraint<Target, Dialect>,
     columns: Columns & ValidateDdlColumnInput<Target, Columns>,
     options?: DropIndexOptions<Name>
   ) => QueryPlan<

package/src/postgres/json-extension.ts

@@ -0,0 +1,7 @@
+import { json } from "./json.js"
+
+/** Removes null object fields using Postgres json/jsonb strip-null functions. */
+export const stripNulls = json.stripNulls
+
+/** Evaluates a Postgres SQL/JSON path predicate with the @@ operator. */
+export const pathMatch = json.pathMatch