@effect-app/infra 0.235.1 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.235.1",
+  "version": "1.0.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,10 +18,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "effect-app": "0.203.1",
-    "@effect-app/core": "0.170.0",
-    "@effect-app/schema": "0.221.1",
-    "@effect-app/infra-adapters": "0.155.1"
+    "@effect-app/core": "1.0.0",
+    "effect-app": "1.0.0",
+    "@effect-app/schema": "1.0.0",
+    "@effect-app/infra-adapters": "1.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",
@@ -42,9 +42,9 @@
   },
   "peerDependencies": {
     "express": "^4.19.2",
-    "@effect/platform": "^0.48.28",
-    "@effect/schema": "^0.65.0",
-    "effect": "^2.4.19"
+    "@effect/platform": "^0.49.0",
+    "@effect/schema": "^0.66.0",
+    "effect": "^3.0.0"
   },
   "typesVersions": {
     "*": {

package/src/api/routing/defaultErrorHandler.ts

@@ -38,7 +38,7 @@ export function defaultBasicErrorHandler<R>(
   const sendError = (code: number) => (body: unknown) =>
     Effect.sync(() => setBody(res, HttpBody.unsafeJson(body)).pipe(setStatus(code)))
   return r2.pipe(
-    Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.unit),
+    Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void),
     Effect.catchTag("ValidationError", (err) => sendError(400)(err.errors)),
     Effect
       // final catch all; expecting never so that unhandled known errors will show up
@@ -75,7 +75,7 @@ export function defaultErrorHandler<R>(
       )
   return r3
     .pipe(
-      Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.unit),
+      Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void),
       Effect
         .catchTags({
           "JWTError": (err) =>

package/src/rateLimit.ts

@@ -25,7 +25,7 @@
 
 import type { Semaphore } from "@effect-app/core/Effect"
 import type { Duration, NonEmptyArray } from "effect-app"
-import { Effect, ReadonlyArray } from "effect-app"
+import { Array, Effect } from "effect-app"
 
 /**
  * Executes the specified effect, acquiring the specified number of permits
@@ -63,7 +63,7 @@ export function batchPar<R, E, A, R2, E2, A2, T>(
 ) {
   return (items: Iterable<T>) =>
     Effect.forEach(
-      ReadonlyArray.chunk_(items, n),
+      Array.chunk_(items, n),
       (_, i) =>
         Effect
           .forEach(_, (_, j) => forEachItem(_, j, i), { concurrency: "inherit" })
@@ -83,7 +83,7 @@ export function batch<R, E, A, R2, E2, A2, T>(
 ) {
   return (items: Iterable<T>) =>
     Effect.forEach(
-      ReadonlyArray.chunk_(items, n),
+      Array.chunk_(items, n),
       (_, i) =>
         Effect
           .forEach(_, (_, j) => forEachItem(_, j, i), { concurrency: "inherit" })
@@ -125,10 +125,10 @@ export function naiveRateLimit(
     forEachBatch: (a: A[]) => Effect<A2, E2, R2>
   ) =>
     Effect.forEach(
-      ReadonlyArray.chunk_(items, n),
+      Array.chunk_(items, n),
       (batch, i) =>
         ((i === 0)
-          ? Effect.unit
+          ? Effect.void
           : Effect.sleep(d))
           .pipe(Effect.zipRight(
             Effect

package/src/services/Emailer/Sendgrid.ts

@@ -1,7 +1,7 @@
 import { dropUndefinedT } from "@effect-app/core/utils"
 import type { EmailData } from "@sendgrid/helpers/classes/email-address.js"
 import sgMail from "@sendgrid/mail"
-import { Effect, Equivalence, ReadonlyArray, Secret } from "effect-app"
+import { Array, Effect, Equivalence, Secret } from "effect-app"
 import { inspect } from "util"
 import { Emailer } from "./service.js"
 import type { EmailMsg, EmailMsgOptionalFrom, SendgridConfig } from "./service.js"
@@ -106,7 +106,7 @@ const eq = Equivalence.mapInput(
 // https://stackoverflow.com/a/53603076/11595834
 function renderFakeIfTest(addr: EmailData | EmailData[], makeId: () => number) {
   return Array.isArray(addr)
-    ? ReadonlyArray.dedupeWith(
+    ? Array.dedupeWith(
       addr
         .map((x) => (isTestAddress(x) ? renderFake(x, makeId) : x)),
       eq

package/src/services/Operations.ts

@@ -106,7 +106,7 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
         Effect
           .flatMap((_) => {
             if (Exit.isSuccess(_)) {
-              return Effect.unit
+              return Effect.void
             } else {
               return reportAppError(_.cause)
             }

package/src/services/Repository/ext.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // Update = Must return updated items
 // Modify = Must `set` updated items, and can return anything.
-import { Effect, ReadonlyArray } from "effect-app"
+import { Array, Effect } from "effect-app"
 import type { NonEmptyArray } from "effect-app"
 import { type FixEnv, runTerm } from "effect-app/Pure"
 import { NotFoundError } from "../../errors.js"
@@ -166,7 +166,7 @@ export function saveManyWithPureBatched_<
   batchSize = 100
 ) {
   return Effect.forEach(
-    ReadonlyArray.chunk_(items, batchSize),
+    Array.chunk_(items, batchSize),
     (batch) =>
       saveAllWithEffectInt(
         self,

package/src/services/RepositoryBase.ts

@@ -24,6 +24,7 @@ import type { ParseResult, Schema } from "@effect-app/schema"
 import { NonNegativeInt } from "@effect-app/schema"
 import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
 import {
+  Array,
   Chunk,
   Context,
   Effect,
@@ -32,7 +33,6 @@ import {
   Option,
   pipe,
   PubSub,
-  ReadonlyArray,
   Request,
   RequestResolver,
   S,
@@ -40,7 +40,6 @@ import {
 } from "effect-app"
 import { runTerm } from "effect-app/Pure"
 import type { FixEnv, PureEnv } from "effect-app/Pure"
-import type { NoInfer } from "effect/Types"
 import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "../errors.js"
 import type { FieldValues } from "../filter/types.js"
 import { make as makeQuery } from "./query.js"
@@ -239,8 +238,8 @@ export class RepositoryBaseC3<
       Effect.andThen((_) =>
         Array.isArray(_)
           ? batch === undefined
-            ? saveManyWithPure_(this, _, pure as any)
-            : saveManyWithPureBatched_(this, _, pure as any, batch === "batched" ? 100 : batch)
+            ? saveManyWithPure_(this, _ as readonly T[], pure as any)
+            : saveManyWithPureBatched_(this, _ as readonly T[], pure as any, batch === "batched" ? 100 : batch)
           : saveWithPure_(this, _ as any, pure as any)
       )
     ) as any
@@ -278,7 +277,7 @@ export class RepositoryBaseC3<
   } = (items, pure, batch?: "batched" | number) =>
     batch
       ? Effect.forEach(
-        ReadonlyArray.chunk_(items, batch === "batched" ? 100 : batch),
+        Array.chunk_(items, batch === "batched" ? 100 : batch),
         (batch) =>
           saveAllWithEffectInt(
             this,
@@ -392,7 +391,7 @@ export function makeRepo<
           const pubCfg = yield* $(Effect.context<R2>())
           const pub = "publishEvents" in args
             ? flow(args.publishEvents, Effect.provide(pubCfg))
-            : () => Effect.unit
+            : () => Effect.void
           const changeFeed = yield* $(PubSub.unbounded<[T[], "save" | "remove"]>())
 
           const allE = cms
@@ -466,10 +465,10 @@ export function makeRepo<
                     ret.forEach((_) => set(_.id, _._etag))
                   })
               )
-              .pipe(Effect.asUnit)
+              .pipe(Effect.asVoid)
 
           const saveAll = (a: Iterable<T>) =>
-            encodeMany(Array.from(a))
+            encodeMany(Array.fromIterable(a))
               .pipe(
                 Effect.orDie,
                 Effect.andThen(saveAllE)
@@ -485,7 +484,7 @@ export function makeRepo<
                     // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
                     (_) => Effect.flatMapOption(_, pub),
                     Effect.andThen(changeFeed.publish([Chunk.toArray(it), "save"])),
-                    Effect.asUnit
+                    Effect.asVoid
                   )
               })
               .pipe(Effect.withSpan("saveAndPublish"))
@@ -533,7 +532,7 @@ export function makeRepo<
               .filter(args)
               .pipe(Effect.tap((items) =>
                 args.select
-                  ? Effect.unit
+                  ? Effect.void
                   : Effect.map(cms, ({ set }) => items.forEach((_) => set((_ as Encoded).id, (_ as PM)._etag)))
               ))
 
@@ -555,7 +554,7 @@ export function makeRepo<
                 .pipe(
                   Effect.flatMap(flow(
                     S.decode(S.Array(a.schema)),
-                    Effect.map(ReadonlyArray.getSomes),
+                    Effect.map(Array.getSomes),
                     Effect.provide(rctx)
                   ))
                 )
@@ -574,7 +573,7 @@ export function makeRepo<
                 ? Effect.andThen(
                   eff,
                   flow(
-                    ReadonlyArray.head,
+                    Array.head,
                     Effect.mapError(() => new NotFoundError({ id: "query", /* TODO */ type: name }))
                   )
                 )
