remove /batching

Author: mikearnaldi

packages/effect/package.json

@@ -29,7 +29,6 @@
   "exports": {
     "./package.json": "./package.json",
     ".": "./src/index.ts",
-    "./batching": "./src/batching/index.ts",
     "./caching": "./src/caching/index.ts",
     "./collections": "./src/collections/index.ts",
     "./concurrency": "./src/concurrency/index.ts",

packages/effect/src/Effect.ts

@@ -67,8 +67,6 @@
  *
  * @since 2.0.0
  */
-import type * as Request from "./batching/Request.ts"
-import type { RequestResolver } from "./batching/RequestResolver.ts"
 import type * as Cause from "./Cause.ts"
 import type { Clock } from "./Clock.ts"
 import type * as Arr from "./collections/Array.ts"
@@ -91,6 +89,8 @@ import type { Logger } from "./logging/Logger.ts"
 import type { LogLevel } from "./logging/LogLevel.ts"
 import * as Metric from "./Metric.ts"
 import { CurrentLogAnnotations, CurrentLogSpans } from "./References.ts"
+import type * as Request from "./Request.ts"
+import type { RequestResolver } from "./RequestResolver.ts"
 import type { Schedule } from "./Schedule.ts"
 import type { Scheduler } from "./Scheduler.ts"
 import type { Scope } from "./Scope.ts"

packages/effect/src/batching/Request.ts renamed to packages/effect/src/Request.ts

@@ -13,26 +13,26 @@
  *
  * @since 2.0.0
  */
-import type * as Cause from "../Cause.ts"
-import { hasProperty } from "../data/Predicate.ts"
-import type * as Effect from "../Effect.ts"
-import type * as Exit from "../Exit.ts"
-import { dual } from "../Function.ts"
-import * as core from "../internal/core.ts"
-import { StructuralPrototype } from "../internal/core.ts"
-import * as internalEffect from "../internal/effect.ts"
-import type * as ServiceMap from "../ServiceMap.ts"
-import type * as Types from "../types/Types.ts"
+import type * as Cause from "./Cause.ts"
+import { hasProperty } from "./data/Predicate.ts"
+import type * as Effect from "./Effect.ts"
+import type * as Exit from "./Exit.ts"
+import { dual } from "./Function.ts"
+import * as core from "./internal/core.ts"
+import { StructuralPrototype } from "./internal/core.ts"
+import * as internalEffect from "./internal/effect.ts"
+import type * as ServiceMap from "./ServiceMap.ts"
+import type * as Types from "./types/Types.ts"
 
-const TypeId = "~effect/batching/Request"
+const TypeId = "~effect/Request"
 
 /**
  * A `Request<A, E, R>` is a request from a data source for a value of type `A`
  * that may fail with an `E` and have requirements of type `R`.
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * // Define a request that fetches a user by ID
  * interface GetUser extends Request.Request<string, Error> {
@@ -72,7 +72,7 @@ export interface Variance<out A, out E, out R> {
 /**
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * interface GetUser extends Request.Request<string, Error> {
  *   readonly _tag: "GetUser"
@@ -96,7 +96,7 @@ export interface Constructor<R extends Request<any, any, any>, T extends keyof R
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * interface GetUser extends Request.Request<string, Error> {
  *   readonly id: number
@@ -116,7 +116,7 @@ export type Error<T extends Request<any, any, any>> = [T] extends [Request<infer
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * interface GetUser extends Request.Request<string, Error> {
  *   readonly _tag: "GetUser"
@@ -147,8 +147,7 @@ export type Services<T extends Request<any, any, any>> = [T] extends [Request<in
  *
  * @example
  * ```ts
- * import { Exit } from "effect"
- * import { Request } from "effect/batching"
+ * import { Exit, Request } from "effect"
  *
  * interface GetUser extends Request.Request<string, Error> {
  *   readonly _tag: "GetUser"
@@ -187,7 +186,7 @@ export const RequestPrototype: Request<any, any, any> = {
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * declare const User: unique symbol
  * declare const UserNotFound: unique symbol
@@ -215,7 +214,7 @@ export const isRequest = (u: unknown): u is Request<unknown, unknown, unknown> =
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * declare const UserProfile: unique symbol
  * declare const ProfileError: unique symbol
@@ -247,7 +246,7 @@ export const of = <R extends Request<any, any, any>>(): Constructor<R> => (args)
  *
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * declare const User: unique symbol
  * declare const UserNotFound: unique symbol
@@ -294,7 +293,7 @@ export const tagged = <R extends Request<any, any, any> & { _tag: string }>(
 /**
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * class GetUser extends Request.Class<{ id: number }, string, Error> {
  *   constructor(readonly id: number) {
@@ -325,7 +324,7 @@ export const Class: new<A extends Record<string, any>, Success, Error = never, S
 /**
  * @example
  * ```ts
- * import { Request } from "effect/batching"
+ * import { Request } from "effect"
  *
  * class GetUserById extends Request.TaggedClass("GetUserById")<{ id: number }, string, Error> {}
  *

packages/effect/src/batching/RequestResolver.ts renamed to packages/effect/src/RequestResolver.ts

@@ -1,30 +1,30 @@
 /**
  * @since 2.0.0
  */
-import * as Cache from "../Cache.ts"
-import type { NonEmptyArray } from "../collections/Array.ts"
-import * as Arr from "../collections/Array.ts"
-import * as Iterable from "../collections/Iterable.ts"
-import * as MutableHashMap from "../collections/MutableHashMap.ts"
-import { hasProperty } from "../data/Predicate.ts"
-import type * as Duration from "../Duration.ts"
-import * as Effect from "../Effect.ts"
-import * as Exit from "../Exit.ts"
-import { constTrue, dual, identity } from "../Function.ts"
-import { type Pipeable, pipeArguments } from "../interfaces/Pipeable.ts"
-import { exitFail, exitSucceed } from "../internal/core.ts"
-import * as effect from "../internal/effect.ts"
-import * as internal from "../internal/request.ts"
-import type * as Schema from "../schema/Schema.ts"
-import type { Scope } from "../Scope.ts"
-import * as ServiceMap from "../ServiceMap.ts"
-import * as Tracer from "../Tracer.ts"
-import type * as Types from "../types/Types.ts"
-import type * as Persistable from "../unstable/persistence/Persistable.ts"
-import * as Persistence from "../unstable/persistence/Persistence.ts"
+import * as Cache from "./Cache.ts"
+import type { NonEmptyArray } from "./collections/Array.ts"
+import * as Arr from "./collections/Array.ts"
+import * as Iterable from "./collections/Iterable.ts"
+import * as MutableHashMap from "./collections/MutableHashMap.ts"
+import { hasProperty } from "./data/Predicate.ts"
+import type * as Duration from "./Duration.ts"
+import * as Effect from "./Effect.ts"
+import * as Exit from "./Exit.ts"
+import { constTrue, dual, identity } from "./Function.ts"
+import { type Pipeable, pipeArguments } from "./interfaces/Pipeable.ts"
+import { exitFail, exitSucceed } from "./internal/core.ts"
+import * as effect from "./internal/effect.ts"
+import * as internal from "./internal/request.ts"
 import type * as Request from "./Request.ts"
+import type * as Schema from "./schema/Schema.ts"
+import type { Scope } from "./Scope.ts"
+import * as ServiceMap from "./ServiceMap.ts"
+import * as Tracer from "./Tracer.ts"
+import type * as Types from "./types/Types.ts"
+import type * as Persistable from "./unstable/persistence/Persistable.ts"
+import * as Persistence from "./unstable/persistence/Persistence.ts"
 
-const TypeId = "~effect/batching/RequestResolver"
+const TypeId = "~effect/RequestResolver"
 
 /**
  * The `RequestResolver<A, R>` interface requires an environment `R` and handles
@@ -49,7 +49,7 @@ const TypeId = "~effect/batching/RequestResolver"
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetUserRequest extends Request.Request<string, Error> {
  *   readonly _tag: "GetUserRequest"
@@ -162,7 +162,7 @@ const defaultKey = (_request: unknown): unknown => defaultKeyObject
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * // Define a request type
  * interface GetUserRequest extends Request.Request<string, Error> {
@@ -206,7 +206,7 @@ export const make = <A extends Request.Any>(
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetUserByRole extends Request.Request<string, Error> {
  *   readonly _tag: "GetUserByRole"
@@ -261,7 +261,7 @@ const hashGroupKey = <A, K>(get: (entry: Request.Entry<A>) => K) => {
  * @example
  * ```ts
  * import { Effect } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetSquareRequest extends Request.Request<number> {
  *   readonly _tag: "GetSquareRequest"
@@ -303,7 +303,7 @@ export const fromFunction = <A extends Request.Any>(
  * @example
  * ```ts
  * import { Effect } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDoubleRequest extends Request.Request<number> {
  *   readonly _tag: "GetDoubleRequest"
@@ -346,7 +346,7 @@ export const fromFunctionBatched = <A extends Request.Any>(
  * @example
  * ```ts
  * import { Effect } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetUserFromAPIRequest extends Request.Request<string> {
  *   readonly _tag: "GetUserFromAPIRequest"
@@ -404,7 +404,7 @@ export const fromEffect = <A extends Request.Any>(
  * @example
  * ```ts
  * import { Effect } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetUser extends Request.Request<string, Error> {
  *   readonly _tag: "GetUser"
@@ -481,7 +481,7 @@ export const fromEffectTagged = <A extends Request.Any & { readonly _tag: string
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"
@@ -527,7 +527,7 @@ export const setDelayEffect: {
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"
@@ -571,7 +571,7 @@ export const setDelay: {
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"
@@ -634,7 +634,7 @@ export const around: {
  * @example
  * ```ts
  * import { Effect } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * // A resolver that will never complete
  * const neverResolver = RequestResolver.never
@@ -663,7 +663,7 @@ export const never: RequestResolver<never> = make(() => Effect.never)
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"
@@ -708,7 +708,7 @@ export const batchN: {
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetUserRequest extends Request.Request<string> {
  *   readonly _tag: "GetUserRequest"
@@ -765,7 +765,7 @@ export const grouped: {
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"
@@ -823,7 +823,7 @@ export const race: {
  * @example
  * ```ts
  * import { Effect, Exit } from "effect"
- * import { RequestResolver, Request } from "effect/batching"
+ * import { RequestResolver, Request } from "effect"
  *
  * interface GetDataRequest extends Request.Request<string> {
  *   readonly _tag: "GetDataRequest"

packages/effect/src/batching/index.ts

@@ -816,6 +816,22 @@ export * as Ref from "./Ref.ts"
  */
 export * as References from "./References.ts"
 
+/**
+ * @since 2.0.0
+ */
+export * as Request from "./Request.ts"
+
+/**
+ * This module provides utilities for creating and managing request resolvers,
+ * which are responsible for efficiently batching and executing requests.
+ *
+ * A `RequestResolver<A>` handles the execution of requests of type `A` and
+ * supports features like batching, caching, and resource management.
+ *
+ * @since 2.0.0
+ */
+export * as RequestResolver from "./RequestResolver.ts"
+
 /**
  * This module provides utility functions for working with RegExp in TypeScript.
  *