@effect-app/infra 4.0.0-beta.24 → 4.0.0-beta.240

package/package.json

@@ -1,54 +1,52 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.24",
+  "version": "4.0.0-beta.240",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@faker-js/faker": "^8.4.1",
     "change-case": "^5.4.4",
     "cross-fetch": "^4.1.0",
-    "express-oauth2-jwt-bearer": "^1.7.4",
-    "fast-check": "~4.5.3",
+    "fast-check": "~4.7.0",
+    "jose": "^6.2.3",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
-    "pure-rand": "7.0.1",
+    "pure-rand": "8.4.0",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.24"
+    "effect-app": "4.0.0-beta.240"
   },
   "devDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.3",
     "@azure/service-bus": "^7.9.5",
-    "@sentry/node": "10.42.0",
-    "@sentry/opentelemetry": "10.42.0",
-    "@types/express": "^5.0.6",
-    "@types/node": "25.3.3",
+    "@effect/sql-sqlite-node": "4.0.0-beta.68",
+    "@sentry/node": "10.51.0",
+    "@sentry/opentelemetry": "10.51.0",
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/node": "25.6.0",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.8",
-    "express": "^5.2.1",
-    "jwks-rsa": "2.1.4",
+    "better-sqlite3": "^12.9.0",
     "jwt-decode": "^4.0.0",
-    "mongodb": "7.1.0",
+    "mongodb": "7.2.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
     "strip-ansi": "^7.2.0",
-    "typescript": "~5.9.3",
-    "vitest": "^4.0.18",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.2"
+    "typescript": "~6.0.3",
+    "vitest": "^4.1.5"
   },
   "peerDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.3",
     "@azure/service-bus": "^7.9.5",
-    "@effect/vitest": "^4.0.0-beta.36",
+    "@effect/vitest": "^4.0.0-beta.68",
     "@sendgrid/helpers": "^8.0.0",
     "@sendgrid/mail": "^8.1.6",
-    "@sentry/node": "10.42.0",
-    "@sentry/opentelemetry": "10.42.0",
+    "@sentry/node": "10.51.0",
+    "@sentry/opentelemetry": "10.51.0",
+    "effect": "^4.0.0-beta.68",
     "jwt-decode": "^4.0.0",
     "redis": "^3.1.2",
