@effect-app/infra 4.0.0-beta.220 → 4.0.0-beta.222

package/examples/query.ts

@@ -1,5 +1,9 @@
 import { expectTypeOf } from "@effect/vitest"
-import { Effect, Layer, ManagedRuntime, S, Struct } from "effect-app"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as S from "effect-app/Schema"
+import * as ManagedRuntime from "effect/ManagedRuntime"
+import * as Struct from "effect/Struct"
 import { makeRepo } from "../src/Model.js"
 import { and, make, one, or, order, page, project, type QueryWhere, where } from "../src/Model/query.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.220",
+  "version": "4.0.0-beta.222",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "8.4.0",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.220"
+    "effect-app": "4.0.0-beta.222"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",

package/src/CUPS.ts

@@ -1,7 +1,13 @@
 import { type FileOptions, tempFile } from "@effect-app/infra/fileUtil"
 import cp from "child_process"
-import { Config, Context, Effect, Layer, Option, Predicate, S } from "effect-app"
+import * as Config from "effect-app/Config"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import * as Predicate from "effect/Predicate"
 import fs from "fs"
 import os from "os"
 import path from "path"

package/src/Emailer/Sendgrid.ts

@@ -1,8 +1,11 @@
 import type { EmailData } from "@sendgrid/helpers/classes/email-address.js"
 import type { MailContent } from "@sendgrid/helpers/classes/mail.js"
 import sgMail from "@sendgrid/mail"
-import { Array, Effect, Equivalence, Redacted } from "effect-app"
+import * as Array from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
 import { dropUndefinedT } from "effect-app/utils"
+import * as Equivalence from "effect/Equivalence"
+import * as Redacted from "effect/Redacted"
 import { inspect } from "util"
 import { InfraLogger } from "../logger.js"
 import { Emailer, type EmailMsg, type EmailMsgOptionalFrom, type SendgridConfig, SendMailError } from "./service.js"

package/src/Emailer/fake.ts

@@ -1,4 +1,4 @@
-import { Effect } from "effect-app"
+import * as Effect from "effect-app/Effect"
 import { pretty } from "effect-app/utils"
 import { InfraLogger } from "../logger.js"
 import { Emailer } from "./service.js"

package/src/Emailer/service.ts

@@ -1,7 +1,11 @@
 import type { MailContent, MailData } from "@sendgrid/helpers/classes/mail.js"
 import type { ResponseError } from "@sendgrid/mail"
-import { Context, Data, type Effect, type NonEmptyReadonlyArray, type Redacted } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Context from "effect-app/Context"
+import type * as Effect from "effect-app/Effect"
 import type { Email } from "effect-app/Schema"
+import * as Data from "effect/Data"
+import type * as Redacted from "effect/Redacted"
 
 export class SendMailError extends Data.TaggedError("SendMailError")<{
   readonly raw: Error | ResponseError

package/src/MainFiberSet.ts

@@ -1,4 +1,8 @@
-import { Context, Effect, Fiber, FiberSet, Layer } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Fiber from "effect/Fiber"
+import * as FiberSet from "effect/FiberSet"
 
 import { InfraLogger } from "./logger.js"
 import { reportNonInterruptedFailureCause } from "./QueueMaker/errors.js"

package/src/Model/Repository/Registry.ts

@@ -1,4 +1,5 @@
-import { Context, Effect } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
 
 export interface RegisteredRepository {
   readonly seedNamespace: (namespace: string) => Effect.Effect<void>

package/src/Model/Repository/ext.ts

@@ -1,8 +1,14 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Array, Effect, Exit, type NonEmptyArray, Option, Request, RequestResolver } from "effect-app"
+import * as Array from "effect-app/Array"
+import type { NonEmptyArray } from "effect-app/Array"
 import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "effect-app/client/errors"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
 import { type FixEnv, type PureEnv, runTerm } from "effect-app/Pure"
+import * as Exit from "effect/Exit"
+import * as Request from "effect/Request"
+import * as RequestResolver from "effect/RequestResolver"
 import { AnyPureDSL } from "../dsl.js"
 import type { FieldValues } from "../filter/types.js"
 import type { Query, QueryEnd, QueryWhere } from "../query.js"

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

@@ -1,10 +1,23 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Array, Chunk, Context, Effect, Equivalence, flow, type NonEmptyReadonlyArray, Option, pipe, Pipeable, PubSub, Result, S, SchemaAST, Unify } from "effect-app"
+import * as Array from "effect-app/Array"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Chunk from "effect-app/Chunk"
 import { NotFoundError } from "effect-app/client/errors"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
 import { flatMapOption } from "effect-app/Effect"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
 import { type Codec, NonNegativeInt } from "effect-app/Schema"
