@effect-app/infra 4.0.0-beta.120 → 4.0.0-beta.122

package/src/Store/utils.ts

@@ -12,33 +12,34 @@ export const makeETag = <E extends PersistenceModelType<{}>>(
     _etag: crypto.createHash("sha256").update(JSON.stringify(e)).digest("hex")
   }) as any
 
-export const makeUpdateETag =
-  (type: string) =>
-  <IdKey extends keyof E, E extends PersistenceModelType<{}>>(e: E, idKey: IdKey, current: Option.Option<E>) =>
-    Effect.gen(function*() {
-      if (e._etag) {
-        if (Option.isNone(current)) {
-          return yield* new OptimisticConcurrencyException({
-            type,
-            id: e[idKey] as string,
-            current: "",
-            found: e._etag,
-            code: 409
-          })
-        }
-      }
-      if (Option.isSome(current) && current.value._etag !== e._etag) {
+export const makeUpdateETag = (type: string) =>
+  Effect.fnUntraced(function*<IdKey extends keyof E, E extends PersistenceModelType<{}>>(
+    e: E,
+    idKey: IdKey,
+    current: Option.Option<E>
+  ) {
+    if (e._etag) {
+      if (Option.isNone(current)) {
         return yield* new OptimisticConcurrencyException({
           type,
-          id: current.value[idKey] as string,
-          current: current.value._etag,
+          id: e[idKey] as string,
+          current: "",
           found: e._etag,
-          code: 412
+          code: 409
         })
       }
-      const newE = makeETag(e)
-      return newE
-    })
+    }
+    if (Option.isSome(current) && current.value._etag !== e._etag) {
+      return yield* new OptimisticConcurrencyException({
+        type,
+        id: current.value[idKey] as string,
+        current: current.value._etag,
+        found: e._etag,
+        code: 412
+      })
+    }
+    return makeETag(e)
+  })
 
 export function lowercaseIfString<T>(val: T) {
   if (typeof val === "string") {

package/src/adapters/ServiceBus.ts

@@ -24,32 +24,29 @@ export class ServiceBusClientTag
   static readonly layer = (url: string) => this.toLayer(this.make(url))
 }
 
-function makeSender_(queueName: string) {
-  return Effect.gen(function*() {
-    const serviceBusClient = yield* ServiceBusClientTag
-
-    return yield* Effect.acquireRelease(
-      Effect.sync(() => serviceBusClient.createSender(queueName)).pipe(
-        withSpanAndLog(`ServiceBus.sender.create ${queueName}`)
-      ),
-      (sender) => Effect.promise(() => sender.close()).pipe(withSpanAndLog(`ServiceBus.sender.close ${queueName}`))
-    )
-  })
-}
-
-const makeSender = (name: string) =>
-  Effect.gen(function*() {
-    const sender = yield* makeSender_(name)
-    const sendMessages = Effect.fnUntraced(function*(
-      messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch,
-      options?: Omit<OperationOptionsBase, "abortSignal">
-    ) {
-      return yield* Effect.promise((abortSignal) => sender.sendMessages(messages, { ...options, abortSignal }))
-    })
+const makeSender_ = Effect.fnUntraced(function*(queueName: string) {
+  const serviceBusClient = yield* ServiceBusClientTag
+
+  return yield* Effect.acquireRelease(
+    Effect.sync(() => serviceBusClient.createSender(queueName)).pipe(
+      withSpanAndLog(`ServiceBus.sender.create ${queueName}`)
+    ),
+    (sender) => Effect.promise(() => sender.close()).pipe(withSpanAndLog(`ServiceBus.sender.close ${queueName}`))
+  )
+})
 
-    return { name, sendMessages }
+const makeSender = Effect.fnUntraced(function*(name: string) {
+  const sender = yield* makeSender_(name)
+  const sendMessages = Effect.fnUntraced(function*(
+    messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch,
+    options?: Omit<OperationOptionsBase, "abortSignal">
+  ) {
+    return yield* Effect.promise((abortSignal) => sender.sendMessages(messages, { ...options, abortSignal }))
   })
 
+  return { name, sendMessages }
+})
+
 export class Sender extends Context.Opaque<Sender, {
   name: string
   sendMessages: (
@@ -71,97 +68,96 @@ export const SenderTag = <Id>() => <Key extends string>(queueName: Key) => {
   })
 }
 
-const makeReceiver = (name: string) =>
-  Effect.gen(function*() {
-    const serviceBusClient = yield* ServiceBusClientTag
-
-    const makeReceiver = Effect.fnUntraced(
-      function*(queueName: string, waitTillEmpty: Effect.Effect<void>, sessionId?: string) {
-        return yield* Effect.acquireRelease(
-          (sessionId
-            ? Effect.promise(() => serviceBusClient.acceptSession(queueName, sessionId))
-            : Effect.sync(() => serviceBusClient.createReceiver(queueName)))
-            .pipe(withSpanAndLog(`ServiceBus.receiver.create ${queueName}.${sessionId}`)),
-          (r) =>
-            waitTillEmpty.pipe(
-              withSpanAndLog(`ServiceBus.receiver.waitTillEmpty ${queueName}.${sessionId}`),
-              Effect.andThen(
-                Effect.promise(() => r.close()).pipe(
-                  withSpanAndLog(`ServiceBus.receiver.close ${queueName}.${sessionId}`)
-                )
-              ),
-              withSpanAndLog(`ServiceBus.receiver.release ${queueName}.${sessionId}`)
-            )
+const makeReceiver = Effect.fnUntraced(function*(name: string) {
+  const serviceBusClient = yield* ServiceBusClientTag
+
+  const makeReceiver = Effect.fnUntraced(
+    function*(queueName: string, waitTillEmpty: Effect.Effect<void>, sessionId?: string) {
+      return yield* Effect.acquireRelease(
+        (sessionId
+          ? Effect.promise(() => serviceBusClient.acceptSession(queueName, sessionId))
+          : Effect.sync(() => serviceBusClient.createReceiver(queueName)))
+          .pipe(withSpanAndLog(`ServiceBus.receiver.create ${queueName}.${sessionId}`)),
+        (r) =>
+          waitTillEmpty.pipe(
+            withSpanAndLog(`ServiceBus.receiver.waitTillEmpty ${queueName}.${sessionId}`),
+            Effect.andThen(
+              Effect.promise(() => r.close()).pipe(
+                withSpanAndLog(`ServiceBus.receiver.close ${queueName}.${sessionId}`)
+              )
+            ),
+            withSpanAndLog(`ServiceBus.receiver.release ${queueName}.${sessionId}`)
+          )
+      )
+    }
+  )
+
+  const make = (waitTillEmpty: Effect.Effect<void>) => makeReceiver(name, waitTillEmpty)
+
+  const makeSession = (sessionId: string, waitTillEmpty: Effect.Effect<void>) =>
+    makeReceiver(name, waitTillEmpty, sessionId)
+
+  return {
+    name,
+    make,
+    makeSession,
+    subscribe: Effect.fnUntraced(function*<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string) {
+      const fs = yield* FiberSet.make()
+      const fr = yield* FiberSet.runtime(fs)<RMsg | RErr>()
+      const wait = Effect
+        .gen(function*() {
+          if ((yield* FiberSet.size(fs)) > 0) {
+            yield* InfraLogger.logDebug("Waiting ServiceBusFiberSet to be empty: " + (yield* FiberSet.size(fs)))
+          }
+          while ((yield* FiberSet.size(fs)) > 0) yield* Effect.sleep("250 millis")
+        })
+      const r = yield* sessionId
+        ? makeSession(
+          sessionId,
+          wait
+        )
+        : make(wait)
+
+      const runEffect = <E>(effect: Effect.Effect<void, E, RMsg | RErr>) =>
+        new Promise<void>((resolve, reject) =>
+          fr(effect)
+            .addObserver((exit) => {
+              if (Exit.isSuccess(exit)) {
+                resolve(exit.value)
+              } else {
+                // disable @typescript-eslint/prefer-promise-reject-errors
+                reject(Cause.pretty(exit.cause))
+              }
+            })
         )
-      }
-    )
 
-    const make = (waitTillEmpty: Effect.Effect<void>) => makeReceiver(name, waitTillEmpty)
-
-    const makeSession = (sessionId: string, waitTillEmpty: Effect.Effect<void>) =>
-      makeReceiver(name, waitTillEmpty, sessionId)
-
-    return {
-      name,
-      make,
-      makeSession,
-      subscribe: Effect.fnUntraced(function*<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string) {
-        const fs = yield* FiberSet.make()
-        const fr = yield* FiberSet.runtime(fs)<RMsg | RErr>()
-        const wait = Effect
-          .gen(function*() {
-            if ((yield* FiberSet.size(fs)) > 0) {
-              yield* InfraLogger.logDebug("Waiting ServiceBusFiberSet to be empty: " + (yield* FiberSet.size(fs)))
-            }
-            while ((yield* FiberSet.size(fs)) > 0) yield* Effect.sleep("250 millis")
-          })
-        const r = yield* sessionId
-          ? makeSession(
-            sessionId,
-            wait
-          )
-          : make(wait)
-
-        const runEffect = <E>(effect: Effect.Effect<void, E, RMsg | RErr>) =>
-          new Promise<void>((resolve, reject) =>
-            fr(effect)
-              .addObserver((exit) => {
-                if (Exit.isSuccess(exit)) {
-                  resolve(exit.value)
-                } else {
-                  // disable @typescript-eslint/prefer-promise-reject-errors
-                  reject(Cause.pretty(exit.cause))
-                }
+      yield* Effect.acquireRelease(
+        Effect
+          .sync(() => {
+            const s = r
+              .subscribe({
+                processError: (err) =>
+                  runEffect(
+                    hndlr
+                      .processError(err)
+                      .pipe(
+                        Effect.catchCause((cause) => Effect.logError(`ServiceBus Error ${sessionId}`, cause))
+                      )
+                  ),
+                processMessage: (msg) => runEffect(hndlr.processMessage(msg))
+                // DO NOT CATCH ERRORS here as they should return to the queue!
               })
+            return { close: Effect.promise(() => s.close()) }
+          })
+          .pipe(withSpanAndLog(`ServiceBus.subscription.create ${sessionId}`)),
+        (subscription) =>
+          subscription.close.pipe(
+            withSpanAndLog(`ServiceBus.subscription.close ${sessionId}`)
           )
-
-        yield* Effect.acquireRelease(
-          Effect
-            .sync(() => {
-              const s = r
-                .subscribe({
-                  processError: (err) =>
-                    runEffect(
-                      hndlr
-                        .processError(err)
-                        .pipe(
-                          Effect.catchCause((cause) => Effect.logError(`ServiceBus Error ${sessionId}`, cause))
-                        )
-                    ),
-                  processMessage: (msg) => runEffect(hndlr.processMessage(msg))
-                  // DO NOT CATCH ERRORS here as they should return to the queue!
-                })
-              return { close: Effect.promise(() => s.close()) }
-            })
-            .pipe(withSpanAndLog(`ServiceBus.subscription.create ${sessionId}`)),
-          (subscription) =>
-            subscription.close.pipe(
-              withSpanAndLog(`ServiceBus.subscription.close ${sessionId}`)
-            )
-        ) as Effect.Effect<void, never, Scope.Scope> // wth is going on here
-      })
-    }
-  })
+      ) as Effect.Effect<void, never, Scope.Scope> // wth is going on here
+    })
+  }
+})
 
 export class Receiver extends Context.Opaque<Receiver, {
   name: string

package/src/api/internal/auth.ts

@@ -45,12 +45,14 @@ export const checkJwt = (config: Config) => {
   return HttpMiddleware.make((app) =>
     Effect.gen(function*() {
       const req = yield* HttpServerRequest.HttpServerRequest
-      const response = yield* check(req.headers).pipe(Effect.catch((e) =>
-        HttpServerResponse.json({ message: e.message }, {
-          status: e.status,
-          headers: HttpHeaders.fromInput(e.headers)
-        })
-      ))
+      const response = yield* check(req.headers).pipe(
+        Effect.catch((e) =>
+          HttpServerResponse.json({ message: e.message }, {
+            status: e.status,
+            headers: HttpHeaders.fromInput(e.headers)
+          })
+        )
+      )
       if (response) {
         return response
       }

package/src/api/routing/middleware/middleware.ts

@@ -157,15 +157,14 @@ export const requiresTransactionConfig = RpcContextMap.makeCustom()(Schema.Never
  * )
  * ```
  */
-export const makeSqlTransactionMiddleware = (
+export const makeSqlTransactionMiddleware = Effect.fnUntraced(function*(
   rcm: { getConfig: (rpc: Rpc.AnyWithProps) => { readonly requiresTransaction?: boolean } }
-) =>
-  Effect.gen(function*() {
-    const withTx = yield* WithNsTransaction
-    const mw: RpcMiddleware.RpcMiddlewareV4<never, never, never> = (effect, { rpc }) => {
-      const { requiresTransaction } = rcm.getConfig(rpc)
-      if (requiresTransaction !== true) return effect
-      return withTx(effect)
-    }
-    return mw
-  })
+) {
+  const withTx = yield* WithNsTransaction
+  const mw: RpcMiddleware.RpcMiddlewareV4<never, never, never> = (effect, { rpc }) => {
+    const { requiresTransaction } = rcm.getConfig(rpc)
+    if (requiresTransaction !== true) return effect
+    return withTx(effect)
+  }
+  return mw
+})

package/src/errorReporter.ts

@@ -13,47 +13,41 @@ const tryCauseException = <E>(cause: Cause.Cause<E>, name: string): CauseExcepti
   }
 }
 
-export function reportError(
-  name: string
-) {
-  return (
-    cause: Cause.Cause<unknown>,
-    extras?: Record<string, unknown>,
-    level: LogLevel.Severity = "Error"
-  ) =>
-    Effect
-      .gen(function*() {
-        if (Cause.hasInterruptsOnly(cause)) {
-          yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs("extras", JSON.stringify(extras ?? {})))
-          return
-        }
-        const error = tryCauseException(cause, name)
-
-        yield* reportSentry(error, extras, LogLevelToSentry(level))
-        yield* InfraLogger
-          .logWithLevel(level, "Reporting error", cause)
-          .pipe(
-            Effect.annotateLogs(dropUndefined({
-              extras,
-              error: tryToReport(error),
-              cause: tryToJson(cause),
-              __error_name__: name
-            }))
-          )
-          .pipe(
-            Effect.catchCause((cause) => InfraLogger.logWarning("Failed to log error", cause)),
-            Effect.catchCause(() => InfraLogger.logFatal("Failed to log error cause"))
-          )
+export function reportError(name: string) {
+  return Effect.fnUntraced(
+    function*(
+      cause: Cause.Cause<unknown>,
+      extras?: Record<string, unknown>,
+      level: LogLevel.Severity = "Error"
+    ) {
+      if (Cause.hasInterruptsOnly(cause)) {
+        yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs("extras", JSON.stringify(extras ?? {})))
+        return
+      }
+      const error = tryCauseException(cause, name)
 
-        return error
-      })
-      .pipe(
-        Effect.tapCause((cause) =>
-          InfraLogger.logError("Failed to report error", cause).pipe(
-            Effect.tapCause(() => InfraLogger.logFatal("Failed to log error cause"))
-          )
+      yield* reportSentry(error, extras, LogLevelToSentry(level))
+      yield* InfraLogger
+        .logWithLevel(level, "Reporting error", cause)
+        .pipe(
+          Effect.annotateLogs(dropUndefined({
+            extras,
+            error: tryToReport(error),
+            cause: tryToJson(cause),
+            __error_name__: name
+          })),
+          Effect.catchCause((cause) => InfraLogger.logWarning("Failed to log error", cause)),
+          Effect.catchCause(() => InfraLogger.logFatal("Failed to log error cause"))
         )
-      )
+
+      return error
+    },
+    (effect) =>
+      Effect.tapCause(effect, (cause) =>
+        InfraLogger.logError("Failed to report error", cause).pipe(
+          Effect.tapCause(() => InfraLogger.logFatal("Failed to log error cause"))
+        ))
+  )
 }
 
 function reportSentry(
@@ -72,39 +66,31 @@ function reportSentry(
   }))
 }
 
-export function logError<E>(
-  name: string
-) {
-  return (cause: Cause.Cause<E>, extras?: Record<string, unknown>) =>
-    Effect
-      .gen(function*() {
-        if (Cause.hasInterruptsOnly(cause)) {
-          yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs(dropUndefined({ extras })))
-          return
-        }
-        yield* InfraLogger
-          .logWarning("Logging error", cause)
-          .pipe(
-            Effect.annotateLogs(dropUndefined({
-              extras,
-              cause: tryToJson(cause),
-              __error_name__: name
-            }))
-          )
-      })
-      .pipe(
-        Effect.tapCause(() => InfraLogger.logFatal("Failed to log error cause"))
-      )
+export function logError<E>(name: string) {
+  return Effect.fnUntraced(
+    function*(cause: Cause.Cause<E>, extras?: Record<string, unknown>) {
+      if (Cause.hasInterruptsOnly(cause)) {
+        yield* InfraLogger.logDebug("Interrupted").pipe(Effect.annotateLogs(dropUndefined({ extras })))
+        return
+      }
+      yield* InfraLogger
+        .logWarning("Logging error", cause)
+        .pipe(Effect.annotateLogs(dropUndefined({
+          extras,
+          cause: tryToJson(cause),
+          __error_name__: name
+        })))
+    },
+    (effect) => Effect.tapCause(effect, () => InfraLogger.logFatal("Failed to log error cause"))
+  )
 }
 
-export function reportMessage(message: string, extras?: Record<string, unknown>) {
-  return Effect.gen(function*() {
-    const context = yield* getRC
-    const scope = new Sentry.Scope()
-    if (context) scope.setContext("context", { ...context })
-    if (extras) scope.setContext("extras", extras)
-    Sentry.captureMessage(message, scope)
+export const reportMessage = Effect.fnUntraced(function*(message: string, extras?: Record<string, unknown>) {
+  const context = yield* getRC
+  const scope = new Sentry.Scope()
+  if (context) scope.setContext("context", { ...context })
+  if (extras) scope.setContext("extras", extras)
+  Sentry.captureMessage(message, scope)
 
-    console.warn(message, extras)
-  })
-}
+  console.warn(message, extras)
+})

package/test/dist/repository-ext.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository-ext.test.d.ts","sourceRoot":"","sources":["../repository-ext.test.ts"],"names":[],"mappings":""}

package/test/query.test.ts

@@ -548,6 +548,33 @@ it(
       .pipe(Effect.provide(TestStoreLive), setupRequestContextFromCurrent(), Effect.runPromise)
 )
 
+it(
+  "project with encodeKeys in projection maps encoded keys",
+  () =>
+    Effect
+      .gen(function*() {
+        const schema = S.Struct({
+          id: S.String,
+          a: S.Number
+        })
+
+        const repo = yield* makeRepo(
+          "test",
+          schema,
+          {
+            makeInitial: Effect.sync(() => [{ id: "1", a: 1 }])
+          }
+        )
+
+        const outputSchema = S.Struct({ b: S.Number }).pipe(S.encodeKeys({ b: "a" }))
+
+        const result = yield* repo.query(project(outputSchema))
+
+        expect(result).toStrictEqual([{ b: 1 }])
+      })
+      .pipe(Effect.provide(TestStoreLive), setupRequestContextFromCurrent(), Effect.runPromise)
+)
+
 it(
   "doesn't mess when refining fields",
   () =>

package/test/repository-ext.test.ts

@@ -0,0 +1,58 @@
+import { describe, expect, it } from "@effect/vitest"
+import { Effect, Layer, S } from "effect-app"
+import { setupRequestContextFromCurrent } from "../src/api/setupRequest.js"
+import { makeRepo } from "../src/Model/Repository.js"
+import { RepositoryRegistryLive } from "../src/Model/Repository/Registry.js"
+import { MemoryStoreLive } from "../src/Store/Memory.js"
+
+class BatchItem extends S.Class<BatchItem>("BatchItem")({
+  id: S.String,
+  label: S.String
+}) {}
+
+const TestStoreLive = Layer.merge(MemoryStoreLive, RepositoryRegistryLive)
+
+describe("repository ext save/remove batching", () => {
+  it.effect("supports save batching overload", () =>
+    Effect.gen(function*() {
+      const repo = yield* makeRepo("BatchItem", BatchItem, {})
+      const items = [
+        new BatchItem({ id: "1", label: "one" }),
+        new BatchItem({ id: "2", label: "two" }),
+        new BatchItem({ id: "3", label: "three" }),
+        new BatchItem({ id: "4", label: "four" })
+      ] as const
+
+      yield* repo.save(items, { batch: 2 })
+
+      const all = yield* repo.all
+      expect(all).toHaveLength(4)
+      expect(all.map((_) => _.id).toSorted()).toEqual(["1", "2", "3", "4"])
+    }).pipe(
+      setupRequestContextFromCurrent(),
+      Effect.provide(TestStoreLive)
+    )
+  )
+
+  it.effect("supports remove batching overload", () =>
+    Effect.gen(function*() {
+      const repo = yield* makeRepo("BatchItem", BatchItem, {})
+      const items = [
+        new BatchItem({ id: "1", label: "one" }),
+        new BatchItem({ id: "2", label: "two" }),
+        new BatchItem({ id: "3", label: "three" }),
+        new BatchItem({ id: "4", label: "four" })
+      ] as const
+
+      yield* repo.save(items)
+      yield* repo.remove([items[0], items[1], items[2]], { batch: true })
+
+      const all = yield* repo.all
+      expect(all).toHaveLength(1)
+      expect(all[0]?.id).toBe("4")
+    }).pipe(
+      setupRequestContextFromCurrent(),
+      Effect.provide(TestStoreLive)
+    )
+  )
+})