@effect-app/infra 0.142.1 → 0.143.0

package/_src/api/routing/base.ts

@@ -152,7 +152,7 @@ export function parseRequestParams<
           .flatMap((_) =>
             _.isFailure() && !_.cause.isFailure()
               ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-              : Effect(
+              : Effect.sync(() =>
                 _.isSuccess()
                   ? { _tag: "Success" as const, value: _.value }
                   : { _tag: "Failure", errors: _.cause.failures }
@@ -164,7 +164,7 @@ export function parseRequestParams<
           .flatMap((_) =>
             _.isFailure() && !_.cause.isFailure()
               ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-              : Effect(
+              : Effect.sync(() =>
                 _.isSuccess()
                   ? { _tag: "Success" as const, value: _.value }
                   : { _tag: "Failure", errors: _.cause.failures }
@@ -176,7 +176,7 @@ export function parseRequestParams<
           .flatMap((_) =>
             _.isFailure() && !_.cause.isFailure()
               ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-              : Effect(
+              : Effect.sync(() =>
                 _.isSuccess()
                   ? { _tag: "Success" as const, value: _.value }
                   : { _tag: "Failure", errors: _.cause.failures }
@@ -188,7 +188,7 @@ export function parseRequestParams<
           .flatMap((_) =>
             _.isFailure() && !_.cause.isFailure()
               ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-              : Effect(
+              : Effect.sync(() =>
                 _.isSuccess()
                   ? { _tag: "Success" as const, value: _.value }
                   : { _tag: "Failure", errors: _.cause.failures }
@@ -200,7 +200,7 @@ export function parseRequestParams<
           .flatMap((_) =>
             _.isFailure() && !_.cause.isFailure()
               ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-              : Effect(
+              : Effect.sync(() =>
                 _.isSuccess()
                   ? { _tag: "Success" as const, value: _.value }
                   : { _tag: "Failure", errors: _.cause.failures }
@@ -227,13 +227,13 @@ export function parseRequestParams<
         if (errors.length) {
           return new ValidationError({ errors })
         }
-        return Effect({
+        return Effect.sync(() => ({
           body: body.value!,
           cookie: cookie.value!,
           headers: headers.value!,
           path: path.value!,
           query: query.value!
-        })
+        }))
       })
 }
 
@@ -319,7 +319,7 @@ export function makeRequestParsers<
     Config
   >["Request"]
 ): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA> {
-  const ph = Effect(
+  const ph = Effect.sync(() =>
     Option
       .fromNullable(Request.Headers)
       .map((s) => s as unknown as Schema<any, any>)
@@ -327,7 +327,7 @@ export function makeRequestParsers<
   )
   const parseHeaders = (u: unknown) => ph.flatMapOpt((d) => d(u))
 
-  const pq = Effect(
+  const pq = Effect.sync(() =>
     Option
       .fromNullable(Request.Query)
       .map((s) => s as unknown as Schema<any, any>)
@@ -335,7 +335,7 @@ export function makeRequestParsers<
   )
   const parseQuery = (u: unknown) => pq.flatMapOpt((d) => d(u))
 
-  const pb = Effect(
+  const pb = Effect.sync(() =>
     Option
       .fromNullable(Request.Body)
       .map((s) => s as unknown as Schema<any, any>)
@@ -343,7 +343,7 @@ export function makeRequestParsers<
   )
   const parseBody = (u: unknown) => pb.flatMapOpt((d) => d(u))
 
-  const pp = Effect(
+  const pp = Effect.sync(() =>
     Option
       .fromNullable(Request.Path)
       .map((s) => s as unknown as Schema<any, any>)
@@ -351,7 +351,7 @@ export function makeRequestParsers<
   )
   const parsePath = (u: unknown) => pp.flatMapOpt((d) => d(u))
 
-  const pc = Effect(
+  const pc = Effect.sync(() =>
     Option
       .fromNullable(Request.Cookie)
       .map((s) => s as unknown as Schema<any, any>)

package/_src/api/routing/defaultErrorHandler.ts

@@ -24,7 +24,7 @@ export function defaultBasicErrorHandler<R>(
   res: HttpServerResponse,
   r2: Effect<R, ValidationError, HttpServerResponse>
 ) {
-  const sendError = (code: number) => (body: unknown) => Effect(res.setBody(HttpBody.unsafeJson(body)).setStatus(code))
+  const sendError = (code: number) => (body: unknown) => Effect.sync(() => res.setBody(HttpBody.unsafeJson(body)).setStatus(code))
   return r2
     .tapErrorCause((cause) => cause.isFailure() ? logRequestError(cause) : Effect.unit)
     .catchTag("ValidationError", (err) => sendError(400)(err.errors))
@@ -50,7 +50,7 @@ export function defaultErrorHandler<R>(
   const r3 = req.method === "PATCH"
     ? r2.retry(optimisticConcurrencySchedule)
     : r2
-  const sendError = (code: number) => (body: unknown) => Effect(res.setStatus(code).setBody(HttpBody.unsafeJson(body)))
+  const sendError = (code: number) => (body: unknown) => Effect.sync(() => res.setStatus(code).setBody(HttpBody.unsafeJson(body)))
   return r3
     .tapErrorCause((cause) => cause.isFailure() ? logRequestError(cause) : Effect.unit)
     .catchTags({

package/_src/api/routing/makeRequestHandler.ts

@@ -248,7 +248,7 @@ export function makeRequestHandler<
                     })
                   ], { concurrency: "inherit" })
               )
-              .tapErrorCause((cause) => Effect(console.error("Error occurred while reporting error", cause)))
+              .tapErrorCause((cause) => Effect.sync(() => console.error("Error occurred while reporting error", cause)))
           )
           .tap((res) =>
             Effect

package/_src/errorReporter.ts

@@ -76,5 +76,5 @@ export function reportMessage(message: string) {
 }
 
 export function reportMessageM(message: string) {
-  return Effect(reportMessage(message))
+  return Effect.sync(() => reportMessage(message))
 }

package/_src/services/Emailer/Sendgrid.ts

@@ -33,7 +33,7 @@ const makeSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPr
                 void sgMail.send(renderedMsg, false, (err, result) =>
                   err
                     ? cb(Effect.fail(err))
-                    : cb(Effect(result)))
+                    : cb(Effect.sync(() => result)))
             )
           )
 

package/_src/services/Operations/live.ts

@@ -7,7 +7,7 @@ const reportAppError = reportError("Operations.Cleanup")
 
 const make = Effect.sync((): Operations => {
   const ops = new Map<OperationId, Operation>()
-  const makeOp = Effect(OperationId.make())
+  const makeOp = Effect.sync(() => OperationId.make())
 
   const cleanup = Effect
     .sync(() => {
@@ -30,7 +30,7 @@ const make = Effect.sync((): Operations => {
     })
   }
   function findOp(id: OperationId) {
-    return Effect(Option.fromNullable(ops.get(id)))
+    return Effect.sync(() => Option.fromNullable(ops.get(id)))
   }
   function finishOp(id: OperationId, exit: Exit<unknown, unknown>) {
     return findOp(id).flatMap((_) =>
@@ -53,7 +53,7 @@ const make = Effect.sync((): Operations => {
                   .failureOption
                   .flatMap((_) =>
                     typeof _ === "object" && _ !== null && "message" in _ && NonEmptyString2k.is(_.message)
-                      ? Option(_.message)
+                      ? Option.some(_.message)
                       : Option.none
                   )
                   .value ?? null

package/_src/services/QueueMaker/errors.ts

@@ -28,7 +28,7 @@ export function reportNonInterruptedFailure(context?: Record<string, unknown>) {
     inp
       .exit
       .flatMap((result) =>
-        result.match({ onFailure: (cause) => report(cause).map(() => result), onSuccess: () => Effect(result) })
+        result.match({ onFailure: (cause) => report(cause).map(() => result), onSuccess: () => Effect.sync(() => result) })
       )
 }
 

package/_src/services/QueueMaker/memQueue.ts

@@ -41,7 +41,7 @@ export function makeMemQueue<
             messages
               .forEachEffect((m) =>
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                Effect(
+                Effect.sync(() => 
                   JSON.stringify(
                     wireSchema.encodeSync({ body: m, meta: { requestContext, span } })
                   )
@@ -60,7 +60,7 @@ export function makeMemQueue<
           const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName })
           const processMessage = (msg: string) =>
             // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-            Effect(JSON.parse(msg))
+            Effect.sync(() => JSON.parse(msg))
               .flatMap(parseDrain)
               .orDie
               .flatMap(({ body, meta }) =>

package/_src/services/QueueMaker/sbqueue.ts

@@ -84,7 +84,7 @@ export function makeServiceBusQueue<
           return yield* $(
             subscribe({
               processMessage: (x) => processMessage(x.body).uninterruptible,
-              processError: (err) => Effect(captureException(err.error))
+              processError: (err) => Effect.sync(() => captureException(err.error))
             })
               .provide(receiverLayer)
           )

package/_src/services/Repository.ts

@@ -190,7 +190,7 @@ export function project<
     skip?: number
   }
 ): Effect<never, never, S[]> {
-  return self.projectEffect(Effect(map))
+  return self.projectEffect(Effect.sync(() => map))
 }
 
 /**
@@ -207,7 +207,7 @@ export function count<
   filter?: Filter<PM>
 ) {
   return self
-    .projectEffect(Effect({ filter }))
+    .projectEffect(Effect.sync(() => ({ filter })))
     .map((_) => NonNegativeInt(_.length))
 }
 
@@ -301,7 +301,7 @@ export function query<
   // TODO: think about collectPM, collectE, and collect(Parsed)
   map: { filter?: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number }
 ) {
-  return self.queryEffect(Effect(map))
+  return self.queryEffect(Effect.sync(() => map))
 }
 
 /**
@@ -336,7 +336,7 @@ export function queryOne<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   map: { filter?: Filter<PM>; collect?: (t: T) => Option<S> }
 ) {
-  return self.queryOneEffect(Effect(map))
+  return self.queryOneEffect(Effect.sync(() => map))
 }
 
 /**
@@ -426,7 +426,7 @@ export function queryAndSaveOnePure(
   self: any,
   map: { filter: Filter<any>; collect?: any }
 ) {
-  return queryAndSaveOnePureEffect(self, Effect(map))
+  return queryAndSaveOnePureEffect(self, Effect.sync(() => map))
 }
 
 /**
@@ -462,7 +462,7 @@ export function queryAndSavePure<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   map: { filter: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number }
 ) {
-  return self.queryAndSavePureEffect(Effect(map))
+  return self.queryAndSavePureEffect(Effect.sync(() => map))
 }
 
 /**
@@ -613,7 +613,7 @@ export function queryAndSavePureBatched<
   map: { filter: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number },
   batchSize = 100
 ) {
-  return self.queryAndSavePureEffectBatched(Effect(map), batchSize)
+  return self.queryAndSavePureEffectBatched(Effect.sync(() => map), batchSize)
 }
 
 /**
@@ -705,7 +705,7 @@ export interface OneDSLExt<T, Evt> {
  * @tsplus fluent DSLExt updateWith
  */
 export function updateWithOne<T, Evt, S1 extends T, S2 extends T>(self: OneDSL<T, Evt>, upd: (item: S1) => S2) {
-  return self.update((_: S1) => Effect(upd(_)))
+  return self.update((_: S1) => Effect.sync(() => upd(_)))
 }
 
 /**
@@ -715,7 +715,7 @@ export function updateWith<T, Evt, S1 extends T, S2 extends T>(
   self: AllDSL<T, Evt>,
   upd: (item: S1[]) => S2[]
 ) {
-  return self.update((_: S1[]) => Effect(upd(_)))
+  return self.update((_: S1[]) => Effect.sync(() => upd(_)))
 }
 
 export function makeOneDSL<T, Evt>(): OneDSL<T, Evt> {
@@ -772,14 +772,14 @@ export function makeDSL<S1, S2, Evt>() {
 export interface DSLExt<S1, S2, Evt> extends ReturnType<typeof makeDSL<S1, S2, Evt>> {}
 
 export function ifAny<T, R, E, A>(fn: (items: NonEmptyReadonlyArray<T>) => Effect<R, E, A>) {
-  return (items: Iterable<T>) => Effect(items.toNonEmptyArray).flatMapOpt(fn)
+  return (items: Iterable<T>) => Effect.sync(() => items.toNonEmptyArray).flatMapOpt(fn)
 }
 
 /**
  * @tsplus fluent Iterable ifAny
  */
 export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReadonlyArray<T>) => Effect<R, E, A>) {
-  return Effect(items.toNonEmptyArray).flatMapOpt(fn)
+  return Effect.sync(() => items.toNonEmptyArray).flatMapOpt(fn)
 }
 
 /**

package/_src/services/RepositoryBase.ts

@@ -180,7 +180,7 @@ export function makeRepo<
         }
 
         const saveAllE = (a: Iterable<From>) =>
-          Effect(a.toNonEmptyArray)
+          Effect.sync(() => a.toNonEmptyArray)
             .flatMapOpt((a) =>
               Do(($) => {
                 const { get, set } = $(cms)
@@ -197,7 +197,7 @@ export function makeRepo<
         const saveAndPublish = (items: Iterable<T>, events: Iterable<Evt> = []) => {
           const it = items.toChunk
           return saveAll(it)
-            .andThen(Effect(events.toNonEmptyArray))
+            .andThen(Effect.sync(() => events.toNonEmptyArray))
             // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
             .flatMapOpt(pub)
             .andThen(changeFeed
@@ -216,7 +216,7 @@ export function makeRepo<
               set(e.id, undefined)
             }
             yield* $(
-              Effect(events.toNonEmptyArray)
+              Effect.sync(() => events.toNonEmptyArray)
                 // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
                 .flatMapOpt(pub)
             )

package/_src/services/RequestContextContainer.ts

@@ -19,7 +19,7 @@ export class RequestContextContainer extends TagClass<RequestContextContainer, {
       .flatMap((requestContext) =>
         requestContext.isSome()
           ? requestContext.value.requestContext.map(Option.some)
-          : Effect(Option.none)
+          : Effect.sync(() => Option.none)
       )
   }
 }

package/_src/services/Store/ContextMapContainer.ts

@@ -22,7 +22,7 @@ export class ContextMapContainer extends TagClass<ContextMapContainer, {
       .flatMap((ctx) =>
         ctx.isSome()
           ? ctx.value.get.map(Option.some)
-          : Effect(Option.none)
+          : Effect.sync(() => Option.none)
       )
   }
 }

package/_src/services/Store/Cosmos.ts

@@ -199,10 +199,11 @@ function makeCosmosStore({ prefix }: StorageConfig) {
           }
 
           const s: Store<PM, Id> = {
-            all: Effect({
-              query: `SELECT * FROM ${name} f WHERE f.id != @id`,
-              parameters: [{ name: "@id", value: importedMarkerId }]
-            })
+            all: Effect
+              .sync(() => ({
+                query: `SELECT * FROM ${name} f WHERE f.id != @id`,
+                parameters: [{ name: "@id", value: importedMarkerId }]
+              }))
               .tap((q) => logQuery(q))
               .flatMap((q) =>
                 Effect.promise(() =>
@@ -223,7 +224,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
               filter
                 .keys
                 .forEachEffect((k) =>
-                  Effect(buildFilterJoinSelectCosmosQuery(filter, k, name, cursor?.skip, cursor?.limit))
+                  Effect
+                    .sync(() => buildFilterJoinSelectCosmosQuery(filter, k, name, cursor?.skip, cursor?.limit))
                     .tap((q) => logQuery(q))
                     .flatMap((q) =>
                       Effect.promise(() =>
@@ -266,7 +268,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 ? filter
                   .keys
                   .forEachEffect((k) =>
-                    Effect(buildFindJoinCosmosQuery(filter, k, name, skip, limit))
+                    Effect
+                      .sync(() => buildFindJoinCosmosQuery(filter, k, name, skip, limit))
                       .tap((q) => logQuery(q))
                       .flatMap((q) =>
                         Effect.promise(() =>
@@ -280,15 +283,18 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                   )
                   .map((_) => _.flatMap((_) => _))
                 : (filter.type === "new-kid"
-                  ? Effect(buildWhereCosmosQuery3(
-                    filter.build(),
-                    name,
-                    importedMarkerId,
-                    defaultValues,
-                    f.select as NonEmptyReadonlyArray<string> | undefined,
-                    skip,
-                    limit
-                  ))
+                  ? Effect
+                    .sync(() =>
+                      buildWhereCosmosQuery3(
+                        filter.build(),
+                        name,
+                        importedMarkerId,
+                        defaultValues,
+                        f.select as NonEmptyReadonlyArray<string> | undefined,
+                        skip,
+                        limit
+                      )
+                    )
                     .tap((q) => logQuery(q))
                     .flatMap((q) =>
                       Effect.promise(() =>
@@ -307,7 +313,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                             .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ..._.f })))
                       )
                     )
-                  : Effect(buildCosmosQuery(filter, name, importedMarkerId, defaultValues, skip, limit))
+                  : Effect
+                    .sync(() => buildCosmosQuery(filter, name, importedMarkerId, defaultValues, skip, limit))
                     .tap((q) => logQuery(q))
                     .flatMap((q) =>
                       Effect.promise(() =>
@@ -370,10 +377,10 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                       )
                     )
                   }
-                  return Effect({
+                  return Effect.sync(() => ({
                     ...e,
                     _etag: x.etag
-                  })
+                  }))
                 })
                 .withSpan("Cosmos.set [effect-app/infra/Store]", {
                   attributes: { "repository.container_id": containerId, "repository.model_name": name }
@@ -403,7 +410,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
             if (seed) {
               const m = yield* $(seed)
               yield* $(
-                Effect(m.toNonEmptyArray)
+                Effect
+                  .succeed(m.toNonEmptyArray)
                   .flatMapOpt((a) =>
                     s
                       .bulkSet(a)

package/_src/services/Store/Disk.ts

@@ -64,7 +64,7 @@ function makeDiskStoreInt<Id extends string, PM extends PersistenceModelType<Id>
     const withPermit = sem.withPermits(1)
     const flushToDisk = store.all.flatMap(fsStore.setRaw).pipe(withPermit)
     const flushToDiskInBackground = flushToDisk
-      .tapErrorCause((err) => Effect(console.error(err)))
+      .tapErrorCause((err) => Effect.sync(() => console.error(err)))
       .uninterruptible
       .forkDaemon
 
@@ -121,7 +121,7 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
             return storesSem.withPermits(1)(
               Effect.suspend(() => {
                 const existing = stores.get(namespace)
-                if (existing) return Effect(existing)
+                if (existing) return Effect.sync(() => existing)
                 return makeDiskStoreInt<Id, PM, R, E>(prefix, namespace, dir, name, seed, config?.defaultValues)
                   .orDie
                   .provide(ctx)

package/_src/services/Store/Memory.ts

@@ -62,7 +62,7 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
 ) {
   return Effect.gen(function*($) {
     const updateETag = makeUpdateETag(modelName)
-    const items_ = yield* $(seed ?? Effect([]))
+    const items_ = yield* $(seed ?? Effect.sync(() => []))
     const defaultValues = _defaultValues ?? {}
 
     const items = new Map(items_.toChunk.map((_) => [_.id, { ...defaultValues, ..._ }] as const))
@@ -134,7 +134,7 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
           }),
       batchSet: (items: readonly [PM, ...PM[]]) =>
         pipe(
-          Effect(items)
+          Effect.sync(() => items)
             // align with CosmosDB
             .filterOrDieMessage((_) => _.length <= 100, "BatchSet: a batch may not exceed 100 items")
             .andThen(batchSet)
@@ -184,7 +184,7 @@ export const makeMemoryStore = () => ({
         }
         return storesSem.withPermits(1)(Effect.suspend(() => {
           const store = stores.get(namespace)
-          if (store) return Effect(store)
+          if (store) return Effect.sync(() => store)
           return makeMemoryStoreInt(modelName, namespace, seed, config?.defaultValues)
             .orDie
             .provide(ctx)

package/_src/services/Store/Redis.ts

@@ -21,7 +21,7 @@ function makeRedisStore({ prefix }: StorageConfig) {
           const key = `${prefix}${name}`
           const current = yield* $(redis.get(key).orDie)
           if (!current.isSome()) {
-            const m = yield* $(seed ?? Effect([]))
+            const m = yield* $(seed ?? Effect.sync(() => []))
             yield* $(
               redis
                 .set(key, JSON.stringify({ data: [...m].map((e) => makeETag(e)) }))

package/_src/services/Store/codeFilter.ts

@@ -66,7 +66,7 @@ export const codeFilterStatement = <E>(p: FilterR, x: E) => {
 //         }
 //         return codeFilterStatement(p, x)
 //       })
-//     ? Option(x as unknown as NE)
+//     ? Option.some(x as unknown as NE)
 //     : Option.none
 
 // export const and = <E extends { id: string }, NE extends E>(filters: readonly FilterResult[], x: E): Option<NE> =>
@@ -83,7 +83,7 @@ export const codeFilterStatement = <E>(p: FilterR, x: E) => {
 //         }
 //         return codeFilterStatement(p, x)
 //       })
-//     ? Option(x as unknown as NE)
+//     ? Option.some(x as unknown as NE)
 //     : Option.none
 
 // // TODO: how to handle and/or outside scopes.

package/_src/services/Store/index.test.ts.bak

@@ -17,7 +17,7 @@ describe("Optimistic Concurrency", () => {
           { _etag: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
-        const store = yield* $(make("test", Effect(existing)))
+        const store = yield* $(make("test", Effect.sync(() => existing)))
 
         const result1 = yield* $(store.set({ id: "1", a: "string", _etag: undefined }))
         const result2_1 = yield* $(
@@ -51,7 +51,7 @@ describe("Optimistic Concurrency", () => {
           { _etag: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
-        const store = yield* $(make("test", Effect(existing)))
+        const store = yield* $(make("test", Effect.sync(() => existing)))
 
         const [result1] = yield* $(
           store.bulkSet([{ id: "1", a: "string", _etag: undefined }])
@@ -89,7 +89,7 @@ describe("Optimistic Concurrency", () => {
           { _etag: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
-        const store = yield* $(make("test", Effect(existing)))
+        const store = yield* $(make("test", Effect.sync(() => existing)))
 
         const item1 = { id: "1", a: "string", _etag: undefined }
         const item2 = { id: "2", a: "string", _etag: undefined }
@@ -102,8 +102,8 @@ describe("Optimistic Concurrency", () => {
         const failResult = yield* $(
           store.batchSet([{ id: "1", a: "another-string3", _etag: "abc" }]).result
         )
-        expect(result1).toEqual(Option({ ...item1, _etag: expect.any(String) }))
-        expect(result2).toEqual(Option({ ...item2, _etag: expect.any(String) }))
+        expect(result1).toEqual(Option.some({ ...item1, _etag: expect.any(String) }))
+        expect(result2).toEqual(Option.some({ ...item2, _etag: expect.any(String) }))
         expect(Exit.untraced(failResult)).toEqual(
           Exit.fail(new OptimisticConcurrencyException("test", "1"))
         )

package/_src/services/Store/utils.ts

@@ -40,22 +40,22 @@ export const makeUpdateETag =
 export function codeFilter<E extends { id: string }, NE extends E>(filter: Filter<NE>) {
   return (x: E) =>
     filter.type === "new-kid"
-      ? codeFilter3_(filter.build(), x) ? Option(x as unknown as NE) : Option.none
+      ? codeFilter3_(filter.build(), x) ? Option.some(x as unknown as NE) : Option.none
       : filter.type === "startsWith"
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       ? lowercaseIfString((x as any)[filter.by]).startsWith(filter.value.toLowerCase())
-        ? Option(x as unknown as NE)
+        ? Option.some(x as unknown as NE)
         : Option.none
       : filter.type === "endsWith"
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       ? lowercaseIfString((x as any)[filter.by]).endsWith(filter.value.toLowerCase())
-        ? Option(x as unknown as NE)
+        ? Option.some(x as unknown as NE)
         : Option.none
       : filter.type === "contains"
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       ? lowercaseIfString((x as any)[filter.by]).includes(filter.value.toLowerCase())
-        ? Option(x as unknown as NE)
+        ? Option.some(x as unknown as NE)
         : Option.none
       : filter.type === "join_find"
       ? filter.keys.some((k) => {
@@ -66,7 +66,7 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
             && value.some((v) => compare(v[filter.valueKey], filter.value))
           )
         })
-        ? Option(x as unknown as NE)
+        ? Option.some(x as unknown as NE)
         : Option.none
       // TODO: support mixed or/and
       : filter.mode === "or"
@@ -110,7 +110,7 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
                 return compare(k, p.value)
             }
           })
-        ? Option(x as unknown as NE)
+        ? Option.some(x as unknown as NE)
         : Option.none
       : filter
           .where
@@ -160,7 +160,7 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
                   : compare(k, p.value)
             }
           })
-      ? Option(x as unknown as NE)
+      ? Option.some(x as unknown as NE)
       : Option.none
 }
 
@@ -174,11 +174,11 @@ export function codeFilterJoinSelect<E extends { id: string }, NE>(
         const value = get(x, k)
         // we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
         return value
-          ? Option(
+          ? Option.some(
             (value as readonly NE[]).filterMap((v) =>
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
               compare((v as any)[filter.valueKey], filter.value)
-                ? Option({ ...v, _rootId: x.id })
+                ? Option.some({ ...v, _rootId: x.id })
                 : Option.none
             )
           )

package/_src/services/simpledb/diskdb.ts

@@ -133,7 +133,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
     function tryRead(filePath: string) {
       return fu
         .fileExists(filePath)
-        .flatMap((exists) => !exists ? Effect(Option.none) : readFile(filePath).map(Option.some))
+        .flatMap((exists) => !exists ? Effect.sync(() => Option.none) : readFile(filePath).map(Option.some))
     }
 
     function getFilename(type: string, id: string) {

package/_src/services/simpledb/redisdb.ts

@@ -184,7 +184,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
             (err) =>
               err
                 ? res(new ConnectionException(err))
-                : res(Effect(void 0))
+                : res(Effect.sync(() => void 0))
           )
         })
         .uninterruptible