+import * as Equivalence from "effect/Equivalence"
+import { flow, pipe } from "effect/Function"
+import * as Pipeable from "effect/Pipeable"
+import * as PubSub from "effect/PubSub"
+import * as Result from "effect/Result"
+import * as SchemaAST from "effect/SchemaAST"
+import * as Unify from "effect/Unify"
 import { setupRequestContextFromCurrent } from "../../../api/setupRequest.js"
 import { type FilterArgs, type PersistenceModelType, type StoreConfig, StoreMaker } from "../../../Store.js"
 import { getContextMap } from "../../../Store/ContextMapContainer.js"

package/src/Model/Repository/legacy.ts

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

package/src/Model/Repository/makeRepo.ts

@@ -6,7 +6,10 @@
 
 // import type { ParserEnv } from "effect-app/Schema/custom/Parser"
 
-import { type Context, Effect, type NonEmptyReadonlyArray, type S } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import type * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import type * as S from "effect-app/Schema"
 import type { StoreConfig, StoreMaker } from "../../Store.js"
 import type { FieldValues } from "../filter/types.js"
 import { type ExtendedRepository, extendRepo } from "./ext.js"

package/src/Model/Repository/service.ts

@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Effect, Option, PubSub, S } from "effect-app"
 import type { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client/errors"
+import type * as Effect from "effect-app/Effect"
+import type * as Option from "effect-app/Option"
+import type * as S from "effect-app/Schema"
 import type { NonNegativeInt } from "effect-app/Schema/numbers"
+import type * as PubSub from "effect/PubSub"
 import type { FieldValues, IsNever, ResolveFirstLevel } from "../filter/types.js"
 import type { QAll, Query, QueryProjection, RawQuery } from "../query.js"
 import type { Mapped } from "./legacy.js"

package/src/Model/Repository/validation.ts

@@ -1,4 +1,4 @@
-import { S } from "effect-app"
+import * as S from "effect-app/Schema"
 import { NonNegativeInt } from "effect-app/Schema"
 
 /**

package/src/Model/dsl.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, type NonEmptyReadonlyArray } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
 import { type FixEnv, get, logMany, type Pure, type PureEnvEnv, type PureLogT, set } from "effect-app/Pure"
 
 export interface PureDSL<S, S2, W> {

package/src/Model/query/dsl.ts

@@ -1,8 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Data, flow, type Option, Pipeable, type S } from "effect-app"
+import type * as Option from "effect-app/Option"
+import type * as S from "effect-app/Schema"
 import type { NonNegativeInt } from "effect-app/Schema"
+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 { Ops } from "../filter/filterApi.js"
 import type { FieldValues } from "../filter/types.js"

package/src/Model/query/new-kid-interpreter.ts

@@ -1,8 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Array, identity, Match, Option, pipe, S, SchemaAST } from "effect-app"
+import * as Array from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
 import { dropUndefinedT } from "effect-app/utils"
+import { identity, pipe } from "effect/Function"
+import * as Match from "effect/Match"
+import * as SchemaAST from "effect/SchemaAST"
 import type { FilterResult } from "../filter/filterApi.js"
 import type { FieldValues } from "../filter/types.js"
 import type { FieldPath } from "../filter/types/path/eager.js"

package/src/QueueMaker/SQLQueue.ts

@@ -2,9 +2,14 @@ import { getRequestContext, setupRequestContextWithCustomSpan } from "@effect-ap
 import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors"
 import { type QueueBase, QueueMeta } from "@effect-app/infra/QueueMaker/service"
 import { subMinutes } from "date-fns"
-import { Effect, Fiber, type NonEmptyReadonlyArray, Option, S, Tracer } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
 import { type NonEmptyString255 } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import * as Fiber from "effect/Fiber"
+import * as Tracer from "effect/Tracer"
 import { SqlClient } from "effect/unstable/sql"
 import { SQLModel } from "../adapters/SQL.js"
 import { InfraLogger } from "../logger.js"

package/src/QueueMaker/errors.ts

@@ -1,5 +1,7 @@
 import { reportError } from "@effect-app/infra/errorReporter"
-import { Cause, Effect, Exit } from "effect-app"
+import * as Effect from "effect-app/Effect"
+import * as Cause from "effect/Cause"
+import * as Exit from "effect/Exit"
 
 const reportQueueError_ = reportError("Queue")
 

package/src/QueueMaker/memQueue.ts

@@ -1,7 +1,12 @@
-import { Cause, Tracer } from "effect"
-import { Effect, Fiber, flow, type NonEmptyReadonlyArray, S } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as S from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import * as Cause from "effect/Cause"
+import * as Fiber from "effect/Fiber"
+import { flow } from "effect/Function"
 import * as Q from "effect/Queue"
+import * as Tracer from "effect/Tracer"
 import { MemQueue } from "../adapters/memQueue.js"
 import { getRequestContext, setupRequestContextWithCustomSpan } from "../api/setupRequest.js"
 import { InfraLogger } from "../logger.js"

package/src/QueueMaker/sbqueue.ts

@@ -1,7 +1,11 @@
-import { Tracer } from "effect"
-import { Cause, Effect, flow, type NonEmptyReadonlyArray, S } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as S from "effect-app/Schema"
 import type { StringId } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import * as Cause from "effect/Cause"
+import { flow } from "effect/Function"
+import * as Tracer from "effect/Tracer"
 import { Receiver, Sender } from "../adapters/ServiceBus.js"
 import { getRequestContext, setupRequestContextWithCustomSpan } from "../api/setupRequest.js"
 import { InfraLogger } from "../logger.js"

package/src/QueueMaker/service.ts

@@ -1,4 +1,6 @@
-import type { Effect, NonEmptyReadonlyArray, Scope } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import type * as Effect from "effect-app/Effect"
+import type * as Scope from "effect/Scope"
 import { RequestContext } from "../RequestContext.js"
 
 export interface QueueBase<Evt, DrainEvt> {

package/src/RequestContext.ts

@@ -1,5 +1,6 @@
-import { Context, S } from "effect-app"
+import * as Context from "effect-app/Context"
 import { UserProfileId } from "effect-app/ids"
+import * as S from "effect-app/Schema"
 import { NonEmptyString255 } from "effect-app/Schema"
 
 export const Locale = S.Literals(["en", "de"])

package/src/RequestFiberSet.ts

@@ -1,5 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Context, Effect, Fiber, FiberSet, Layer, Option, type Tracer } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
+import * as Fiber from "effect/Fiber"
+import * as FiberSet from "effect/FiberSet"
+import type * as Tracer from "effect/Tracer"
 import { reportRequestError, reportUnknownRequestError } from "./api/reportError.js"
 import { InfraLogger } from "./logger.js"
 

package/src/Store/ContextMapContainer.ts

@@ -1,6 +1,10 @@
-import { Context, Data, Effect, Layer, RequestResolver } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Data from "effect/Data"
 import { dual } from "effect/Function"
 import type * as Request from "effect/Request"
+import * as RequestResolver from "effect/RequestResolver"
 import { ContextMap } from "./service.js"
 
 // TODO: we have to create a new contextmap on every request.

package/src/Store/Cosmos/query.ts

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Array, Effect, type NonEmptyReadonlyArray } from "effect-app"
+import * as Array from "effect-app/Array"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
 import type { FilterR, FilterResult, Ops } from "../../Model/filter/filterApi.js"

package/src/Store/Cosmos.ts

@@ -1,8 +1,16 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Array, Duration, Effect, Layer, type NonEmptyReadonlyArray, Option, pipe, Redacted, Struct } from "effect-app"
+import * as Array from "effect-app/Array"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
 import { dropUndefinedT, mutable } from "effect-app/utils"
+import * as Duration from "effect/Duration"
+import { pipe } from "effect/Function"
+import * as Redacted from "effect/Redacted"
+import * as Struct from "effect/Struct"
 import { CosmosClient, CosmosClientLayer } from "../adapters/cosmos-client.js"
 import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"

package/src/Store/Disk.ts

@@ -3,7 +3,10 @@ import * as fu from "../fileUtil.js"
 
 import fs from "fs"
 
-import { Console, Effect, flow, Semaphore } from "effect-app"
+import * as Effect from "effect-app/Effect"
+import * as Console from "effect/Console"
+import { flow } from "effect/Function"
+import * as Semaphore from "effect/Semaphore"
 import type { FieldValues } from "../Model/filter/types.js"
 import { annotateDb } from "../otel.js"
 import { makeMemoryStoreInt, storeId } from "./Memory.js"

package/src/Store/Memory.ts

@@ -1,8 +1,18 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Array, Context, Effect, flow, type NonEmptyReadonlyArray, Option, Order, pipe, Ref, Result, Semaphore, Struct } from "effect-app"
+import * as Array from "effect-app/Array"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { assertUnreachable } from "effect-app/utils"
+import { flow, pipe } from "effect/Function"
+import * as Order from "effect/Order"
+import * as Ref from "effect/Ref"
+import * as Result from "effect/Result"
+import * as Semaphore from "effect/Semaphore"
+import * as Struct from "effect/Struct"
 import { InfraLogger } from "../logger.js"
 import type { FilterResult } from "../Model/filter/filterApi.js"
 import type { FieldValues } from "../Model/filter/types.js"

package/src/Store/SQL/Pg.ts

@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Effect, type NonEmptyReadonlyArray, Option, Struct } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
+import * as Struct from "effect/Struct"
 import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../../errors.js"
 import { InfraLogger } from "../../logger.js"

package/src/Store/SQL/query.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, type NonEmptyReadonlyArray } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
 import type { FilterR, FilterResult } from "../../Model/filter/filterApi.js"

package/src/Store/SQL.ts

@@ -1,8 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Context, Layer, LayerMap } from "effect"
-import { Effect, type NonEmptyReadonlyArray, Option, Struct } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
+import * as Context from "effect/Context"
+import * as Layer from "effect/Layer"
+import * as LayerMap from "effect/LayerMap"
+import * as Struct from "effect/Struct"
 import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"

package/src/Store/codeFilter.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { Array, Option } from "effect-app"
+import * as Array from "effect-app/Array"
+import * as Option from "effect-app/Option"
 import { assertUnreachable } from "effect-app/utils"
 import type { FilterR, FilterResult } from "../Model/filter/filterApi.js"
 import type { FieldValues } from "../Model/filter/types.js"

package/src/Store/index.ts

@@ -1,5 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, Layer, Redacted } from "effect-app"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Redacted from "effect/Redacted"
 import type { SqlClient } from "effect/unstable/sql"
 import { CosmosStoreLayer } from "./Cosmos.js"
 import { DiskStoreLayer } from "./Disk.js"

package/src/Store/service.ts

@@ -1,6 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { UniqueKey } from "@azure/cosmos"
-import { Context, Effect, type NonEmptyReadonlyArray, type Option, type Redacted } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import type * as Option from "effect-app/Option"
+import type * as Redacted from "effect/Redacted"
 import * as Semaphore from "effect/Semaphore"
 import type { OptimisticConcurrencyException } from "../errors.js"
 import type { FilterResult } from "../Model/filter/filterApi.js"

package/src/Store/utils.ts

@@ -1,5 +1,6 @@
 import crypto from "crypto"
-import { Effect, Option } from "effect-app"
+import * as Effect from "effect-app/Effect"
+import * as Option from "effect-app/Option"
 import { OptimisticConcurrencyException } from "../errors.js"
 import type { PersistenceModelType, SupportedValues2 } from "./service.js"
 

package/src/adapters/SQL/Model.ts

@@ -74,7 +74,7 @@ export {
    * @since 1.0.0
    * @category constructors
    * @example
-   * import { Schema } from "effect"
+   * import * as Schema from "effect/Schema"
    * import { Model } from "effect/unstable/schema"
    *
    * export const GroupId = Schema.Number.pipe(Schema.brand("GroupId"))

package/src/adapters/ServiceBus.ts

@@ -1,6 +1,12 @@
 /* eslint-disable @typescript-eslint/prefer-promise-reject-errors */
 import { type OperationOptionsBase, type ProcessErrorArgs, ServiceBusClient, type ServiceBusMessage, type ServiceBusMessageBatch, type ServiceBusReceivedMessage, type ServiceBusReceiver } from "@azure/service-bus"
-import { Cause, Context, Effect, Exit, FiberSet, Layer, type Scope } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Cause from "effect/Cause"
+import * as Exit from "effect/Exit"
+import * as FiberSet from "effect/FiberSet"
+import type * as Scope from "effect/Scope"
 import { InfraLogger } from "../logger.js"
 
 const logged = (name: string) => <A, E, R>(self: Effect.Effect<A, E, R>) =>

package/src/adapters/cosmos-client.ts

@@ -1,5 +1,7 @@
 import { CosmosClient as ComosClient_ } from "@azure/cosmos"
-import { Context, Effect, Layer } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
 
 const withClient = (url: string) => Effect.sync(() => new ComosClient_(url))
 

package/src/adapters/memQueue.ts

@@ -1,5 +1,6 @@
-import { Context, Effect, type Queue } from "effect-app"
-import * as Q from "effect/Queue"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Queue from "effect/Queue"
 
 const make = Effect
   .gen(function*() {
@@ -9,7 +10,7 @@ const make = Effect
       getOrCreateQueue: Effect.fnUntraced(function*(k: string) {
         const q = store.get(k)
         if (q) return q
-        const newQ = yield* Q.unbounded<string>()
+        const newQ = yield* Queue.unbounded<string>()
         store.set(k, newQ)
         return newQ
       })

package/src/adapters/mongo-client.ts

@@ -1,4 +1,6 @@
-import { Context, Effect, Layer } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
 import { MongoClient as MongoClient_ } from "mongodb"
 
 // TODO: we should probably share a single client...

package/src/adapters/redis-client.ts

@@ -1,4 +1,8 @@
-import { Context, Data, Effect, Layer, Option } from "effect-app"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
+import * as Data from "effect/Data"
 import type { RedisClient as Client } from "redis"
 import Redlock from "redlock"
 

package/src/api/ContextProvider.ts

@@ -1,5 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Context, Effect, Layer, type NonEmptyReadonlyArray, pipe, type Scope } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import { pipe } from "effect/Function"
+import type * as Scope from "effect/Scope"
 
 import { type HttpRouter } from "effect-app/http"
 import { type EffectGenUtils } from "effect-app/utils/gen"

package/src/api/internal/RequestContextMiddleware.ts

@@ -1,5 +1,6 @@
-import { Effect, Layer } from "effect-app"
+import * as Effect from "effect-app/Effect"
 import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http"
+import * as Layer from "effect-app/Layer"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { Locale, LocaleRef, RequestContext, spanAttributes } from "../../RequestContext.js"
 import { ContextMapContainer } from "../../Store/ContextMapContainer.js"

package/src/api/internal/auth.ts

@@ -1,5 +1,7 @@
-import { Data, Effect, Option } from "effect-app"
+import * as Effect from "effect-app/Effect"
 import { HttpHeaders, HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http"
+import * as Option from "effect-app/Option"
+import * as Data from "effect/Data"
 import { createRemoteJWKSet, jwtVerify } from "jose"
 
 const getHeaders = (error: string, description: string, scopes?: ReadonlyArray<string>) => ({

package/src/api/internal/events.ts

@@ -1,5 +1,10 @@
-import { Duration, Effect, pipe, S, Schedule, Stream } from "effect-app"
+import * as Effect from "effect-app/Effect"
 import { HttpHeaders, HttpServerResponse } from "effect-app/http"
+import * as S from "effect-app/Schema"
+import * as Duration from "effect/Duration"
+import { pipe } from "effect/Function"
+import * as Schedule from "effect/Schedule"
+import * as Stream from "effect/Stream"
 import { reportError } from "../../errorReporter.js"
 import { storeId } from "../../Store/Memory.js"
 import { setupRequestContextFromCurrent } from "../setupRequest.js"

package/src/api/layerUtils.ts

@@ -1,5 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Context, Effect, type Layer, type NonEmptyReadonlyArray, Option } from "effect-app"
+import type { NonEmptyReadonlyArray } from "effect-app/Array"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import type * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
 import { InfraLogger } from "../logger.js"
 
 // TODO: These LayerUtils are flaky, like in dependencies as a readonly array, it breaks when there are two entries