@@ -1051,7 +1050,7 @@ export const makeRequest = <
             Effect.forEach(requests, (r) =>
               Request.complete(
                 r,
-                ReadonlyArray
+                Array
                   .findFirst(items, (_) => _.id === r.id)
                   .pipe(Option.match({
                     onNone: () => Exit.fail(new NotFoundError({ type: repo.itemType, id: r.id })),

package/src/services/Store/Cosmos/query.ts

@@ -1,4 +1,4 @@
-import { Effect, Equivalence, pipe, ReadonlyArray } from "effect-app"
+import { Array, Effect, Equivalence, pipe } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
 import { assertUnreachable } from "effect-app/utils"
 import type { FilterR, FilterResult } from "../filterApi/query.js"
@@ -100,7 +100,7 @@ export function buildWhereCosmosQuery3(
     let s = ""
     let l = 0
     const printN = (n: number) => {
-      return n === 0 ? "" : ReadonlyArray.range(1, n).map(() => "  ").join("")
+      return n === 0 ? "" : Array.range(1, n).map(() => "  ").join("")
     }
     for (const e of state) {
       switch (e.t) {
@@ -175,7 +175,7 @@ export function buildWhereCosmosQuery3(
           .filter((_) => _.path.includes(".-1."))
           .map((_) => _.path.split(".-1.")[0])
           .map((_) => `JOIN ${_} IN f.${_}`),
-        ReadonlyArray.dedupeWith(Equivalence.string)
+        Array.dedupeWith(Equivalence.string)
       )
         .join("\n")
     }

package/src/services/Store/Cosmos.ts

@@ -2,7 +2,7 @@
 
 import { toNonEmptyArray } from "@effect-app/core/Array"
 import { CosmosClient, CosmosClientLayer } from "@effect-app/infra-adapters/cosmos-client"
-import { Chunk, Duration, Effect, Layer, Option, pipe, ReadonlyArray, Secret, Struct } from "effect-app"
+import { Array, Chunk, Duration, Effect, Layer, Option, pipe, Secret, Struct } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
 import { dropUndefinedT } from "effect-app/utils"
 import { OptimisticConcurrencyException } from "../../errors.js"
@@ -75,7 +75,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                       })
                     ] as const
                 )
-                const batches = Chunk.toReadonlyArray(ReadonlyArray.chunk_(b, config?.maxBulkSize ?? 10))
+                const batches = Chunk.toReadonlyArray(Array.chunk_(b, config?.maxBulkSize ?? 10))
 
                 const batchResult = yield* $(
                   Effect.forEach(

package/src/services/Store/Memory.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Effect, FiberRef, flow, Option, Order, pipe, ReadonlyArray, Ref, Struct } from "effect-app"
+import { Array, Effect, FiberRef, flow, Option, Order, pipe, Ref, Struct } from "effect-app"
 import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
 import { get } from "effect-app/utils"
 import type { RequestContext } from "../../RequestContext.js"
@@ -30,24 +30,24 @@ export function memFilter<T extends { id: string }, U extends keyof T = never>(f
         })
       ))
     if (Option.isSome(ords)) {
-      c = ReadonlyArray.sortBy(...ords.value)(c)
+      c = Array.sortBy(...ords.value)(c)
     }
     if (!skip && limit === 1) {
       return select(
-        ReadonlyArray.findFirst(c, f.filter ? codeFilter(f.filter) : (_) => Option.some(_)).pipe(
-          Option.map(ReadonlyArray.make),
+        Array.findFirst(c, f.filter ? codeFilter(f.filter) : (_) => Option.some(_)).pipe(
+          Option.map(Array.make),
           Option.getOrElse(
             () => []
           )
         )
       )
     }
-    let r = f.filter ? ReadonlyArray.filterMap(c, codeFilter(f.filter)) : c
+    let r = f.filter ? Array.filterMap(c, codeFilter(f.filter)) : c
     if (skip) {
-      r = ReadonlyArray.drop(r, skip)
+      r = Array.drop(r, skip)
     }
     if (limit !== undefined) {
-      r = ReadonlyArray.take(r, limit)
+      r = Array.take(r, limit)
     }
 
     return select(r)
@@ -96,7 +96,7 @@ export function makeMemoryStoreInt<Id extends string, Encoded extends { id: Id }
     const withPermit = sem.withPermits(1)
     const values = Effect.map(Ref.get(store), (s) => s.values())
 
-    const all = Effect.map(values, ReadonlyArray.fromIterable)
+    const all = Effect.map(values, Array.fromIterable)
 
     const batchSet = (items: NonEmptyReadonlyArray<PM>) =>
       Effect

package/src/services/Store/Redis.ts.bak

@@ -43,7 +43,7 @@ function makeRedisStore({ prefix }: StorageConfig) {
           const withPermit = sem.withPermits(1)
 
           const asMap = get.map((x) => new Map(x.map((x) => [x.id, x] as const)))
-          const all = get.map(ReadonlyArray.fromIterable)
+          const all = get.map(Array.fromIterable)
           const batchSet = (items: NonEmptyReadonlyArray<PM>) =>
             Effect
               .forEach(items, (e) => s.find(e.id).flatMap((current) => updateETag(e, current)))

package/src/services/Store/codeFilter.ts

@@ -1,4 +1,4 @@
-import { ReadonlyArray } from "effect-app"
+import { Array } from "effect-app"
 import { assertUnreachable, get } from "effect-app/utils"
 import type { FilterR, FilterResult } from "./filterApi/query.js"
 import { compare, greaterThan, greaterThanExclusive, lowerThan, lowerThanExclusive } from "./utils.js"
@@ -58,7 +58,7 @@ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E, statemen
   let s = ""
   let l = 0
   const printN = (n: number) => {
-    return n === 0 ? "" : ReadonlyArray.range(1, n).map(() => "  ").join("")
+    return n === 0 ? "" : Array.range(1, n).map(() => "  ").join("")
   }
   // TODO: path str updates
 

package/src/services/Store/filterApi/query.ts

@@ -1,4 +1,4 @@
-import { ReadonlyArray } from "effect-app"
+import { Array } from "effect-app"
 import type { FieldValues } from "../../../filter/types.js"
 import type { FieldPath, FieldPathValue } from "../../../filter/types/path/eager.js"
 import type { Filter, Ops } from "./proxy.js"
@@ -40,7 +40,7 @@ export const print = (state: readonly FilterResult[]) => {
   let s = ""
   let l = 0
   const printN = (n: number) => {
-    return n === 0 ? "" : ReadonlyArray.range(1, n).map(() => "  ").join("")
+    return n === 0 ? "" : Array.range(1, n).map(() => "  ").join("")
   }
   for (const e of state) {
     switch (e.t) {