@effect-app/infra 0.48.0 → 0.49.0

package/_src/api/express/schema/requestHandler.ts

@@ -69,90 +69,97 @@ export function parseRequestParams<PathA, CookieA, QueryA, BodyA, HeaderA>(
   parsers: RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>
 ) {
   return ({ body, cookies, headers, params, query }: express.Request) =>
-    Effect.all({
-      body: parsers
-        .parseBody(body)
-        .exit.flatMap(_ =>
-          _.isFailure() && !_.cause.isFailure()
-            ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-            : Effect(
-              _.isSuccess()
-                ? { _tag: "Success" as const, value: _.value }
-                : { _tag: "Failure", errors: _.cause.failures }
-            )
-        ),
-      cookie: parsers
-        .parseCookie(cookies)
-        .exit.flatMap(_ =>
-          _.isFailure() && !_.cause.isFailure()
-            ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-            : Effect(
-              _.isSuccess()
-                ? { _tag: "Success" as const, value: _.value }
-                : { _tag: "Failure", errors: _.cause.failures }
-            )
-        ),
-      headers: parsers
-        .parseHeaders(headers)
-        .exit.flatMap(_ =>
-          _.isFailure() && !_.cause.isFailure()
-            ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-            : Effect(
-              _.isSuccess()
-                ? { _tag: "Success" as const, value: _.value }
-                : { _tag: "Failure", errors: _.cause.failures }
-            )
-        ),
-      query: parsers
-        .parseQuery(query)
-        .exit.flatMap(_ =>
-          _.isFailure() && !_.cause.isFailure()
-            ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-            : Effect(
-              _.isSuccess()
-                ? { _tag: "Success" as const, value: _.value }
-                : { _tag: "Failure", errors: _.cause.failures }
-            )
-        ),
-      path: parsers
-        .parsePath(params)
-        .exit.flatMap(_ =>
-          _.isFailure() && !_.cause.isFailure()
-            ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
-            : Effect(
-              _.isSuccess()
-                ? { _tag: "Success" as const, value: _.value }
-                : { _tag: "Failure", errors: _.cause.failures }
-            )
-        )
-    }).flatMap(({ body, cookie, headers, path, query }) => {
-      const errors: unknown[] = []
-      if (body._tag === "Failure") {
-        errors.push(makeError("body")(body.errors))
-      }
-      if (cookie._tag === "Failure") {
-        errors.push(makeError("cookie")(cookie.errors))
-      }
-      if (headers._tag === "Failure") {
-        errors.push(makeError("headers")(headers.errors))
-      }
-      if (path._tag === "Failure") {
-        errors.push(makeError("path")(path.errors))
-      }
-      if (query._tag === "Failure") {
-        errors.push(makeError("query")(query.errors))
-      }
-      if (errors.length) {
-        return Effect.fail(new ValidationError(errors))
-      }
-      return Effect({
-        body: body.value!,
-        cookie: cookie.value!,
-        headers: headers.value!,
-        path: path.value!,
-        query: query.value!
+    Effect
+      .all({
+        body: parsers
+          .parseBody(body)
+          .exit
+          .flatMap((_) =>
+            _.isFailure() && !_.cause.isFailure()
+              ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
+              : Effect(
+                _.isSuccess()
+                  ? { _tag: "Success" as const, value: _.value }
+                  : { _tag: "Failure", errors: _.cause.failures }
+              )
+          ),
+        cookie: parsers
+          .parseCookie(cookies)
+          .exit
+          .flatMap((_) =>
+            _.isFailure() && !_.cause.isFailure()
+              ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
+              : Effect(
+                _.isSuccess()
+                  ? { _tag: "Success" as const, value: _.value }
+                  : { _tag: "Failure", errors: _.cause.failures }
+              )
+          ),
+        headers: parsers
+          .parseHeaders(headers)
+          .exit
+          .flatMap((_) =>
+            _.isFailure() && !_.cause.isFailure()
+              ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
+              : Effect(
+                _.isSuccess()
+                  ? { _tag: "Success" as const, value: _.value }
+                  : { _tag: "Failure", errors: _.cause.failures }
+              )
+          ),
+        query: parsers
+          .parseQuery(query)
+          .exit
+          .flatMap((_) =>
+            _.isFailure() && !_.cause.isFailure()
+              ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
+              : Effect(
+                _.isSuccess()
+                  ? { _tag: "Success" as const, value: _.value }
+                  : { _tag: "Failure", errors: _.cause.failures }
+              )
+          ),
+        path: parsers
+          .parsePath(params)
+          .exit
+          .flatMap((_) =>
+            _.isFailure() && !_.cause.isFailure()
+              ? (Effect.failCauseSync(() => _.cause) as Effect<never, ValidationError, never>)
+              : Effect(
+                _.isSuccess()
+                  ? { _tag: "Success" as const, value: _.value }
+                  : { _tag: "Failure", errors: _.cause.failures }
+              )
+          )
+      })
+      .flatMap(({ body, cookie, headers, path, query }) => {
+        const errors: unknown[] = []
+        if (body._tag === "Failure") {
+          errors.push(makeError("body")(body.errors))
+        }
+        if (cookie._tag === "Failure") {
+          errors.push(makeError("cookie")(cookie.errors))
+        }
+        if (headers._tag === "Failure") {
+          errors.push(makeError("headers")(headers.errors))
+        }
+        if (path._tag === "Failure") {
+          errors.push(makeError("path")(path.errors))
+        }
+        if (query._tag === "Failure") {
+          errors.push(makeError("query")(query.errors))
+        }
+        if (errors.length) {
+          return Effect.fail(new ValidationError(errors))
+        }
+        return Effect({
+          body: body.value!,
+          cookie: cookie.value!,
+          headers: headers.value!,
+          path: path.value!,
+          query: query.value!
+        })
       })
-    })
 }
 
 // // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -181,8 +188,8 @@ export function respondSuccess<ReqA, A, E>(
   encodeResponse: (req: ReqA) => Encode<A, E>
 ) {
   return (req: ReqA, res: express.Response) =>
-    flow(encodeResponse(req), Effect.succeed, _ =>
-      _.flatMap(r =>
+    flow(encodeResponse(req), Effect.succeed, (_) =>
+      _.flatMap((r) =>
         Effect.sync(() => {
           r === undefined
             ? res.status(204).send()
@@ -301,44 +308,49 @@ export function makeRequestParsers<
   >["Request"]
 ): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA> {
   const ph = Effect(
-    Option.fromNullable(Request.Headers)
-      .map(s => s)
+    Option
+      .fromNullable(Request.Headers)
+      .map((s) => s)
       .map(Parser.for)
       .map(MO.condemn)
   )
-  const parseHeaders = (u: unknown) => ph.flatMapOpt(d => d(u))
+  const parseHeaders = (u: unknown) => ph.flatMapOpt((d) => d(u))
 
   const pq = Effect(
-    Option.fromNullable(Request.Query)
-      .map(s => s)
+    Option
+      .fromNullable(Request.Query)
+      .map((s) => s)
       .map(Parser.for)
       .map(MO.condemn)
   )
-  const parseQuery = (u: unknown) => pq.flatMapOpt(d => d(u))
+  const parseQuery = (u: unknown) => pq.flatMapOpt((d) => d(u))
 
   const pb = Effect(
-    Option.fromNullable(Request.Body)
-      .map(s => s)
+    Option
+      .fromNullable(Request.Body)
+      .map((s) => s)
       .map(Parser.for)
       .map(MO.condemn)
   )
-  const parseBody = (u: unknown) => pb.flatMapOpt(d => d(u))
+  const parseBody = (u: unknown) => pb.flatMapOpt((d) => d(u))
 
   const pp = Effect(
-    Option.fromNullable(Request.Path)
-      .map(s => s)
+    Option
+      .fromNullable(Request.Path)
+      .map((s) => s)
       .map(Parser.for)
       .map(MO.condemn)
   )
-  const parsePath = (u: unknown) => pp.flatMapOpt(d => d(u))
+  const parsePath = (u: unknown) => pp.flatMapOpt((d) => d(u))
 
   const pc = Effect(
-    Option.fromNullable(Request.Cookie)
-      .map(s => s)
+    Option
+      .fromNullable(Request.Cookie)
+      .map((s) => s)
       .map(Parser.for)
       .map(MO.condemn)
   )
-  const parseCookie = (u: unknown) => pc.flatMapOpt(d => d(u))
+  const parseCookie = (u: unknown) => pc.flatMapOpt((d) => d(u))
 
   return {
     parseBody,

package/_src/api/express/schema/routing.ts

@@ -99,34 +99,34 @@ export function makeFromSchema<ResA>(
   const Res = r ? MO.extractSchema(r) : MO.Void
   // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
   // TODO: use the path vs body etc serialisation also in the Client.
-  const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap(_ =>
+  const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>
     _.match(
       () => Effect(Option.none),
-      _ => jsonSchema(_).map(Option.some)
+      (_) => jsonSchema(_).map(Option.some)
     )
   )
-  const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap(_ =>
+  const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>
     _.match(
       () => Effect(Option.none),
-      _ => jsonSchema(_).map(Option.some)
+      (_) => jsonSchema(_).map(Option.some)
     )
   )
-  const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap(_ =>
+  const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>
     _.match(
       () => Effect(Option.none),
-      _ => jsonSchema(_).map(Option.some)
+      (_) => jsonSchema(_).map(Option.some)
     )
   )
-  const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap(_ =>
+  const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>
     _.match(
       () => Effect(Option.none),
-      _ => jsonSchema(_).map(Option.some)
+      (_) => jsonSchema(_).map(Option.some)
     )
   )
-  const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap(_ =>
+  const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>
     _.match(
       () => Effect(Option.none),
-      _ => jsonSchema(_).map(Option.some)
+      (_) => jsonSchema(_).map(Option.some)
     )
   )
   // const makeReqSchema = schema(Req)
@@ -136,10 +136,10 @@ export function makeFromSchema<ResA>(
   function makeParameters(inn: ParameterLocation) {
     return (a: Option<JSONSchema | SubSchema>) => {
       return a
-        .flatMap(o => (isObjectSchema(o) ? Option(o) : Option.none))
-        .map(x => {
+        .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))
+        .map((x) => {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          return Object.keys(x.properties!).map(p => {
+          return Object.keys(x.properties!).map((p) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             const schema = x.properties![p]
             const required = Boolean(x.required?.includes(p))
@@ -150,48 +150,54 @@ export function makeFromSchema<ResA>(
     }
   }
 
-  return Effect.all({
-    req: jsonSchema(Req.Model),
-    reqQuery: makeReqQuerySchema,
-    reqHeaders: makeReqHeadersSchema,
-    reqBody: makeReqBodySchema,
-    reqPath: makeReqPathSchema,
-    reqCookie: makeReqCookieSchema,
-    res: makeResSchema
-  }).map(_ => {
-    // console.log("$$$ REQ", _.req)
-    const isEmpty = !e.handler.Response || e.handler.Response === MO.Void
-    return {
-      path: e.path,
-      method: e.method.toLowerCase(),
-      tags: e.info?.tags,
-      description: _.req?.description,
-      summary: _.req?.summary,
-      operationId: _.req?.title,
-      parameters: [
-        ...makeParameters("path")(_.reqPath),
-        ...makeParameters("query")(_.reqQuery),
-        ...makeParameters("header")(_.reqHeaders),
-        ...makeParameters("cookie")(_.reqCookie)
-      ],
-      requestBody: _.reqBody.map(schema => ({
-        content: { "application/json": { schema } }
-      })).value,
-      responses: [
-        isEmpty
-          ? new Response(204, { description: "Empty" })
-          : new Response(200, {
-            description: "OK",
-            content: { "application/json": { schema: _.res } }
-          }),
-        new Response(400, { description: "ValidationError" })
-      ].concat(
-        e.path.includes(":") && isEmpty
-          ? [new Response(404, { description: "NotFoundError" })]
-          : []
-      )
-    }
-  })
+  return Effect
+    .all({
+      req: jsonSchema(Req.Model),
+      reqQuery: makeReqQuerySchema,
+      reqHeaders: makeReqHeadersSchema,
+      reqBody: makeReqBodySchema,
+      reqPath: makeReqPathSchema,
+      reqCookie: makeReqCookieSchema,
+      res: makeResSchema
+    })
+    .map((_) => {
+      // console.log("$$$ REQ", _.req)
+      const isEmpty = !e.handler.Response || e.handler.Response === MO.Void
+      return {
+        path: e.path,
+        method: e.method.toLowerCase(),
+        tags: e.info?.tags,
+        description: _.req?.description,
+        summary: _.req?.summary,
+        operationId: _.req?.title,
+        parameters: [
+          ...makeParameters("path")(_.reqPath),
+          ...makeParameters("query")(_.reqQuery),
+          ...makeParameters("header")(_.reqHeaders),
+          ...makeParameters("cookie")(_.reqCookie)
+        ],
+        requestBody: _
+          .reqBody
+          .map((schema) => ({
+            content: { "application/json": { schema } }
+          }))
+          .value,
+        responses: [
+          isEmpty
+            ? new Response(204, { description: "Empty" })
+            : new Response(200, {
+              description: "OK",
+              content: { "application/json": { schema: _.res } }
+            }),
+          new Response(400, { description: "ValidationError" })
+        ]
+          .concat(
+            e.path.includes(":") && isEmpty
+              ? [new Response(404, { description: "NotFoundError" })]
+              : []
+          )
+      }
+    })
 }
 
 class Response {

package/_src/api/reportError.ts

@@ -7,18 +7,18 @@ export class RequestException<E> extends CauseException<E> {
     super(cause, "Request")
   }
 }
-export const reportRequestError_ = reportError(cause => new RequestException(cause))
+export const reportRequestError_ = reportError((cause) => new RequestException(cause))
 
 export const reportRequestError = <E>(cause: Cause<E>, context?: Record<string, unknown> | undefined) =>
   Debug.untraced(() =>
-    RequestContextContainer.get.flatMap(requestContext => reportRequestError_(cause, { requestContext, ...context }))
+    RequestContextContainer.get.flatMap((requestContext) => reportRequestError_(cause, { requestContext, ...context }))
   )
 
-export const logRequestError_ = logError(cause => new RequestException(cause))
+export const logRequestError_ = logError((cause) => new RequestException(cause))
 
 export const logRequestError = <E>(cause: Cause<E>, context?: Record<string, unknown> | undefined) =>
   Debug.untraced(() =>
-    RequestContextContainer.get.flatMap(requestContext => logRequestError_(cause, { requestContext, ...context }))
+    RequestContextContainer.get.flatMap((requestContext) => logRequestError_(cause, { requestContext, ...context }))
   )
 
 /**
@@ -32,8 +32,10 @@ export const logRequestError = <E>(cause: Cause<E>, context?: Record<string, unk
  */
 export function forkDaemonReportRequest<R, E, A>(self: Effect<R, E, A>) {
   return Debug.untraced(() =>
-    self.tapErrorCause(reportRequestError)
-      .fork.daemonChildren
+    self
+      .tapErrorCause(reportRequestError)
+      .fork
+      .daemonChildren
   )
 }
 
@@ -48,11 +50,13 @@ export function forkDaemonReportRequest<R, E, A>(self: Effect<R, E, A>) {
  */
 export function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<R, E, A>) {
   return Debug.untraced(() =>
-    self.tapErrorCause(cause =>
-      cause.isInterruptedOnly() || cause.isDie()
-        ? reportRequestError(cause)
-        : logRequestError(cause)
-    )
-      .fork.daemonChildren
+    self
+      .tapErrorCause((cause) =>
+        cause.isInterruptedOnly() || cause.isDie()
+          ? reportRequestError(cause)
+          : logRequestError(cause)
+      )
+      .fork
+      .daemonChildren
   )
 }