@effect-app/infra 4.0.0-beta.68 → 4.0.0-beta.69

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @effect-app/infra
 
+## 4.0.0-beta.69
+
+### Patch Changes
+
+- dc465e3: update to latest effect beta
+- Updated dependencies [dc465e3]
+  - effect-app@4.0.0-beta.69
+
 ## 4.0.0-beta.68
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.68",
+  "version": "4.0.0-beta.69",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.68"
+    "effect-app": "4.0.0-beta.69"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.2",
@@ -39,7 +39,7 @@
   "peerDependencies": {
     "@azure/cosmos": "^4.9.2",
     "@azure/service-bus": "^7.9.5",
-    "@effect/vitest": "^4.0.0-beta.43",
+    "@effect/vitest": "^4.0.0-beta.46",
     "@sendgrid/helpers": "^8.0.0",
     "@sendgrid/mail": "^8.1.6",
     "@sentry/node": "10.47.0",
@@ -47,7 +47,7 @@
     "jwt-decode": "^4.0.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
-    "effect": "^4.0.0-beta.43",
+    "effect": "^4.0.0-beta.46",
     "express": "^5.2.1"
   },
   "typesVersions": {

package/src/QueueMaker/SQLQueue.ts

@@ -3,8 +3,9 @@ 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 { NonEmptyString255 } from "effect-app/Schema"
+import { DateTimeUtcFromDate, type NonEmptyString255 } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
+import { Override } from "effect/unstable/schema/Model"
 import { SqlClient } from "effect/unstable/sql"
 import { SQLModel } from "../adapters/SQL.js"
 import { InfraLogger } from "../logger.js"
@@ -78,31 +79,38 @@ export function makeSQLQueue<
 
     const q = {
       offer: Effect.fnUntraced(function*(body: Evt, meta: typeof QueueMeta.Type) {
+        const now = S.decodeSync(DateTimeUtcFromDate)(new Date())
         yield* queueRepo.insertVoid({
           body,
           meta,
           name: queueName,
           processingAt: Option.none(),
           finishedAt: Option.none(),
-          etag: crypto.randomUUID()
+          etag: crypto.randomUUID(),
+          createdAt: Override(now),
+          updatedAt: Override(now)
         })
       }),
       take: Effect.gen(function*() {
         while (true) {
+          const now = S.decodeSync(DateTimeUtcFromDate)(new Date())
           const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)) // disable sql tracer otherwise we spam it..
           if (first) {
             const dec = yield* decodeDrain(first)
-            const { createdAt, updatedAt, ...rest } = dec
+            const { updatedAt, ...rest } = dec
             return yield* drainRepo.update(
-              { ...rest, processingAt: Option.some(new Date()) } // auto in lib , etag: crypto.randomUUID()
+              { ...rest, updatedAt: Override(now), processingAt: Option.some(new Date()) } // auto in lib , etag: crypto.randomUUID()
             )
           }
           if (first) return first
           yield* Effect.sleep(250)
         }
       }),
-      finish: ({ createdAt, updatedAt, ...q }: Drain) =>
-        drainRepo.updateVoid({ ...q, finishedAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
+      finish: Effect.fn(function*({ updatedAt, ...q }: Drain) {
+        const now = S.decodeSync(DateTimeUtcFromDate)(new Date())
+
+        return yield* drainRepo.updateVoid({ ...q, updatedAt: Override(now), finishedAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
+      })
     }
     const queue = {
       publish: (...messages: NonEmptyReadonlyArray<Evt>) =>

package/src/Store/Disk.ts

@@ -142,7 +142,7 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
           const storesSem = Semaphore.makeUnsafe(1)
           const primary = yield* makeDiskStoreInt(prefix, idKey, "primary", dir, name, seed, config?.defaultValues)
           const stores = new Map<string, Store<IdKey, Encoded>>([["primary", primary]])
-          const ctx = yield* Effect.services<R>()
+          const ctx = yield* Effect.context<R>()
           const getStore = !config?.allowNamespace
             ? Effect.succeed(primary)
             : storeId.asEffect().pipe(Effect.flatMap((namespace) => {

package/src/Store/Memory.ts

@@ -265,7 +265,7 @@ export const makeMemoryStore = () => ({
         seed,
         config?.defaultValues
       )
-      const ctx = yield* Effect.services<R>()
+      const ctx = yield* Effect.context<R>()
       const stores = new Map([["primary", primary]])
       const getStore = !config?.allowNamespace
         ? Effect.succeed(primary)

package/src/api/internal/events.ts

@@ -16,7 +16,7 @@ export const makeSSE = <A extends { id: any }, SI, SR>(
   Effect
     .gen(function*() {
       const id = connId++
-      const ctx = yield* Effect.services<R | SR>()
+      const ctx = yield* Effect.context<R | SR>()
       const res = HttpServerResponse.stream(
         // workaround for different scoped behaviour for streams in Bun
         // https://discord.com/channels/795981131316985866/1098177242598756412/1389646879675125861

package/test/query.test.ts

@@ -520,8 +520,8 @@ it(
         const schema = S.Struct({
           id: S.String,
           createdAt: S.Date.pipe(
-            S.withDecodingDefault(() => new Date().toISOString()),
-            S.withConstructorDefault(() => Option.some(new Date()))
+            S.withDecodingDefault(Effect.sync(() => new Date().toISOString())),
+            S.withConstructorDefault(Effect.sync(() => new Date()))
           )
         })
         const repo = yield* makeRepo(
@@ -533,8 +533,8 @@ it(
         const outputSchema = S.Struct({
           id: S.Literal("123"),
           createdAt: S.Date.pipe(
-            S.withDecodingDefault(() => new Date().toISOString()),
-            S.withConstructorDefault(() => Option.some(new Date()))
+            S.withDecodingDefault(Effect.sync(() => new Date().toISOString())),
+            S.withConstructorDefault(Effect.sync(() => new Date()))
           )
         })
 

package/test/requires.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, expectTypeOf, it } from "@effect/vitest"
-import { Effect, Layer, Result, S, Context } from "effect-app"
+import { Context, Effect, Layer, Result, S } from "effect-app"
 import { NotLoggedInError, UnauthorizedError } from "effect-app/client"
 import { HttpHeaders } from "effect-app/http"
 import * as RpcX from "effect-app/rpc"
@@ -63,6 +63,7 @@ const testSuite = (_mw: typeof middleware3) =>
       "works",
       Effect.fn(function*() {
         const defaultOpts = {
+          client: null as any, // TODO?
           headers: HttpHeaders.fromRecordUnsafe({}),
           payload: { _tag: "Test" },
           clientId: 0,