@effect-app/infra 2.16.6 → 2.16.8

package/src/Model/query/dsl.ts

@@ -4,11 +4,10 @@
 import type { Option, S } from "effect-app"
 import { Data, flow, Pipeable } from "effect-app"
 import type { NonNegativeInt } from "effect-app/Schema"
-import type { IsUnion } from "effect-app/utils"
 import type { Covariant } from "effect/Types"
 import type { Ops } from "../filter/filterApi.js"
 import type { FieldValues } from "../filter/types.js"
-import type { FieldPath, FieldPathValue } from "../filter/types/path/eager.js"
+import type { FieldPath, FieldPathValue, RefineFieldPathValue } from "../filter/types/path/eager.js"
 
 export type QAll<
   TFieldValues extends FieldValues,
@@ -255,7 +254,7 @@ export const count: {
 export const project: {
   <
     Q extends Query<any> | QueryWhere<any, any> | QueryEnd<any, "one" | "many">,
-    I extends Partial<ExtractFieldValuesRefined<Q>> = ExtractFieldValuesRefined<Q>,
+    I,
     A = ExtractFieldValuesRefined<Q>,
     R = never
   >(
@@ -273,7 +272,7 @@ export const project: {
 
   <
     Q extends Query<any> | QueryWhere<any, any> | QueryEnd<any, "one" | "many">,
-    I extends Partial<ExtractFieldValuesRefined<Q>> = ExtractFieldValuesRefined<Q>,
+    I,
     A = ExtractFieldValuesRefined<Q>,
     R = never
   >(
@@ -290,7 +289,7 @@ export const project: {
   ) => QueryProjection<ExtractFieldValuesRefined<Q>, A, R, ExtractTType<Q>>
   <
     Q extends Query<any> | QueryWhere<any, any> | QueryEnd<any, "one" | "many">,
-    I extends Partial<ExtractFieldValuesRefined<Q>> = ExtractFieldValuesRefined<Q>,
+    I,
     A = ExtractFieldValuesRefined<Q>,
     R = never
   >(
@@ -417,6 +416,19 @@ export type FilterContinuations<IsCurrentInitial extends boolean = false> = {
     : QueryWhere<TFieldValues, TFieldValuesRefined>
 }
 
+/* dprint-ignore-start */
+export type RefineWithLiteral<
+  TFieldValues extends FieldValues,
+  TFieldName extends FieldPath<TFieldValues>,
+  V,
+  Exclde extends boolean = false
+> =
+  // refine only if the value is a primitive
+  V extends string | number | boolean | null | bigint
+    ? RefineFieldPathValue<TFieldValues, TFieldName, V, Exclde>
+    : TFieldValues
+/* dprint-ignore-end */
+
 export type FilteringRefinements<IsCurrentInitial extends boolean = false> = {
   <
     TFieldValues extends FieldValues,
@@ -431,21 +443,13 @@ export type FilteringRefinements<IsCurrentInitial extends boolean = false> = {
       : QueryWhere<TFieldValues, TFieldValuesRefined>
   ) => IsCurrentInitial extends true ? QueryWhere<
       TFieldValues,
-      // TFieldValues[TFieldName] must be a union of string literals to let the refinement work
-      // and TFieldValues must not be a union
-      IsUnion<TFieldValues> extends false ? TFieldValues
-        : string extends TFieldValues[TFieldName] ? TFieldValues
-        : TFieldValues[TFieldName] extends string ? Extract<TFieldValues, { [K in TFieldName]: V }>
-        : TFieldValues
+      // @ts-expect-error it's TS
+      RefineWithLiteral<TFieldValues, TFieldName, V>
     >
     : QueryWhere<
       TFieldValues,
-      // TFieldValues[TFieldName] must be a union of string literals to let the refinement work
-      // and TFieldValuesRefined must not be a union
-      IsUnion<TFieldValuesRefined> extends false ? TFieldValues
-        : string extends TFieldValuesRefined[TFieldName] ? TFieldValuesRefined
-        : TFieldValuesRefined[TFieldName] extends string ? Extract<TFieldValuesRefined, { [K in TFieldName]: V }>
-        : TFieldValuesRefined
+      // @ts-expect-error it's TS
+      RefineWithLiteral<TFieldValuesRefined, TFieldName, V>
     >
   <
     TFieldValues extends FieldValues,
@@ -461,21 +465,13 @@ export type FilteringRefinements<IsCurrentInitial extends boolean = false> = {
       : QueryWhere<TFieldValues, TFieldValuesRefined>
   ) => IsCurrentInitial extends true ? QueryWhere<
       TFieldValues,
-      // TFieldValues[TFieldName] must be a union of string literals to let the refinement work
-      // and TFieldValues must not be a union
-      IsUnion<TFieldValues> extends false ? TFieldValues
-        : string extends TFieldValues[TFieldName] ? TFieldValues
-        : TFieldValues[TFieldName] extends string ? Exclude<TFieldValues, { [K in TFieldName]: V }>
-        : TFieldValues
+      // @ts-expect-error it's TS
+      RefineWithLiteral<TFieldValues, TFieldName, V, true>
     >
     : QueryWhere<
       TFieldValues,
-      // TFieldValues[TFieldName] must be a union of string literals to let the refinement work
-      // and TFieldValuesRefined must not be a union
-      IsUnion<TFieldValuesRefined> extends false ? TFieldValuesRefined
-        : string extends TFieldValuesRefined[TFieldName] ? TFieldValuesRefined
-        : TFieldValuesRefined[TFieldName] extends string ? Exclude<TFieldValuesRefined, { [K in TFieldName]: V }>
-        : TFieldValuesRefined
+      // @ts-expect-error it's TS
+      RefineWithLiteral<TFieldValuesRefined, TFieldName, V, true>
     >
 }
 
@@ -621,6 +617,294 @@ export type NestedQueriesFixedRefinement<IsCurrentInitial extends boolean = fals
   ) => QueryWhere<TFieldValues, TFieldValuesRefined>
 }
 
+export type NestedQueriesFreeIntersectionRefinement = {
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined2>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined3>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined4>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined5>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined6>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined7>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined2>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined9>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined10 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>,
+    fj: (query: QueryWhere<TFieldValues, TFieldValuesRefined9>) => QueryWhere<TFieldValues, TFieldValuesRefined10>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined10>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined10 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined11 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>,
+    fj: (query: QueryWhere<TFieldValues, TFieldValuesRefined9>) => QueryWhere<TFieldValues, TFieldValuesRefined10>,
+    fk: (query: QueryWhere<TFieldValues, TFieldValuesRefined10>) => QueryWhere<TFieldValues, TFieldValuesRefined11>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined11>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined10 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined11 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined12 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>,
+    fj: (query: QueryWhere<TFieldValues, TFieldValuesRefined9>) => QueryWhere<TFieldValues, TFieldValuesRefined10>,
+    fk: (query: QueryWhere<TFieldValues, TFieldValuesRefined10>) => QueryWhere<TFieldValues, TFieldValuesRefined11>,
+    fl: (query: QueryWhere<TFieldValues, TFieldValuesRefined11>) => QueryWhere<TFieldValues, TFieldValuesRefined12>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined12>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined10 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined11 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined12 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined13 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>,
+    fj: (query: QueryWhere<TFieldValues, TFieldValuesRefined9>) => QueryWhere<TFieldValues, TFieldValuesRefined10>,
+    fk: (query: QueryWhere<TFieldValues, TFieldValuesRefined10>) => QueryWhere<TFieldValues, TFieldValuesRefined11>,
+    fl: (query: QueryWhere<TFieldValues, TFieldValuesRefined11>) => QueryWhere<TFieldValues, TFieldValuesRefined12>,
+    fm: (query: QueryWhere<TFieldValues, TFieldValuesRefined12>) => QueryWhere<TFieldValues, TFieldValuesRefined13>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined13>
+
+  <
+    TFieldValues extends FieldValues,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    TFieldValuesRefined2 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined3 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined4 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined5 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined6 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined7 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined8 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined9 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined10 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined11 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined12 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined13 extends TFieldValues = TFieldValues,
+    TFieldValuesRefined14 extends TFieldValues = TFieldValues
+  >(
+    fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2>,
+    fc: (query: QueryWhere<TFieldValues, TFieldValuesRefined2>) => QueryWhere<TFieldValues, TFieldValuesRefined3>,
+    fd: (query: QueryWhere<TFieldValues, TFieldValuesRefined3>) => QueryWhere<TFieldValues, TFieldValuesRefined4>,
+    fe: (query: QueryWhere<TFieldValues, TFieldValuesRefined4>) => QueryWhere<TFieldValues, TFieldValuesRefined5>,
+    ff: (query: QueryWhere<TFieldValues, TFieldValuesRefined5>) => QueryWhere<TFieldValues, TFieldValuesRefined6>,
+    fg: (query: QueryWhere<TFieldValues, TFieldValuesRefined6>) => QueryWhere<TFieldValues, TFieldValuesRefined7>,
+    fh: (query: QueryWhere<TFieldValues, TFieldValuesRefined7>) => QueryWhere<TFieldValues, TFieldValuesRefined8>,
+    fi: (query: QueryWhere<TFieldValues, TFieldValuesRefined8>) => QueryWhere<TFieldValues, TFieldValuesRefined9>,
+    fj: (query: QueryWhere<TFieldValues, TFieldValuesRefined9>) => QueryWhere<TFieldValues, TFieldValuesRefined10>,
+    fk: (query: QueryWhere<TFieldValues, TFieldValuesRefined10>) => QueryWhere<TFieldValues, TFieldValuesRefined11>,
+    fl: (query: QueryWhere<TFieldValues, TFieldValuesRefined11>) => QueryWhere<TFieldValues, TFieldValuesRefined12>,
+    fm: (query: QueryWhere<TFieldValues, TFieldValuesRefined12>) => QueryWhere<TFieldValues, TFieldValuesRefined13>,
+    fn: (query: QueryWhere<TFieldValues, TFieldValuesRefined13>) => QueryWhere<TFieldValues, TFieldValuesRefined14>
+  ): (
+    current: QueryWhere<TFieldValues, TFieldValuesRefined>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined & TFieldValuesRefined14>
+}
+
 export type NestedQueriesFreeDisjointRefinement = {
   <
     TFieldValues extends FieldValues,
@@ -915,7 +1199,7 @@ export type FilterWhere =
   & FilterContinuations<true>
 
 export type FilterContinuationAnd =
-  & NestedQueriesFixedRefinement
+  & NestedQueriesFreeIntersectionRefinement
   & FilteringRefinements
   & FilterContinuations
 

package/src/api/routing.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-empty-object-type */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -303,82 +304,7 @@ export const makeRouter = <
       ? { [k in keyof Layers]: Layer.Layer.Error<Layers[k]> }[number]
       : never
 
-    const effect: {
-      <
-        E,
-        R,
-        Make extends (
-          requests: RouteMatcher<CTXMap, Rsc, Context>
-        ) => Effect<
-          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-          any,
-          Strict extends true ? GetSuccess<TLayers> : any
-        >,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
-      >(
-        layers: TLayers,
-        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
-        strict?: Strict
-      ): {
-        moduleName: ModuleName
-        Router: HttpRouter.HttpRouter.TagClass<
-          RouterShape<Rsc>,
-          `${ModuleName}Router`,
-          never,
-          | Exclude<Context, HttpRouter.HttpRouter.Provided>
-          | Exclude<
-            RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
-            >,
-            HttpRouter.HttpRouter.Provided
-          >
-        >
-        routes: Layer.Layer<
-          RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          | GetContext<TLayers>
-          // | GetContext<Layers> // elsewhere provided
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
-        >
-      }
-      <
-        E,
-        R,
-        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
-        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
-        Strict extends boolean = true
-      >(
-        layers: [
-          ...TLayers,
-          Layer.Layer<Exclude<R, GetSuccess<TLayers>>, never, never>
-        ],
-        make: (requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>,
-        strict?: Strict
-      ): {
-        moduleName: ModuleName
-        Router: HttpRouter.HttpRouter.TagClass<
-          RouterShape<Rsc>,
-          `${ModuleName}Router`,
-          never,
-          | Exclude<Context, HttpRouter.HttpRouter.Provided>
-          | Exclude<
-            RPCRouteR<
-              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
-            >,
-            HttpRouter.HttpRouter.Provided
-          >
-        >
-        routes: Layer.Layer<
-          RouterShape<Rsc>,
-          E | GetError<TLayers>,
-          // | GetContext<Layers> // elsewhere provided
-          | GetContext<TLayers>
-          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
-        >
-      }
-    } = (<
+    const f = <
       E,
       R,
       THandlers extends {
@@ -540,7 +466,163 @@ export const makeRouter = <
         Router: r,
         routes
       }
-    }) as any
+    }
+
+    const effect: {
+      // Multiple times duplicated the "good" overload, so that errors will only mention the last overload when failing
+      <
+        E,
+        R,
+        Make extends (
+          requests: RouteMatcher<CTXMap, Rsc, Context>
+        ) => Effect<
+          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+          any,
+          Strict extends true ? GetSuccess<TLayers> : any
+        >,
+        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
+        Strict extends boolean = true
+      >(
+        layers: TLayers,
+        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
+        strict?: Strict
+      ): {
+        moduleName: ModuleName
+        Router: HttpRouter.HttpRouter.TagClass<
+          RouterShape<Rsc>,
+          `${ModuleName}Router`,
+          never,
+          | Exclude<Context, HttpRouter.HttpRouter.Provided>
+          | Exclude<
+            RPCRouteR<
+              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+            >,
+            HttpRouter.HttpRouter.Provided
+          >
+        >
+        routes: Layer.Layer<
+          RouterShape<Rsc>,
+          E | GetError<TLayers>,
+          | GetContext<TLayers>
+          // | GetContext<Layers> // elsewhere provided
+          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+        >
+      }
+      <
+        E,
+        R,
+        Make extends (
+          requests: RouteMatcher<CTXMap, Rsc, Context>
+        ) => Effect<
+          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+          any,
+          Strict extends true ? GetSuccess<TLayers> : any
+        >,
+        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
+        Strict extends boolean = true
+      >(
+        layers: TLayers,
+        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
+        strict?: Strict
+      ): {
+        moduleName: ModuleName
+        Router: HttpRouter.HttpRouter.TagClass<
+          RouterShape<Rsc>,
+          `${ModuleName}Router`,
+          never,
+          | Exclude<Context, HttpRouter.HttpRouter.Provided>
+          | Exclude<
+            RPCRouteR<
+              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+            >,
+            HttpRouter.HttpRouter.Provided
+          >
+        >
+        routes: Layer.Layer<
+          RouterShape<Rsc>,
+          E | GetError<TLayers>,
+          | GetContext<TLayers>
+          // | GetContext<Layers> // elsewhere provided
+          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+        >
+      }
+      <
+        E,
+        R,
+        Make extends (
+          requests: RouteMatcher<CTXMap, Rsc, Context>
+        ) => Effect<
+          { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+          any,
+          Strict extends true ? GetSuccess<TLayers> : any
+        >,
+        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
+        Strict extends boolean = true
+      >(
+        layers: TLayers,
+        make: Make & ((requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>),
+        strict?: Strict
+      ): {
+        moduleName: ModuleName
+        Router: HttpRouter.HttpRouter.TagClass<
+          RouterShape<Rsc>,
+          `${ModuleName}Router`,
+          never,
+          | Exclude<Context, HttpRouter.HttpRouter.Provided>
+          | Exclude<
+            RPCRouteR<
+              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+            >,
+            HttpRouter.HttpRouter.Provided
+          >
+        >
+        routes: Layer.Layer<
+          RouterShape<Rsc>,
+          E | GetError<TLayers>,
+          | GetContext<TLayers>
+          // | GetContext<Layers> // elsewhere provided
+          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+        >
+      }
+      <
+        E,
+        R,
+        THandlers extends { [K in keyof Filter<Rsc>]: AHandler<Rsc[K]> },
+        TLayers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[],
+        Strict extends boolean = true
+      >(
+        layers: [
+          ...TLayers,
+          Layer.Layer<Exclude<R, GetSuccess<TLayers>>, never, never>
+        ],
+        make: (requests: RouteMatcher<CTXMap, Rsc, Context>) => Effect<THandlers, E, R>,
+        strict?: Strict
+      ): {
+        moduleName: ModuleName
+        Router: HttpRouter.HttpRouter.TagClass<
+          RouterShape<Rsc>,
+          `${ModuleName}Router`,
+          never,
+          | Exclude<Context, HttpRouter.HttpRouter.Provided>
+          | Exclude<
+            RPCRouteR<
+              { [K in keyof Filter<Rsc>]: Rpc.Rpc<Rsc[K], _R<ReturnType<THandlers[K]["handler"]>>> }[keyof Filter<Rsc>]
+            >,
+            HttpRouter.HttpRouter.Provided
+          >
+        >
+        routes: Layer.Layer<
+          RouterShape<Rsc>,
+          E | GetError<TLayers>,
+          // | GetContext<Layers> // elsewhere provided
+          | GetContext<TLayers>
+          | Exclude<R | RMW, GetSuccess<TLayers> | GetSuccess<Layers>>
+        >
+      }
+    } = f as any
 
     return effect
   }