@effect-app/infra 4.0.0-beta.248 → 4.0.0-beta.249

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.248",
+  "version": "4.0.0-beta.249",
   "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.248"
+    "effect-app": "4.0.0-beta.249"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",
@@ -64,9 +64,9 @@
       "types": "./dist/CUPS.d.ts",
       "default": "./dist/CUPS.js"
     },
-    "./Emailer": {
-      "types": "./dist/Emailer.d.ts",
-      "default": "./dist/Emailer.js"
+    "./ContextProvider": {
+      "types": "./dist/ContextProvider.d.ts",
+      "default": "./dist/ContextProvider.js"
     },
     "./Emailer/Sendgrid": {
       "types": "./dist/Emailer/Sendgrid.d.ts",
@@ -76,98 +76,10 @@
       "types": "./dist/Emailer/fake.d.ts",
       "default": "./dist/Emailer/fake.js"
     },
-    "./Emailer/service": {
-      "types": "./dist/Emailer/service.d.ts",
-      "default": "./dist/Emailer/service.js"
-    },
     "./MainFiberSet": {
       "types": "./dist/MainFiberSet.d.ts",
       "default": "./dist/MainFiberSet.js"
     },
-    "./Model": {
-      "types": "./dist/Model.d.ts",
-      "default": "./dist/Model.js"
-    },
-    "./Model/Repository": {
-      "types": "./dist/Model/Repository.d.ts",
-      "default": "./dist/Model/Repository.js"
-    },
-    "./Model/Repository/Registry": {
-      "types": "./dist/Model/Repository/Registry.d.ts",
-      "default": "./dist/Model/Repository/Registry.js"
-    },
-    "./Model/Repository/ext": {
-      "types": "./dist/Model/Repository/ext.d.ts",
-      "default": "./dist/Model/Repository/ext.js"
-    },
-    "./Model/Repository/legacy": {
-      "types": "./dist/Model/Repository/legacy.d.ts",
-      "default": "./dist/Model/Repository/legacy.js"
-    },
-    "./Model/Repository/makeRepo": {
-      "types": "./dist/Model/Repository/makeRepo.d.ts",
-      "default": "./dist/Model/Repository/makeRepo.js"
-    },
-    "./Model/Repository/service": {
-      "types": "./dist/Model/Repository/service.d.ts",
-      "default": "./dist/Model/Repository/service.js"
-    },
-    "./Model/Repository/validation": {
-      "types": "./dist/Model/Repository/validation.d.ts",
-      "default": "./dist/Model/Repository/validation.js"
-    },
-    "./Model/dsl": {
-      "types": "./dist/Model/dsl.d.ts",
-      "default": "./dist/Model/dsl.js"
-    },
-    "./Model/filter/filterApi": {
-      "types": "./dist/Model/filter/filterApi.d.ts",
-      "default": "./dist/Model/filter/filterApi.js"
-    },
-    "./Model/filter/types": {
-      "types": "./dist/Model/filter/types.d.ts",
-      "default": "./dist/Model/filter/types.js"
-    },
-    "./Model/filter/types/errors": {
-      "types": "./dist/Model/filter/types/errors.d.ts",
-      "default": "./dist/Model/filter/types/errors.js"
-    },
-    "./Model/filter/types/fields": {
-      "types": "./dist/Model/filter/types/fields.d.ts",
-      "default": "./dist/Model/filter/types/fields.js"
-    },
-    "./Model/filter/types/path/common": {
-      "types": "./dist/Model/filter/types/path/common.d.ts",
-      "default": "./dist/Model/filter/types/path/common.js"
-    },
-    "./Model/filter/types/path/eager": {
-      "types": "./dist/Model/filter/types/path/eager.d.ts",
-      "default": "./dist/Model/filter/types/path/eager.js"
-    },
-    "./Model/filter/types/path/index": {
-      "types": "./dist/Model/filter/types/path/index.d.ts",
-      "default": "./dist/Model/filter/types/path/index.js"
-    },
-    "./Model/filter/types/utils": {
-      "types": "./dist/Model/filter/types/utils.d.ts",
-      "default": "./dist/Model/filter/types/utils.js"
-    },
-    "./Model/filter/types/validator": {
-      "types": "./dist/Model/filter/types/validator.d.ts",
-      "default": "./dist/Model/filter/types/validator.js"
-    },
-    "./Model/query": {
-      "types": "./dist/Model/query.d.ts",
-      "default": "./dist/Model/query.js"
-    },
-    "./Model/query/dsl": {
-      "types": "./dist/Model/query/dsl.d.ts",
-      "default": "./dist/Model/query/dsl.js"
-    },
-    "./Model/query/new-kid-interpreter": {
-      "types": "./dist/Model/query/new-kid-interpreter.d.ts",
-      "default": "./dist/Model/query/new-kid-interpreter.js"
-    },
     "./QueueMaker/SQLQueue": {
       "types": "./dist/QueueMaker/SQLQueue.d.ts",
       "default": "./dist/QueueMaker/SQLQueue.js"
@@ -184,21 +96,21 @@
       "types": "./dist/QueueMaker/sbqueue.d.ts",
       "default": "./dist/QueueMaker/sbqueue.js"
     },
-    "./QueueMaker/service": {
-      "types": "./dist/QueueMaker/service.d.ts",
-      "default": "./dist/QueueMaker/service.js"
-    },
-    "./RequestContext": {
-      "types": "./dist/RequestContext.d.ts",
-      "default": "./dist/RequestContext.js"
-    },
     "./RequestFiberSet": {
       "types": "./dist/RequestFiberSet.d.ts",
       "default": "./dist/RequestFiberSet.js"
     },
-    "./Store": {
-      "types": "./dist/Store.d.ts",
-      "default": "./dist/Store.js"
+    "./SQL": {
+      "types": "./dist/SQL.d.ts",
+      "default": "./dist/SQL.js"
+    },
+    "./SQL/Model": {
+      "types": "./dist/SQL/Model.d.ts",
+      "default": "./dist/SQL/Model.js"
+    },
+    "./ServiceBus": {
+      "types": "./dist/ServiceBus.d.ts",
+      "default": "./dist/ServiceBus.js"
     },
     "./Store/ContextMapContainer": {
       "types": "./dist/Store/ContextMapContainer.d.ts",
@@ -240,110 +152,22 @@
       "types": "./dist/Store/index.d.ts",
       "default": "./dist/Store/index.js"
     },
-    "./Store/service": {
-      "types": "./dist/Store/service.d.ts",
-      "default": "./dist/Store/service.js"
-    },
     "./Store/utils": {
       "types": "./dist/Store/utils.d.ts",
       "default": "./dist/Store/utils.js"
     },
-    "./adapters/SQL": {
-      "types": "./dist/adapters/SQL.d.ts",
-      "default": "./dist/adapters/SQL.js"
-    },
-    "./adapters/SQL/Model": {
-      "types": "./dist/adapters/SQL/Model.d.ts",
-      "default": "./dist/adapters/SQL/Model.js"
-    },
-    "./adapters/ServiceBus": {
-      "types": "./dist/adapters/ServiceBus.d.ts",
-      "default": "./dist/adapters/ServiceBus.js"
-    },
-    "./adapters/cosmos-client": {
-      "types": "./dist/adapters/cosmos-client.d.ts",
-      "default": "./dist/adapters/cosmos-client.js"
-    },
-    "./adapters/index": {
-      "types": "./dist/adapters/index.d.ts",
-      "default": "./dist/adapters/index.js"
-    },
-    "./adapters/logger": {
-      "types": "./dist/adapters/logger.d.ts",
-      "default": "./dist/adapters/logger.js"
-    },
-    "./adapters/memQueue": {
-      "types": "./dist/adapters/memQueue.d.ts",
-      "default": "./dist/adapters/memQueue.js"
-    },
-    "./adapters/mongo-client": {
-      "types": "./dist/adapters/mongo-client.d.ts",
-      "default": "./dist/adapters/mongo-client.js"
-    },
-    "./adapters/redis-client": {
-      "types": "./dist/adapters/redis-client.d.ts",
-      "default": "./dist/adapters/redis-client.js"
-    },
-    "./api/ContextProvider": {
-      "types": "./dist/api/ContextProvider.d.ts",
-      "default": "./dist/api/ContextProvider.js"
-    },
-    "./api/codec": {
-      "types": "./dist/api/codec.d.ts",
-      "default": "./dist/api/codec.js"
-    },
-    "./api/layerUtils": {
-      "types": "./dist/api/layerUtils.d.ts",
-      "default": "./dist/api/layerUtils.js"
-    },
-    "./api/middlewares": {
-      "types": "./dist/api/middlewares.d.ts",
-      "default": "./dist/api/middlewares.js"
-    },
-    "./api/reportError": {
-      "types": "./dist/api/reportError.d.ts",
-      "default": "./dist/api/reportError.js"
-    },
-    "./api/routing": {
-      "types": "./dist/api/routing.d.ts",
-      "default": "./dist/api/routing.js"
-    },
-    "./api/routing/middleware": {
-      "types": "./dist/api/routing/middleware.d.ts",
-      "default": "./dist/api/routing/middleware.js"
-    },
-    "./api/routing/middleware/RouterMiddleware": {
-      "types": "./dist/api/routing/middleware/RouterMiddleware.d.ts",
-      "default": "./dist/api/routing/middleware/RouterMiddleware.js"
-    },
-    "./api/routing/middleware/middleware": {
-      "types": "./dist/api/routing/middleware/middleware.d.ts",
-      "default": "./dist/api/routing/middleware/middleware.js"
-    },
-    "./api/routing/schema/jwt": {
-      "types": "./dist/api/routing/schema/jwt.d.ts",
-      "default": "./dist/api/routing/schema/jwt.js"
-    },
-    "./api/routing/tsort": {
-      "types": "./dist/api/routing/tsort.d.ts",
-      "default": "./dist/api/routing/tsort.js"
-    },
-    "./api/routing/utils": {
-      "types": "./dist/api/routing/utils.d.ts",
-      "default": "./dist/api/routing/utils.js"
-    },
-    "./api/setupRequest": {
-      "types": "./dist/api/setupRequest.d.ts",
-      "default": "./dist/api/setupRequest.js"
-    },
-    "./api/util": {
-      "types": "./dist/api/util.d.ts",
-      "default": "./dist/api/util.js"
-    },
     "./arbs": {
       "types": "./dist/arbs.d.ts",
       "default": "./dist/arbs.js"
     },
+    "./codec": {
+      "types": "./dist/codec.d.ts",
+      "default": "./dist/codec.js"
+    },
+    "./cosmos-client": {
+      "types": "./dist/cosmos-client.d.ts",
+      "default": "./dist/cosmos-client.js"
+    },
     "./errorReporter": {
       "types": "./dist/errorReporter.d.ts",
       "default": "./dist/errorReporter.js"
@@ -356,6 +180,10 @@
       "types": "./dist/fileUtil.d.ts",
       "default": "./dist/fileUtil.js"
     },
+    "./layerUtils": {
+      "types": "./dist/layerUtils.d.ts",
+      "default": "./dist/layerUtils.js"
+    },
     "./logger": {
       "types": "./dist/logger.d.ts",
       "default": "./dist/logger.js"
@@ -372,6 +200,18 @@
       "types": "./dist/logger/shared.d.ts",
       "default": "./dist/logger/shared.js"
     },
+    "./memQueue": {
+      "types": "./dist/memQueue.d.ts",
+      "default": "./dist/memQueue.js"
+    },
+    "./middlewares": {
+      "types": "./dist/middlewares.d.ts",
+      "default": "./dist/middlewares.js"
+    },
+    "./mongo-client": {
+      "types": "./dist/mongo-client.d.ts",
+      "default": "./dist/mongo-client.js"
+    },
     "./otel": {
       "types": "./dist/otel.d.ts",
       "default": "./dist/otel.js"
@@ -380,10 +220,54 @@
       "types": "./dist/rateLimit.d.ts",
       "default": "./dist/rateLimit.js"
     },
+    "./redis-client": {
+      "types": "./dist/redis-client.d.ts",
+      "default": "./dist/redis-client.js"
+    },
+    "./reportError": {
+      "types": "./dist/reportError.d.ts",
+      "default": "./dist/reportError.js"
+    },
+    "./routing": {
+      "types": "./dist/routing.d.ts",
+      "default": "./dist/routing.js"
+    },
+    "./routing/middleware": {
+      "types": "./dist/routing/middleware.d.ts",
+      "default": "./dist/routing/middleware.js"
+    },
+    "./routing/middleware/RouterMiddleware": {
+      "types": "./dist/routing/middleware/RouterMiddleware.d.ts",
+      "default": "./dist/routing/middleware/RouterMiddleware.js"
+    },
+    "./routing/middleware/middleware": {
+      "types": "./dist/routing/middleware/middleware.d.ts",
+      "default": "./dist/routing/middleware/middleware.js"
+    },
+    "./routing/schema/jwt": {
+      "types": "./dist/routing/schema/jwt.d.ts",
+      "default": "./dist/routing/schema/jwt.js"
+    },
+    "./routing/tsort": {
+      "types": "./dist/routing/tsort.d.ts",
+      "default": "./dist/routing/tsort.js"
+    },
+    "./routing/utils": {
+      "types": "./dist/routing/utils.d.ts",
+      "default": "./dist/routing/utils.js"
+    },
+    "./setupRequest": {
+      "types": "./dist/setupRequest.d.ts",
+      "default": "./dist/setupRequest.js"
+    },
     "./test": {
       "types": "./dist/test.d.ts",
       "default": "./dist/test.js"
     },
+    "./util": {
+      "types": "./dist/util.d.ts",
+      "default": "./dist/util.js"
+    },
     "./vitest": {
       "types": "./dist/vitest.d.ts",
       "default": "./dist/vitest.js"

package/src/Emailer/Sendgrid.ts

@@ -1,14 +1,28 @@
-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 * as Array from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import { type EmailData, Emailer, type EmailMsg, type EmailMsgOptionalFrom, SendMailError } from "effect-app/Emailer"
 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"
+
+export interface SendgridConfig {
+  defaultReplyTo?: EmailData
+  subjectPrefix: string
+  realMail: boolean
+  defaultFrom: EmailData
+  apiKey: Redacted.Redacted
+  /**
+   * Email address used for fake/test recipients. Use `{i}` as a placeholder for
+   * an auto-incrementing index to ensure uniqueness.
+   *
+   * @example "test+{i}@example.com"
+   */
+  fakeMailAddress: string
+}
 
 const makeSendgrid = (
   { apiKey, defaultFrom, defaultReplyTo, fakeMailAddress, realMail, subjectPrefix }: SendgridConfig
@@ -19,11 +33,12 @@ const makeSendgrid = (
     return Emailer.of({
       sendMail: Effect.fn("Emailer.sendMail", { attributes: { "messaging.system": "sendgrid" } })(
         function*(msg_: EmailMsgOptionalFrom) {
-          const msg: EmailMsg = dropUndefinedT({
+          const replyTo = msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
+          const msg = dropUndefinedT({
             ...msg_,
             from: msg_.from ?? defaultFrom,
-            replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
-          })
+            replyTo
+          }) satisfies EmailMsg
           const render = renderMessage(!realMail, fakeMailAddress)
 
           const renderedMsg_ = render(msg)

package/src/Emailer/fake.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect-app/Effect"
+import { Emailer } from "effect-app/Emailer"
 import { pretty } from "effect-app/utils"
 import { InfraLogger } from "../logger.js"
-import { Emailer } from "./service.js"
 
 const makeFake = InfraLogger
   .logInfo("FAKE Emailer Service enabled")

package/src/QueueMaker/SQLQueue.ts

@@ -1,19 +1,19 @@
-import { getRequestContext, setupRequestContextWithCustomSpan } from "@effect-app/infra/api/setupRequest"
 import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors"
-import { type QueueBase, QueueMeta } from "@effect-app/infra/QueueMaker/service"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "@effect-app/infra/setupRequest"
 import { subMinutes } from "date-fns"
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
 import * as Option from "effect-app/Option"
+import { type QueueBase, QueueMeta } from "effect-app/QueueMaker"
 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"
 import { messagingSpanArgs } from "../otel.js"
+import { SQLModel } from "../SQL.js"
 
 export const QueueId = S.Finite.pipe(S.brand("QueueId"))
 export type QueueId = typeof QueueId.Type

package/src/QueueMaker/memQueue.ts

@@ -1,5 +1,6 @@
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import { QueueMeta } from "effect-app/QueueMaker"
 import * as S from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
 import * as Cause from "effect/Cause"
@@ -7,12 +8,11 @@ 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"
+import { MemQueue } from "../memQueue.js"
 import { messagingSpanArgs } from "../otel.js"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "../setupRequest.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
-import { QueueMeta } from "./service.js"
 
 export const makeMemQueue = Effect.fnUntraced(function*<
   Evt extends { id: S.StringId; _tag: string },

package/src/QueueMaker/sbqueue.ts

@@ -1,17 +1,17 @@
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import { QueueMeta } from "effect-app/QueueMaker"
 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"
 import { messagingSpanArgs } from "../otel.js"
+import { Receiver, Sender } from "../ServiceBus.js"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "../setupRequest.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
-import { QueueMeta } from "./service.js"
 
 export function makeServiceBusQueue<
   Evt extends { id: StringId; _tag: string },

package/src/RequestFiberSet.ts

@@ -6,8 +6,8 @@ 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"
+import { reportRequestError, reportUnknownRequestError } from "./reportError.js"
 
 const getRootParentSpan = Effect.gen(function*() {
   let span: Tracer.AnySpan | null = yield* Effect.currentSpan.pipe(

package/src/{adapters/SQL → SQL}/Model.ts

@@ -24,7 +24,7 @@ import * as VariantSchema from "effect/unstable/schema/VariantSchema"
 import { SqlClient } from "effect/unstable/sql/SqlClient"
 import * as SqlResolver from "effect/unstable/sql/SqlResolver"
 import * as SqlSchema from "effect/unstable/sql/SqlSchema"
-import { type DbSystem, withDbSpan } from "../../otel.js"
+import { type DbSystem, withDbSpan } from "../otel.js"
 
 const {
   Class,

package/src/{adapters/ServiceBus.ts → ServiceBus.ts}

@@ -7,7 +7,7 @@ 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"
+import { InfraLogger } from "./logger.js"
 
 const logged = (name: string) => <A, E, R>(self: Effect.Effect<A, E, R>) =>
   Effect.logInfo(name).pipe(

package/src/Store/ContextMapContainer.ts

@@ -1,8 +1,8 @@
 import * as Context from "effect-app/Context"
 import * as Effect from "effect-app/Effect"
 import * as Layer from "effect-app/Layer"
+import { ContextMap } from "effect-app/Store"
 import * as Data from "effect/Data"
-import { ContextMap } from "./service.js"
 
 // TODO: we have to create a new contextmap on every request.
 // we want to share one map during startup

package/src/Store/Cosmos/query.ts

@@ -3,12 +3,12 @@
 import * as Array from "effect-app/Array"
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import type { FilterR, FilterResult, Ops } from "effect-app/Model/filter/filterApi"
+import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "effect-app/Model/query"
+import type { SupportedValues } from "effect-app/Store"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
-import type { FilterR, FilterResult, Ops } from "../../Model/filter/filterApi.js"
-import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "../../Model/query.js"
 import { isRelationCheck } from "../codeFilter.js"
-import type { SupportedValues } from "../service.js"
 
 export function logQuery(q: {
   query: string

package/src/Store/Cosmos.ts

@@ -5,21 +5,21 @@ 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 type { FieldValues } from "effect-app/Model/filter/types"
+import { type ComputedProjectionIrExpression, type RawQuery } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
 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 { CosmosClient, CosmosClientLayer } from "../cosmos-client.js"
 import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"
-import type { FieldValues } from "../Model/filter/types.js"
-import { type ComputedProjectionIrExpression, type RawQuery } from "../Model/query.js"
 import { annotateCosmosResponse, annotateDb } from "../otel.js"
 import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js"
 import { storeId } from "./Memory.js"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
 
 const makeMapId =
   <IdKey extends keyof Encoded, Encoded extends FieldValues>(idKey: IdKey) => ({ [idKey]: id, ...e }: Encoded) => ({

package/src/Store/Disk.ts

@@ -4,13 +4,13 @@ import * as fu from "../fileUtil.js"
 import fs from "fs"
 
 import * as Effect from "effect-app/Effect"
+import type { FieldValues } from "effect-app/Model/filter/types"
+import { type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
 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"
-import { type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "./service.js"
 
 function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValues, R, E>(
   prefix: string,

package/src/Store/Memory.ts

@@ -4,8 +4,12 @@ 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 type { FilterResult } from "effect-app/Model/filter/filterApi"
+import type { FieldValues } from "effect-app/Model/filter/types"
+import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
 import { NonEmptyString255 } from "effect-app/Schema"
+import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
 import { assertUnreachable } from "effect-app/utils"
 import { flow, pipe } from "effect/Function"
 import * as Order from "effect/Order"
@@ -14,12 +18,8 @@ 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"
-import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "../Model/query.js"
 import { annotateDb } from "../otel.js"
 import { codeFilter, codeFilter3_ } from "./codeFilter.js"
-import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "./service.js"
 import { makeUpdateETag } from "./utils.js"
 
 /** Traverse an object by a dot-separated path string, e.g. `"a.b.c"`. */

package/src/Store/SQL/Pg.ts

@@ -3,16 +3,16 @@
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import { toNonEmptyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import type { FieldValues } from "effect-app/Model/filter/types"
+import type { ComputedProjectionIrExpression } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
 import * as Struct from "effect/Struct"
 import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../../errors.js"
 import { InfraLogger } from "../../logger.js"
-import type { FieldValues } from "../../Model/filter/types.js"
-import type { ComputedProjectionIrExpression } from "../../Model/query.js"
 import { annotateDb } from "../../otel.js"
 import { storeId } from "../Memory.js"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "../service.js"
 import { makeETag } from "../utils.js"
 import { buildWhereSQLQuery, logQuery, pgDialect } from "./query.js"
 

package/src/Store/SQL/query.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
+import type { FilterR, FilterResult } from "effect-app/Model/filter/filterApi"
+import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "effect-app/Model/query"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
-import type { FilterR, FilterResult } from "../../Model/filter/filterApi.js"
-import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "../../Model/query.js"
 import { isRelationCheck } from "../codeFilter.js"
 
 export interface SQLDialect {