effect-app 4.0.0-beta.267 → 4.0.0-beta.269

package/dist/utils.js

@@ -106,9 +106,10 @@ resultSelector) {
     if (!descriptor) {
         descriptor = Object.getOwnPropertyDescriptor(target, key);
         if (!descriptor) {
-            const e = new Error("@LazyGetter is unable to determine the property descriptor");
-            e.$target = target;
-            e.$key = key;
+            const e = Object.assign(new Error("@LazyGetter is unable to determine the property descriptor"), {
+                $key: key,
+                $target: target
+            });
             throw e;
         }
     }
@@ -163,16 +164,16 @@ target, key, isStatic, enumerable, originalMethod, thisArg, args, setProto, make
 export function LazyGetter(setProto = false, makeNonConfigurable = false, resultSelector = defaultFilter) {
     let desc;
     let prop;
-    let args = null;
+    let args;
     let isLegacy;
     function decorator(targetOrDesc, key, descriptor) {
-        // eslint-disable-next-line prefer-rest-params
-        args = arguments;
+        args = [targetOrDesc, key, descriptor];
         if (key === undefined) {
             if (typeof desc === "undefined") {
+                const newDescriptor = targetOrDesc;
                 isLegacy = false;
-                prop = targetOrDesc.key;
-                desc = Object.assign({}, targetOrDesc.descriptor
+                prop = newDescriptor.key;
+                desc = Object.assign({}, newDescriptor.descriptor
                     /* istanbul ignore next */ || targetOrDesc);
             }
             return decorateNew(targetOrDesc, setProto, makeNonConfigurable, resultSelector);
@@ -196,11 +197,14 @@ export function LazyGetter(setProto = false, makeNonConfigurable = false, result
             if (!desc) {
                 throw new Error("Unable to restore descriptor. Did you remember to apply your decorator to a method?");
             }
+            if (!args) {
+                throw new Error("Unable to restore descriptor before applying the decorator.");
+            }
             // Restore descriptor to its original state
             Object.defineProperty(on, prop, desc);
-            // eslint-disable-next-line prefer-spread
             const ret = decorator.apply(null, args);
-            Object.defineProperty(on, prop, isLegacy ? ret : ret.descriptor || ret);
+            const restoredDescriptor = isLegacy ? ret : "descriptor" in ret && ret.descriptor ? ret.descriptor : ret;
+            Object.defineProperty(on, prop, restoredDescriptor);
         };
     return decorator;
 }
@@ -398,4 +402,4 @@ const genConstructor = (function* () { }).constructor;
  * @since 3.11.0
  */
 export const isGeneratorFunction = (u) => isFunction(u) && u.constructor === genConstructor;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "4.0.0-beta.267",
+  "version": "4.0.0-beta.269",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -55,9 +55,9 @@
   ],
   "scripts": {
     "watch": "pnpm build:tsc -w",
-    "build:tsc": "pnpm clean-dist && pnpm check",
+    "build:tsc": "pnpm clean-dist && pnpm check && node ../../scripts/rewrite-dist-declaration-imports.mjs dist",
     "check": "tsgo --build",
-    "build:tsc-src": "pnpm clean-dist && tsc --build ./tsconfig.src.json",
+    "build:tsc-src": "pnpm clean-dist && tsc --build ./tsconfig.src.json && node ../../scripts/rewrite-dist-declaration-imports.mjs dist",
     "build:src": "pnpm build:tsc-src",
     "build": "pnpm build:tsc",
     "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsgo -w",

package/src/Array.ts

@@ -2,8 +2,8 @@ import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect/Array"
 import * as Array from "effect/Array"
 import * as Chunk from "effect/Chunk"
 import * as Effect from "effect/Effect"
-import { dual, type Predicate } from "./Function.js"
-import * as Option from "./Option.js"
+import { dual, type Predicate } from "./Function.ts"
+import * as Option from "./Option.ts"
 
 export const toNonEmptyArray = Option.liftPredicate(Array.isReadonlyArrayNonEmpty)
 

package/src/Chunk.ts

@@ -1,9 +1,9 @@
-import { pipe, type Predicate, type Refinement } from "./Function.js"
-import * as Option from "./Option.js"
+import { pipe, type Predicate, type Refinement } from "./Function.ts"
+import * as Option from "./Option.ts"
 
 import * as Chunk from "effect/Chunk"
 import { type Equivalence } from "effect/Equivalence"
-import * as Array from "./Array.js"
+import * as Array from "./Array.ts"
 
 export * from "effect/Chunk"
 

package/src/Config/SecretURL.ts

@@ -5,7 +5,7 @@ import type * as Chunk from "effect/Chunk"
 import * as Config from "effect/Config"
 import type * as Equal from "effect/Equal"
 import type * as Redacted from "effect/Redacted"
-import * as internal from "./internal/configSecretURL.js"
+import * as internal from "./internal/configSecretURL.ts"
 
 // /**
 //  * @since 1.0.0

package/src/Config/internal/configSecretURL.ts

@@ -1,6 +1,6 @@
 import * as Chunk from "effect/Chunk"
 import * as Redacted from "effect/Redacted"
-import type * as SecretURL from "../SecretURL.js"
+import type * as SecretURL from "../SecretURL.ts"
 
 /** @internal */
 export const isSecretURL = (u: unknown): u is SecretURL.SecretURL => {

package/src/Config.ts

@@ -1,7 +1,7 @@
 import { type Config, make } from "effect/Config"
 import { dual } from "effect/Function"
 
-import * as ConfigProvider from "./ConfigProvider.js"
+import * as ConfigProvider from "./ConfigProvider.ts"
 
 export const nested: {
   (name: string): <A>(self: Config<A>) => Config<A>

package/src/Effect.ts

@@ -8,9 +8,9 @@ import * as Option from "effect/Option"
 import * as Ref from "effect/Ref"
 import type { Scope } from "effect/Scope"
 import type { Semaphore } from "effect/Semaphore"
-import type * as Context from "./Context.js"
-import { curry } from "./Function.js"
-import { typedKeysOf } from "./utils.js"
+import type * as Context from "./Context.ts"
+import { curry } from "./Function.ts"
+import { typedKeysOf } from "./utils.ts"
 
 export * from "effect/Effect"
 // v4: Effect interface not re-exported by `export *` due to local binding collision

package/src/Emailer.ts

@@ -1,8 +1,8 @@
 import * as Data from "effect/Data"
-import type { NonEmptyReadonlyArray } from "./Array.js"
-import * as Context from "./Context.js"
-import type * as Effect from "./Effect.js"
-import type { Email } from "./Schema.js"
+import type { NonEmptyReadonlyArray } from "./Array.ts"
+import * as Context from "./Context.ts"
+import type * as Effect from "./Effect.ts"
+import type { Email } from "./Schema.ts"
 
 export class SendMailError extends Data.TaggedError("SendMailError")<{
   readonly raw: Error

package/src/Inputify.type.ts

@@ -1,6 +1,6 @@
 import type { BuiltInObject } from "effect-app/utils"
 
-import type { Primitive } from "./Widen.type.js"
+import type { Primitive } from "./Widen.type.ts"
 
 // Get rid of Date | string, and replace with Date | null
 export type Inputify<T> = Date extends T ? string extends T ? Date | null

package/src/Layer.ts

@@ -4,8 +4,8 @@ import { dual } from "effect/Function"
 import * as Layer from "effect/Layer"
 import type * as Scope from "effect/Scope"
 import type * as Types from "effect/Types"
-import type * as Context from "./Context.js"
-import { type EffectGenUtils } from "./utils/gen.js"
+import type * as Context from "./Context.ts"
+import { type EffectGenUtils } from "./utils/gen.ts"
 
 export * from "effect/Layer"
 

package/src/Model/Repository/Registry.ts

@@ -1,6 +1,6 @@
-import type { DatabaseError } from "../../client/errors.js"
-import * as Context from "../../Context.js"
-import * as Effect from "../../Effect.js"
+import type { DatabaseError } from "../../client/errors.ts"
+import * as Context from "../../Context.ts"
+import * as Effect from "../../Effect.ts"
 
 export interface RegisteredRepository {
   readonly seedNamespace: (namespace: string) => Effect.Effect<void, DatabaseError>

package/src/Model/Repository/ext.ts

@@ -3,17 +3,17 @@
 import * as Exit from "effect/Exit"
 import * as Request from "effect/Request"
 import * as RequestResolver from "effect/RequestResolver"
-import * as Array from "../../Array.js"
-import type { NonEmptyArray } from "../../Array.js"
-import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "../../client/errors.js"
-import * as Effect from "../../Effect.js"
-import * as Option from "../../Option.js"
-import { type FixEnv, type PureEnv, runTerm } from "../../Pure.js"
-import { AnyPureDSL } from "../dsl.js"
-import type { FieldValues } from "../filter/types.js"
-import type { Query, QueryEnd, QueryWhere } from "../query.js"
-import * as Q from "../query.js"
-import type { Repository } from "./service.js"
+import * as Array from "../../Array.ts"
+import type { NonEmptyArray } from "../../Array.ts"
+import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "../../client/errors.ts"
+import * as Effect from "../../Effect.ts"
+import * as Option from "../../Option.ts"
+import { type FixEnv, type PureEnv, runTerm } from "../../Pure.ts"
+import { AnyPureDSL } from "../dsl.ts"
+import type { FieldValues } from "../filter/types.ts"
+import type { Query, QueryEnd, QueryWhere } from "../query.ts"
+import * as Q from "../query.ts"
+import type { Repository } from "./service.ts"
 
 interface BatchOptions {
   readonly batch?: true | number

package/src/Model/Repository/internal/internal.ts

@@ -10,23 +10,23 @@ import * as Result from "effect/Result"
 import * as SchemaAST from "effect/SchemaAST"
 import type * as Scope from "effect/Scope"
 import * as Unify from "effect/Unify"
-import * as Array from "../../../Array.js"
-import type { NonEmptyReadonlyArray } from "../../../Array.js"
-import { toNonEmptyArray } from "../../../Array.js"
-import * as Chunk from "../../../Chunk.js"
-import { NotFoundError } from "../../../client/errors.js"
-import * as Context from "../../../Context.js"
-import * as Effect from "../../../Effect.js"
-import { flatMapOption } from "../../../Effect.js"
-import * as Option from "../../../Option.js"
-import * as S from "../../../Schema.js"
-import { type Codec, NonNegativeInt } from "../../../Schema.js"
+import * as Array from "../../../Array.ts"
+import type { NonEmptyReadonlyArray } from "../../../Array.ts"
+import { toNonEmptyArray } from "../../../Array.ts"
+import * as Chunk from "../../../Chunk.ts"
+import { NotFoundError } from "../../../client/errors.ts"
+import * as Context from "../../../Context.ts"
+import * as Effect from "../../../Effect.ts"
+import { flatMapOption } from "../../../Effect.ts"
+import * as Option from "../../../Option.ts"
+import * as S from "../../../Schema.ts"
+import { type Codec, NonNegativeInt } from "../../../Schema.ts"
 import { setupRequestContextFromCurrent } from "../../../setupRequest.ts"
-import { type FilterArgs, getContextMap, type PersistenceModelType, type StoreConfig, storeId, StoreMaker } from "../../../Store.js"
-import type { FieldValues } from "../../filter/types.js"
-import * as Q from "../../query.js"
-import type { ChangeFeed, ChangeFeedEvent, Repository } from "../service.js"
-import { ValidationError, ValidationResult } from "../validation.js"
+import { type FilterArgs, getContextMap, type PersistenceModelType, type StoreConfig, storeId, StoreMaker } from "../../../Store.ts"
+import type { FieldValues } from "../../filter/types.ts"
+import * as Q from "../../query.ts"
+import type { ChangeFeed, ChangeFeedEvent, Repository } from "../service.ts"
+import { ValidationError, ValidationResult } from "../validation.ts"
 
 const dedupe = Array.dedupeWith(Equivalence.String)
 

package/src/Model/Repository/legacy.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import type { DatabaseError, OptimisticConcurrencyException } from "../../client/errors.js"
-import type * as Effect from "../../Effect.js"
-import type * as Option from "../../Option.js"
-import type * as S from "../../Schema.js"
+import type { DatabaseError, OptimisticConcurrencyException } from "../../client/errors.ts"
+import type * as Effect from "../../Effect.ts"
+import type * as Option from "../../Option.ts"
+import type * as S from "../../Schema.ts"
 
 export interface Mapped1<A, IdKey extends keyof A, R> {
   all: Effect.Effect<A[], S.SchemaError | DatabaseError, R>

package/src/Model/Repository/makeRepo.ts

@@ -4,19 +4,19 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-// import type { ParserEnv } from "../../Schema/custom/Parser.js"
+// import type { ParserEnv } from "../../Schema/custom/Parser.ts"
 
 import type * as Scope from "effect/Scope"
-import type { NonEmptyReadonlyArray } from "../../Array.js"
-import type * as Context from "../../Context.js"
-import * as Effect from "../../Effect.js"
-import type * as S from "../../Schema.js"
-import type { StoreConfig, StoreMaker } from "../../Store.js"
-import type { FieldValues } from "../filter/types.js"
-import { type ExtendedRepository, extendRepo } from "./ext.js"
-import { makeRepoInternal } from "./internal/internal.js"
-import { RepositoryRegistry } from "./Registry.js"
-import type { Repository } from "./service.js"
+import type { NonEmptyReadonlyArray } from "../../Array.ts"
+import type * as Context from "../../Context.ts"
+import * as Effect from "../../Effect.ts"
+import type * as S from "../../Schema.ts"
+import type { StoreConfig, StoreMaker } from "../../Store.ts"
+import type { FieldValues } from "../filter/types.ts"
+import { type ExtendedRepository, extendRepo } from "./ext.ts"
+import { makeRepoInternal } from "./internal/internal.ts"
+import { RepositoryRegistry } from "./Registry.ts"
+import type { Repository } from "./service.ts"
 
 export interface RepositoryOptions<
   IdKey extends keyof T & keyof Encoded,

package/src/Model/Repository/service.ts

@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type * as Scope from "effect/Scope"
-import type { DatabaseError, InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "../../client/errors.js"
-import type * as Effect from "../../Effect.js"
-import type * as Option from "../../Option.js"
-import type * as S from "../../Schema.js"
-import type { NonNegativeInt } from "../../Schema/numbers.js"
-import type { FieldValues, IsNever, ResolveFirstLevel } from "../filter/types.js"
-import type { QAll, Query, QueryProjection, RawQuery } from "../query.js"
-import type { Mapped } from "./legacy.js"
-import type { ValidationResult } from "./validation.js"
+import type { DatabaseError, InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "../../client/errors.ts"
+import type * as Effect from "../../Effect.ts"
+import type * as Option from "../../Option.ts"
+import type * as S from "../../Schema.ts"
+import type { NonNegativeInt } from "../../Schema/numbers.ts"
+import type { FieldValues, IsNever, ResolveFirstLevel } from "../filter/types.ts"
+import type { QAll, Query, QueryProjection, RawQuery } from "../query.ts"
+import type { Mapped } from "./legacy.ts"
+import type { ValidationResult } from "./validation.ts"
 
 /**
  * Event emitted by a repository's ChangeFeed.

package/src/Model/Repository/validation.ts

@@ -1,5 +1,5 @@
-import * as S from "../../Schema.js"
-import { NonNegativeInt } from "../../Schema.js"
+import * as S from "../../Schema.ts"
+import { NonNegativeInt } from "../../Schema.ts"
 
 /**
  * Represents a single validation error when decoding a repository item.

package/src/Model/Repository.ts

@@ -1,6 +1,6 @@
-export * from "./Repository/ext.js"
-export * from "./Repository/legacy.js"
-export { makeRepo } from "./Repository/makeRepo.js"
-export * from "./Repository/Registry.js"
-export * from "./Repository/service.js"
-export * from "./Repository/validation.js"
+export * from "./Repository/ext.ts"
+export * from "./Repository/legacy.ts"
+export { makeRepo } from "./Repository/makeRepo.ts"
+export * from "./Repository/Registry.ts"
+export * from "./Repository/service.ts"
+export * from "./Repository/validation.ts"

package/src/Model/dsl.ts

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { NonEmptyReadonlyArray } from "../Array.js"
-import { toNonEmptyArray } from "../Array.js"
-import * as Effect from "../Effect.js"
-import { type FixEnv, get, logMany, type Pure, type PureEnvEnv, type PureLogT, set } from "../Pure.js"
+import type { NonEmptyReadonlyArray } from "../Array.ts"
+import { toNonEmptyArray } from "../Array.ts"
+import * as Effect from "../Effect.ts"
+import { type FixEnv, get, logMany, type Pure, type PureEnvEnv, type PureLogT, set } from "../Pure.ts"
 
 export interface PureDSL<S, S2, W> {
   get: Pure<never, S, S, never, never, S>

package/src/Model/filter/filterApi.ts

@@ -1,4 +1,4 @@
-import { type RelationDirection } from "../query.js"
+import { type RelationDirection } from "../query.ts"
 
 export type InOps =
   | "in"

package/src/Model/filter/types/errors.ts

@@ -1,6 +1,6 @@
-import type { FieldValues, InternalFieldName } from "./fields.js"
-import type { BrowserNativeObject, IsAny, LiteralUnion, Merge } from "./utils.js"
-import type { RegisterOptions, ValidateResult } from "./validator.js"
+import type { FieldValues, InternalFieldName } from "./fields.ts"
+import type { BrowserNativeObject, IsAny, LiteralUnion, Merge } from "./utils.ts"
+import type { RegisterOptions, ValidateResult } from "./validator.ts"
 
 export type Message = string
 

package/src/Model/filter/types/fields.ts

@@ -1,5 +1,5 @@
-import type { IsFlatObject } from "./utils.js"
-import type { RegisterOptions } from "./validator.js"
+import type { IsFlatObject } from "./utils.ts"
+import type { RegisterOptions } from "./validator.ts"
 
 export type InternalFieldName = string
 

package/src/Model/filter/types/path/common.ts

@@ -1,4 +1,4 @@
-import type { IsAny, IsNever } from "../utils.js"
+import type { IsAny, IsNever } from "../utils.ts"
 
 /**
  * Type alias to `string` which describes a lodash-like path through an object.

package/src/Model/filter/types/path/eager.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { expectTypeOf } from "@effect/vitest"
-import type { FieldValues } from "../fields.js"
-import type { BrowserNativeObject, Equals, IsLiteral, IsNever, Primitive } from "../utils.js"
+import type { FieldValues } from "../fields.ts"
+import type { BrowserNativeObject, Equals, IsLiteral, IsNever, Primitive } from "../utils.ts"
 
-import type { ArrayKey, IsTuple, TupleKeys } from "./common.js"
+import type { ArrayKey, IsTuple, TupleKeys } from "./common.ts"
 
 /**
  * Helper type for recursively constructing paths through a type.
@@ -44,7 +44,7 @@ export type Path<T, Seen = never> = T extends ReadonlyArray<infer V> ? IsTuple<T
  */
 export type FieldPath<TFieldValues extends FieldValues> = Path<TFieldValues>
 
-export namespace PathRecursionTests {
+{
   // Regression: self-referential types must terminate instead of blowing past
   // TS's instantiation limit (TS2589). `JsonLike` mirrors effect's `Json` — the
   // encoded form of `Schema.Defect()` — whose `{ [x: string]: Json }` index
@@ -57,12 +57,14 @@ export namespace PathRecursionTests {
     | null
     | ReadonlyArray<JsonLike>
     | { readonly [x: string]: JsonLike }
-  export type _RawDefect = Path<{ id: string; raw: JsonLike }>
-  export type _NestedDefect = Path<{ a: { b: { error: { raw: JsonLike } } } }>
-  export type _ArrayOfDefect = Path<{ items: ReadonlyArray<{ raw: JsonLike }> }>
+  type _RawDefect = Path<{ id: string; raw: JsonLike }>
+  type _NestedDefect = Path<{ a: { b: { error: { raw: JsonLike } } } }>
+  type _ArrayOfDefect = Path<{ items: ReadonlyArray<{ raw: JsonLike }> }>
   // finite paths are still produced
   expectTypeOf<"id">().toExtend<_RawDefect>()
   expectTypeOf<"raw">().toExtend<_RawDefect>()
+  expectTypeOf<"a.b.error.raw">().toExtend<_NestedDefect>()
+  expectTypeOf<`items.${number}.raw`>().toExtend<_ArrayOfDefect>()
 }
 
 /**
@@ -191,7 +193,7 @@ export type RefineFieldPathValue<
   Exclde extends boolean = false
 > = EraseNeverContainingUnionElements<RefinePathValue<TFieldValues, TFieldPath, X, Exclde>>
 
-export namespace RefinePathValueTests {
+{
   type test1 = RefineFieldPathValue<{ a: { b: "tag1"; v1: string } | { b: "tag2"; v2: number } }, "a.b", "tag1">
   expectTypeOf<test1>().toEqualTypeOf<{ a: { b: "tag1"; v1: string } }>()
 
@@ -259,7 +261,7 @@ export namespace RefinePathValueTests {
   }>()
 }
 
-export namespace SetFieldPathValueTests {
+{
   type test1 = SetFieldPathValue<{ foo: { bar: string[] } }, `foo.bar`, boolean>
   expectTypeOf<test1>().toEqualTypeOf<{ foo: { bar: boolean } }>()
 

package/src/Model/filter/types/path/index.ts

@@ -1,4 +1,4 @@
 /** Re-export public API */
 
-export type { PathString } from "./common.js"
-export type { FieldPath, FieldPathByValue, FieldPathValue, FieldPathValues, Path, PathValue } from "./eager.js"
+export type { PathString } from "./common.ts"
+export type { FieldPath, FieldPathByValue, FieldPathValue, FieldPathValues, Path, PathValue } from "./eager.ts"

package/src/Model/filter/types/validator.ts

@@ -1,6 +1,6 @@
-import type { Message } from "./errors.js"
-import type { FieldValues, InternalFieldName } from "./fields.js"
-import type { FieldPath, FieldPathValue } from "./path/index.js"
+import type { Message } from "./errors.ts"
+import type { FieldValues, InternalFieldName } from "./fields.ts"
+import type { FieldPath, FieldPathValue } from "./path/index.ts"
 
 export type ValidationValue = boolean | number | string | RegExp
 

package/src/Model/query/dsl.ts

@@ -5,12 +5,12 @@ import * as Data from "effect/Data"
 import { flow } from "effect/Function"
 import * as Pipeable from "effect/Pipeable"
 import type { Covariant } from "effect/Types"
-import type * as Option from "../../Option.js"
-import type * as S from "../../Schema.js"
-import type { NonNegativeInt } from "../../Schema.js"
-import type { Ops } from "../filter/filterApi.js"
-import type { FieldValues } from "../filter/types.js"
-import type { FieldPath, FieldPathValue, RefineFieldPathValue } from "../filter/types/path/eager.js"
+import type * as Option from "../../Option.ts"
+import type * as S from "../../Schema.ts"
+import type { NonNegativeInt } from "../../Schema.ts"
+import type { Ops } from "../filter/filterApi.ts"
+import type { FieldValues } from "../filter/types.ts"
+import type { FieldPath, FieldPathValue, RefineFieldPathValue } from "../filter/types/path/eager.ts"
 
 export type QAll<
   TFieldValues extends FieldValues,