-    "redlock": "^4.2.0",
-    "effect": "^4.0.0-beta.36",
-    "express": "^5.2.1"
+    "redlock": "^4.2.0"
   },
   "typesVersions": {
     "*": {
@@ -94,6 +92,10 @@
       "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"
@@ -166,14 +168,6 @@
       "types": "./dist/Model/query/new-kid-interpreter.d.ts",
       "default": "./dist/Model/query/new-kid-interpreter.js"
     },
-    "./Operations": {
-      "types": "./dist/Operations.d.ts",
-      "default": "./dist/Operations.js"
-    },
-    "./OperationsRepo": {
-      "types": "./dist/OperationsRepo.d.ts",
-      "default": "./dist/OperationsRepo.js"
-    },
     "./QueueMaker/SQLQueue": {
       "types": "./dist/QueueMaker/SQLQueue.d.ts",
       "default": "./dist/QueueMaker/SQLQueue.js"
@@ -226,6 +220,18 @@
       "types": "./dist/Store/Memory.d.ts",
       "default": "./dist/Store/Memory.js"
     },
+    "./Store/SQL": {
+      "types": "./dist/Store/SQL.d.ts",
+      "default": "./dist/Store/SQL.js"
+    },
+    "./Store/SQL/Pg": {
+      "types": "./dist/Store/SQL/Pg.d.ts",
+      "default": "./dist/Store/SQL/Pg.js"
+    },
+    "./Store/SQL/query": {
+      "types": "./dist/Store/SQL/query.d.ts",
+      "default": "./dist/Store/SQL/query.js"
+    },
     "./Store/codeFilter": {
       "types": "./dist/Store/codeFilter.d.ts",
       "default": "./dist/Store/codeFilter.js"
@@ -366,6 +372,10 @@
       "types": "./dist/logger/shared.d.ts",
       "default": "./dist/logger/shared.js"
     },
+    "./otel": {
+      "types": "./dist/otel.d.ts",
+      "default": "./dist/otel.js"
+    },
     "./rateLimit": {
       "types": "./dist/rateLimit.d.ts",
       "default": "./dist/rateLimit.js"
@@ -384,18 +394,17 @@
   "scripts": {
     "watch": "pnpm build:tsc -w",
     "build:tsc": "pnpm clean-dist && effect-app-cli packagejson pnpm check",
-    "check": "tsc --build",
+    "check": "tsgo --build",
     "build": "pnpm build:tsc",
-    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsc -w",
+    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsgo -w",
     "clean": "rm -rf dist",
     "clean-dist": "sh ../../scripts/clean-dist.sh",
     "circular": "pnpm circular:src && pnpm circular:dist",
     "circular:src": "madge --circular --ts-config ./tsconfig.json --extensions ts ./src",
     "circular:dist": "madge --circular --extensions js ./dist",
-    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsc --noEmit",
-    "lint": "NODE_OPTIONS=--max-old-space-size=6144 ESLINT_TS=1 eslint ./src",
-    "lint:watch": "ESLINT_TS=1 esw -w --changed --clear --ext ts,tsx .",
-    "lint-fix": "pnpm lint --fix",
+    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsgo --noEmit",
+    "lint": "oxlint --quiet --type-aware ./src && pnpm exec dprint check --config ../../dprint.jsonc .",
+    "lint-fix": "oxlint --quiet --type-aware --fix ./src && pnpm exec dprint fmt --config ../../dprint.jsonc .",
     "test": "vitest",
     "test:run": "pnpm run test run --passWithNoTests",
     "testsuite": "pnpm lint && pnpm circular && pnpm run test:run",

package/src/CUPS.ts

@@ -1,7 +1,13 @@
 import { type FileOptions, tempFile } from "@effect-app/infra/fileUtil"
 import cp from "child_process"
-import { Config, Effect, Layer, Option, Predicate, S, ServiceMap } 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"
@@ -74,15 +80,13 @@ function printBuffer(printer: PrinterConfig, options: string[]) {
       )
 }
 
-function getAvailablePrinters(host?: string) {
-  return Effect.gen(function*() {
-    const { stdout } = yield* exec(["lpstat", ...buildListArgs({ host }), "-s"].join(" "))
-    return [...stdout.matchAll(/device for (\w+):/g)]
-      .map((_) => _[1])
-      .filter(Predicate.isNotNullish)
-      .map((_) => S.NonEmptyString255(_))
-  })
-}
+const getAvailablePrinters = Effect.fnUntraced(function*(host?: string) {
+  const { stdout } = yield* exec(["lpstat", ...buildListArgs({ host }), "-s"].join(" "))
+  return [...stdout.matchAll(/device for (\w+):/g)]
+    .map((_) => _[1])
+    .filter(Predicate.isNotNullish)
+    .map((_) => S.NonEmptyString255(_))
+})
 
 function* buildListArgs(config?: { host?: string | undefined }) {
   if (config?.host) {
@@ -100,7 +104,7 @@ export const CUPSConfig = Config.all({
     )
 })
 
-export class CUPS extends ServiceMap.Service<CUPS>()("effect-app/CUPS", {
+export class CUPS extends Context.Service<CUPS>()("effect-app/CUPS", {
   make: Effect.gen(function*() {
     const config = yield* CUPSConfig
     const serverUrl = Option.getOrUndefined(config.server)

package/src/Emailer/Sendgrid.ts

@@ -1,63 +1,70 @@
 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"
 
-const makeSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPrefix }: SendgridConfig) =>
+const makeSendgrid = (
+  { apiKey, defaultFrom, defaultReplyTo, fakeMailAddress, realMail, subjectPrefix }: SendgridConfig
+) =>
   Effect.sync(() => {
     sgMail.setApiKey(Redacted.value(apiKey))
 
     return Emailer.of({
-      sendMail: Effect.fn("Sendgrid.sendMail")(function*(msg_: EmailMsgOptionalFrom) {
-        const msg: EmailMsg = dropUndefinedT({
-          ...msg_,
-          from: msg_.from ?? defaultFrom,
-          replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
-        })
-        const render = renderMessage(!realMail)
+      sendMail: Effect.fn("Emailer.sendMail", { attributes: { "messaging.system": "sendgrid" } })(
+        function*(msg_: EmailMsgOptionalFrom) {
+          const msg: EmailMsg = dropUndefinedT({
+            ...msg_,
+            from: msg_.from ?? defaultFrom,
+            replyTo: msg_.replyTo ?? (msg_.from ? undefined : defaultReplyTo)
+          })
+          const render = renderMessage(!realMail, fakeMailAddress)
 
-        const renderedMsg_ = render(msg)
-        const renderedMsg = {
-          ...renderedMsg_ as Omit<typeof renderedMsg_, "content">,
-          subject: `${subjectPrefix}${renderedMsg_.subject}`,
-          ..."content" in renderedMsg_
-            ? { content: [...renderedMsg_.content] as [MailContent, ...MailContent[]] }
-            : {}
-        }
-        yield* InfraLogger.logDebug("Sending email").pipe(Effect.annotateLogs("msg", inspect(renderedMsg, false, 5)))
+          const renderedMsg_ = render(msg)
+          const renderedMsg = {
+            ...renderedMsg_ as Omit<typeof renderedMsg_, "content">,
+            subject: `${subjectPrefix}${renderedMsg_.subject}`,
+            ..."content" in renderedMsg_
+              ? { content: [...renderedMsg_.content] as [MailContent, ...MailContent[]] }
+              : {}
+          }
+          yield* InfraLogger.logDebug("Sending email").pipe(Effect.annotateLogs("msg", inspect(renderedMsg, false, 5)))
 
-        const ret = yield* Effect
-          .callback<
-            [sgMail.ClientResponse, Record<string, unknown>],
-            Error | sgMail.ResponseError
-          >(
-            (resume) =>
-              void sgMail.send(
-                renderedMsg as any, // sue me
-                msg.isMultiple ?? true,
-                (err, result) =>
-                  err
-                    ? resume(Effect.fail(err))
-                    : resume(Effect.sync(() => result))
-              )
-          )
-          .pipe(Effect.mapError((raw) => new SendMailError({ raw })))
+          const ret = yield* Effect
+            .callback<
+              [sgMail.ClientResponse, Record<string, unknown>],
+              Error | sgMail.ResponseError
+            >(
+              (resume) =>
+                void sgMail.send(
+                  renderedMsg as any, // sue me
+                  msg.isMultiple ?? true,
+                  (err, result) =>
+                    err
+                      ? resume(Effect.fail(err))
+                      : resume(Effect.sync(() => result))
+                )
+            )
+            .pipe(Effect.mapError((raw) => new SendMailError({ raw })))
 
-        // const event = {
-        //   name: "EmailSent",
-        //   properties: {
-        //     templateId: msg.templateId
-        //   }
-        // }
-        // yield* InfraLogger.logDebug("Tracking email event").annotateLogs("event", event.$$.pretty)
-        // const { trackEvent } = yield* AiContextService
-        // trackEvent(event)
-        return ret
-      })
+          // const event = {
+          //   name: "EmailSent",
+          //   properties: {
+          //     templateId: msg.templateId
+          //   }
+          // }
+          // yield* InfraLogger.logDebug("Tracking email event").annotateLogs("event", event.$$.pretty)
+          // const { trackEvent } = yield* AiContextService
+          // trackEvent(event)
+          return ret
+        }
+      )
     })
   })
 
@@ -68,23 +75,24 @@ export function Sendgrid(config: SendgridConfig) {
 /**
  * @hidden
  */
-export function renderMessage(forceFake: boolean) {
+export function renderMessage(forceFake: boolean, fakeMailAddress: string) {
   let i = 0
   const makeId = () => i++
+  const makeFakeEmail = () => fakeMailAddress.replace("{i}", String(makeId()))
   return forceFake
     ? (msg: EmailMsg) =>
       dropUndefinedT({
         ...msg,
-        to: msg.to && renderFake(msg.to, makeId),
-        cc: msg.cc && renderFake(msg.cc, makeId),
-        bcc: msg.bcc && renderFake(msg.bcc, makeId)
+        to: msg.to && renderFake(msg.to, makeFakeEmail),
+        cc: msg.cc && renderFake(msg.cc, makeFakeEmail),
+        bcc: msg.bcc && renderFake(msg.bcc, makeFakeEmail)
       })
     : (msg: EmailMsg) =>
       dropUndefinedT({
         ...msg,
-        to: msg.to && renderFakeIfTest(msg.to, makeId),
-        cc: msg.cc && renderFakeIfTest(msg.cc, makeId),
-        bcc: msg.bcc && renderFakeIfTest(msg.bcc, makeId)
+        to: msg.to && renderFakeIfTest(msg.to, makeFakeEmail),
+        cc: msg.cc && renderFakeIfTest(msg.cc, makeFakeEmail),
+        bcc: msg.bcc && renderFakeIfTest(msg.bcc, makeFakeEmail)
       })
 }
 
@@ -100,10 +108,10 @@ export function isTestAddress(to: EmailData) {
   )
 }
 
-function renderFake(addr: EmailData | readonly EmailData[], makeId: () => number) {
+function renderFake(addr: EmailData | readonly EmailData[], makeEmail: () => string) {
   return {
     name: renderMailData(addr),
-    email: `test+${makeId()}@nomizz.com`
+    email: makeEmail()
   }
 }
 const eq = Equivalence.mapInput(
@@ -117,14 +125,14 @@ function isEmailDataArray(md: EmailData | readonly EmailData[]): md is readonly
 
 // TODO: should just not add any already added email address
 // https://stackoverflow.com/a/53603076/11595834
-function renderFakeIfTest(addr: EmailData | readonly EmailData[], makeId: () => number) {
+function renderFakeIfTest(addr: EmailData | readonly EmailData[], makeEmail: () => string) {
   if (isEmailDataArray(addr)) {
     return Array.dedupeWith(
-      addr.map((x) => (isTestAddress(x) ? renderFake(x, makeId) : x)),
+      addr.map((x) => (isTestAddress(x) ? renderFake(x, makeEmail) : x)),
       eq
     )
   }
-  return isTestAddress(addr) ? renderFake(addr, makeId) : addr
+  return isTestAddress(addr) ? renderFake(addr, makeEmail) : addr
 }
 
 function renderMailData(md: EmailData | readonly EmailData[]): string {

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"
@@ -7,7 +7,7 @@ const makeFake = InfraLogger
   .logInfo("FAKE Emailer Service enabled")
   .pipe(Effect.map(() =>
     Emailer.of({
-      sendMail: Effect.fn("Fake.sendMail")((msg) =>
+      sendMail: Effect.fn("Emailer.sendMail", { attributes: { "messaging.system": "fake" } })((msg) =>
         InfraLogger
           .logDebug(`Fake send mail`)
           .pipe(Effect.annotateLogs("msg", pretty(msg)))

package/src/Emailer/service.ts

@@ -1,13 +1,17 @@
 import type { MailContent, MailData } from "@sendgrid/helpers/classes/mail.js"
 import type { ResponseError } from "@sendgrid/mail"
-import { Data, type Effect, type NonEmptyReadonlyArray, type Redacted, ServiceMap } 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
 }> {}
 
-export class Emailer extends ServiceMap.Opaque<Emailer, {
+export class Emailer extends Context.Opaque<Emailer, {
   sendMail: (msg: EmailMsgOptionalFrom) => Effect.Effect<void, SendMailError>
 }>()("effect-app/Emailer") {}
 
@@ -21,7 +25,13 @@ export interface SendgridConfig {
   subjectPrefix: string
   realMail: boolean
   defaultFrom: EmailData
-  apiKey: Redacted.Redacted<string>
+  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
 }
 export type EmailTemplateMsg = MailData & { templateId: string }
 

package/src/MainFiberSet.ts

@@ -1,14 +1,17 @@
-import { Effect, Fiber, FiberSet, Layer, ServiceMap } from "effect-app"
-import type {} from "effect/Scope"
+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"
 import { setRootParentSpan } from "./RequestFiberSet.js"
 
 const make = Effect.gen(function*() {
   const set = yield* FiberSet.make<unknown, never>()
-  const add = (...fibers: Fiber.Fiber<never, never>[]) =>
-    Effect.sync(() => fibers.forEach((_) => FiberSet.addUnsafe(set, _)))
-  const addAll = (fibers: readonly Fiber.Fiber<never, never>[]) =>
+  const add = (...fibers: Fiber.Fiber<never>[]) => Effect.sync(() => fibers.forEach((_) => FiberSet.addUnsafe(set, _)))
+  const addAll = (fibers: readonly Fiber.Fiber<never>[]) =>
     Effect.sync(() => fibers.forEach((_) => FiberSet.addUnsafe(set, _)))
   const join = FiberSet.size(set).pipe(
     Effect.andThen((count) => InfraLogger.logDebug(`Joining ${count} current fibers on the MainFiberSet`)),
@@ -62,15 +65,14 @@ const make = Effect.gen(function*() {
  * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
  * This way any errors will blow up the main program instead of fibers dying unknowingly.
  */
-export class MainFiberSet extends ServiceMap.Service<MainFiberSet>()("MainFiberSet", { make }) {
+export class MainFiberSet extends Context.Service<MainFiberSet>()("MainFiberSet", { make }) {
   static readonly Live = Layer.effect(this, this.make)
-  static readonly JoinLive = this.asEffect().pipe(
+  static readonly JoinLive = this.pipe(
     Effect.andThen((_) => _.join),
     Layer.effectDiscard,
     Layer.provide(this.Live)
   )
-  static readonly run = <A, R>(self: Effect.Effect<A, never, R>) =>
-    this.asEffect().pipe(Effect.andThen((_) => _.run(self)))
+  static readonly run = <A, R>(self: Effect.Effect<A, never, R>) => this.pipe(Effect.andThen((_) => _.run(self)))
   static readonly forkDaemonReport = <A, E, R>(self: Effect.Effect<A, E, R>) =>
-    this.asEffect().pipe(Effect.andThen((_) => _.forkDaemonReport(self)))
+    this.pipe(Effect.andThen((_) => _.forkDaemonReport(self)))
 }

package/src/Model/Repository/Registry.ts

@@ -0,0 +1,34 @@
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+
+export interface RegisteredRepository {
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void>
+}
+
+const make = Effect.sync(() => {
+  const repos = new Map<string, RegisteredRepository>()
+  return {
+    register(modelName: string, repo: RegisteredRepository) {
+      repos.set(modelName, repo)
+    },
+    seedNamespace: (namespace: string) =>
+      Effect.suspend(() =>
+        Effect.forEach(
+          repos.values(),
+          (r) => r.seedNamespace(namespace),
+          { concurrency: "unbounded", discard: true }
+        )
+      ),
+    get entries(): ReadonlyMap<string, RegisteredRepository> {
+      return repos
+    }
+  }
+})
+
+export class RepositoryRegistry extends Context.Opaque<RepositoryRegistry, {
+  readonly register: (modelName: string, repo: RegisteredRepository) => void
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void>
+  readonly entries: ReadonlyMap<string, RegisteredRepository>
+}>()("effect-app/RepositoryRegistry", { make }) {}
+
+export const RepositoryRegistryLive = RepositoryRegistry.toLayer(RepositoryRegistry.make)