@effect-app/infra 0.106.1 → 0.107.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @effect-app/infra
 
+## 0.107.0
+
+### Minor Changes
+
+- 771d7e6: Fix model name
+
+### Patch Changes
+
+- Updated dependencies [771d7e6]
+  - @effect-app/prelude@0.81.0
+  - @effect-app/schema@0.74.0
+  - @effect-app/infra-adapters@0.67.2
+
+## 0.106.2
+
+### Patch Changes
+
+- fix infra
+
 ## 0.106.1
 
 ### Patch Changes

package/_cjs/api/express/schema/routing.cjs

@@ -85,7 +85,7 @@ function makeFromSchema(e) {
     };
   }
   return tsplus_module_2.map(tsplus_module_2.all({
-    req: jsonSchema(Req.Class),
+    req: jsonSchema(Req.Model),
     reqQuery: makeReqQuerySchema,
     reqHeaders: makeReqHeadersSchema,
     reqBody: makeReqBodySchema,

package/_cjs/api/express/schema/routing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing.cjs","names":["S","_interopRequireWildcard","require","_atlasPlutus","OpenApi","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","asRouteDescriptionAny","arrAsRouteDescriptionAny","arr","map","makeRouteDescriptor","path","method","handler","_tag","makeFromSchema","jsonSchema_","for","jsonSchema","Request","Req","Response","Res_","ResponseOpenApi","Res","extractSchema","Void","makeReqQuerySchema","tsplus_module_2","flatMap","sync","tsplus_module_3","fromNullable","Query","_","match","onNone","tsplus_module_1","none","onSome","some","makeReqHeadersSchema","Headers","makeReqCookieSchema","Cookie","makeReqPathSchema","Path","makeReqBodySchema","Body","makeResSchema","makeParameters","inn","getOrElse","o","isObjectSchema","x","keys","properties","p","schema","required","Boolean","includes","name","in","all","req","Class","reqQuery","reqHeaders","reqBody","reqPath","reqCookie","res","isEmpty","toLowerCase","tags","info","description","summary","operationId","title","parameters","requestBody","getOrUndefined","content","responses","concat","constructor","statusCode","type"],"sources":["../../../../_src/api/express/schema/routing.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"routing.cjs","names":["S","_interopRequireWildcard","require","_atlasPlutus","OpenApi","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","asRouteDescriptionAny","arrAsRouteDescriptionAny","arr","map","makeRouteDescriptor","path","method","handler","_tag","makeFromSchema","jsonSchema_","for","jsonSchema","Request","Req","Response","Res_","ResponseOpenApi","Res","extractSchema","Void","makeReqQuerySchema","tsplus_module_2","flatMap","sync","tsplus_module_3","fromNullable","Query","_","match","onNone","tsplus_module_1","none","onSome","some","makeReqHeadersSchema","Headers","makeReqCookieSchema","Cookie","makeReqPathSchema","Path","makeReqBodySchema","Body","makeResSchema","makeParameters","inn","getOrElse","o","isObjectSchema","x","keys","properties","p","schema","required","Boolean","includes","name","in","all","req","Model","reqQuery","reqHeaders","reqBody","reqPath","reqCookie","res","isEmpty","toLowerCase","tags","info","description","summary","operationId","title","parameters","requestBody","getOrUndefined","content","responses","concat","constructor","statusCode","type"],"sources":["../../../../_src/api/express/schema/routing.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/Operations/live.cjs

@@ -88,5 +88,5 @@ const cleanupLoop = tsplus_module_1.forkScoped(tsplus_module_1.schedule(tsplus_m
 /**
  * @tsplus static Operations.Ops Live
  */
-const Live = exports.Live = tsplus_module_13.provideMerge(tsplus_module_13.scopedDiscard(cleanupLoop))(tsplus_module_13.effect(_service.Operations)(make));
+const Live = exports.Live = tsplus_module_13.provideMerge(tsplus_module_13.scopedDiscard(cleanupLoop), tsplus_module_13.effect(_service.Operations)(make));
 //# sourceMappingURL=live.cjs.map

package/_cjs/services/Operations/live.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"live.cjs","names":["_errorReporter","require","_Operations","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","reportAppError","reportError","make","tsplus_module_1","sync","ops","Map","makeOp","OperationId","cleanup","withSpan","before","tsplus_module_2","DateSubHours","Date","tsplus_module_5","forEach","tsplus_module_4","ext_itToChunk","entries","id","op","lastChanged","tsplus_module_3","getOrElse","fromNullable","updatedAt","createdAt","delete","addOp","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","value","result","tsplus_module_6","isSuccess","Success","Failure","message","tsplus_module_7","isInterrupted","cause","tsplus_module_8","LongString","isDie","tsplus_module_9","getOrUndefined","failureOption","Guard","some","none","update","progress","register","tap","zipRight","acquireRelease","tsplus_module_10","annotateLogscoped","find","cleanupLoop","forkScoped","schedule","Operations","unit","tsplus_module_12","fixed","tsplus_module_11","minutes","Live","exports","tsplus_module_13","provideMerge","scopedDiscard","effect"],"sources":["../../../_src/services/Operations/live.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"live.cjs","names":["_errorReporter","require","_Operations","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","reportAppError","reportError","make","tsplus_module_1","sync","ops","Map","makeOp","OperationId","cleanup","withSpan","before","tsplus_module_2","DateSubHours","Date","tsplus_module_5","forEach","tsplus_module_4","ext_itToChunk","entries","id","op","lastChanged","tsplus_module_3","getOrElse","fromNullable","updatedAt","createdAt","delete","addOp","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","value","result","tsplus_module_6","isSuccess","Success","Failure","message","tsplus_module_7","isInterrupted","cause","tsplus_module_8","LongString","isDie","tsplus_module_9","getOrUndefined","failureOption","Guard","some","none","update","progress","register","tap","zipRight","acquireRelease","tsplus_module_10","annotateLogscoped","find","cleanupLoop","forkScoped","schedule","Operations","unit","tsplus_module_12","fixed","tsplus_module_11","minutes","Live","exports","tsplus_module_13","provideMerge","scopedDiscard","effect"],"sources":["../../../_src/services/Operations/live.ts"],"sourcesContent":[null],"mappings":"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"}

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

@@ -182,7 +182,7 @@ export function makeFromSchema<ResA>(
 
   return Effect
     .all({
-      req: jsonSchema(Req.Class),
+      req: jsonSchema(Req.Model),
       reqQuery: makeReqQuerySchema,
       reqHeaders: makeReqHeadersSchema,
       reqBody: makeReqBodySchema,

package/_src/services/Operations/live.ts

@@ -103,6 +103,6 @@ const cleanupLoop = Operations
 /**
  * @tsplus static Operations.Ops Live
  */
-export const Live = make.toLayer(Operations)
-  > cleanupLoop
-    .toLayerScopedDiscard
+export const Live = cleanupLoop
+  .toLayerScopedDiscard
+  .provideMerge(make.toLayer(Operations))

package/dist/api/express/schema/routing.js

@@ -59,7 +59,7 @@ export function makeFromSchema(e) {
         };
     }
     return tsplus_module_2.map(tsplus_module_2.all({
-        req: jsonSchema(Req.Class),
+        req: jsonSchema(Req.Model),
         reqQuery: makeReqQuerySchema,
         reqHeaders: makeReqHeadersSchema,
         reqBody: makeReqBodySchema,

package/dist/services/Operations/live.d.ts

@@ -3,5 +3,5 @@ import { Exit } from "effect/Exit";
  * @tsplus static Operations.Ops Live
  * @tsplus location "@effect-app/infra/services/Operations/live"
  */
-export declare const Live: import("effect/Layer").Layer<import("./service.js").OperationsId, never, import("./service.js").OperationsId>;
+export declare const Live: import("effect/Layer").Layer<never, never, import("./service.js").OperationsId>;
 //# sourceMappingURL=live.d.ts.map

package/dist/services/Operations/live.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/live.ts"],"names":[],"mappings":";;;;;AAyGA,eAAO,MAAM,IAAI,+GAEQ,CAAA"}
+{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/live.ts"],"names":[],"mappings":";;;;;AAyGA,eAAO,MAAM,IAAI,iFAEwB,CAAA"}

package/dist/services/Operations/live.js

@@ -86,5 +86,5 @@ const cleanupLoop = tsplus_module_1.forkScoped(tsplus_module_1.schedule(tsplus_m
 /**
  * @tsplus static Operations.Ops Live
  */
-export const Live = tsplus_module_13.provideMerge(tsplus_module_13.scopedDiscard(cleanupLoop))(tsplus_module_13.effect(Operations)(make));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvT3BlcmF0aW9ucy9saXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFFN0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxNQUFNLGdDQUFnQyxDQUFBO0FBQ3pGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDLG9CQUFvQixDQUFDLENBQUE7QUFFeEQsTUFBTSxJQUFJLEdBQUcscUJBQVksR0FBZSxFQUFFO0lBQ3hDLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxFQUEwQixDQUFBO0lBQzdDLE1BQU0sTUFBTSxHQUFHLDJCQUFPLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBRXpDLE1BQU0sT0FBTyxHQUFHLHlCQUFBLHFCQUNSLEdBQUcsRUFBRTtRQUNULE1BQU0sTUFBTSxHQUFHLDZCQUFBLElBQUksSUFBSSxFQUFFLEVBQVUsQ0FBQyxDQUFDLENBQUE7UUFDckMsc0RBQUEsR0FBRzthQUNBLE9BQU8sRUFBRSxHQUVELENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNwQixNQUFNLFdBQVcsR0FBRywwQkFBQSw2QkFBb0IsRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFXLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtZQUNuRixJQUFJLFdBQVcsR0FBRyxNQUFNLEVBQUUsQ0FBQztnQkFDekIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNoQixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsRUFDUSxvQkFBb0IsQ0FBQyxD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
+export const Live = tsplus_module_13.provideMerge(tsplus_module_13.scopedDiscard(cleanupLoop), tsplus_module_13.effect(Operations)(make));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvT3BlcmF0aW9ucy9saXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFFN0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxNQUFNLGdDQUFnQyxDQUFBO0FBQ3pGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekMsTUFBTSxjQUFjLEdBQUcsV0FBVyxDQUFDLG9CQUFvQixDQUFDLENBQUE7QUFFeEQsTUFBTSxJQUFJLEdBQUcscUJBQVksR0FBZSxFQUFFO0lBQ3hDLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxFQUEwQixDQUFBO0lBQzdDLE1BQU0sTUFBTSxHQUFHLDJCQUFPLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBRXpDLE1BQU0sT0FBTyxHQUFHLHlCQUFBLHFCQUNSLEdBQUcsRUFBRTtRQUNULE1BQU0sTUFBTSxHQUFHLDZCQUFBLElBQUksSUFBSSxFQUFFLEVBQVUsQ0FBQyxDQUFDLENBQUE7UUFDckMsc0RBQUEsR0FBRzthQUNBLE9BQU8sRUFBRSxHQUVELENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNwQixNQUFNLFdBQVcsR0FBRywwQkFBQSw2QkFBb0IsRUFBRSxDQUFDLFNBQVMsQ0FBQyxFQUFXLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtZQUNuRixJQUFJLFdBQVcsR0FBRyxNQUFNLEVBQUUsQ0FBQztnQkFDekIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNoQixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsRUFDUSxvQkFBb0IsQ0FBQyxD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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.106.1",
+  "version": "0.107.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.79.1",
-    "@effect-app/infra-adapters": "0.67.1",
-    "@effect-app/prelude": "0.80.1",
-    "@effect-app/schema": "0.73.1"
+    "@effect-app/infra-adapters": "0.67.2",
+    "@effect-app/prelude": "0.81.0",
+    "@effect-app/schema": "0.74.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",

package/_src/api/app.ts.bak

@@ -1,125 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { flow } from "@effect-app/core/Function"
-import * as S from "@effect-app/schema"
-
-import { NotFoundError, UnauthorizedError } from "./errors.js"
-
-export function handle<
-  TModule extends Record<
-    string,
-    any // { Class: S.SchemaAny; new (...args: any[]): any } | S.SchemaAny
-  >
->(
-  _: TModule & { ResponseOpenApi?: any },
-  adaptResponse?: any
-): <R, E>(
-  h: (
-    r: InstanceType<
-      S.GetRequest<TModule> extends { new(...args: any[]): any } ? S.GetRequest<TModule>
-        : never
-    >
-  ) => Effect<R, E, S.To<Extr<S.GetResponse<TModule>>>>
-) => {
-  h: typeof h
-  Request: S.GetRequest<TModule>
-  Response: S.GetResponse<TModule>
-  ResponseOpenApi: any
-} {
-  // TODO: Prevent over providing // no strict/shrink yet.
-  const Request = S.extractRequest(_)
-  const Response = S.extractResponse(_)
-
-  return <R, E>(
-    h: (
-      r: InstanceType<
-        S.GetRequest<TModule> extends { new(...args: any[]): any } ? S.GetRequest<TModule>
-          : never
-      >
-    ) => Effect<R, E, S.To<Extr<S.GetResponse<TModule>>>>
-  ) => ({
-    adaptResponse,
-    h,
-    Request,
-    Response,
-    ResponseOpenApi: _.ResponseOpenApi ?? Response
-  } as any)
-}
-
-type Extr<T> = T extends { Class: S.SchemaAny } ? T["Class"]
-  : T extends S.SchemaAny ? T
-  : never
-
-export function accessM_<T, UserId, Err>(
-  canAccess: (rsc: T, userId: UserId) => boolean,
-  bad: (rsc: T, userId: UserId) => Err
-) {
-  return <R, E, A>(
-    rsc: T,
-    userId: UserId,
-    ok: (rsc: T) => Effect<R, E, A>
-  ): Effect<R, E | Err, A> => {
-    if (canAccess(rsc, userId)) {
-      return ok(rsc)
-    }
-    return Effect.fail(bad(rsc, userId))
-  }
-}
-
-export function access_<T, UserId, Err>(
-  canAccess: (rsc: T, userId: UserId) => boolean,
-  bad: (rsc: T, userId: UserId) => Err
-) {
-  const auth = accessM_(canAccess, bad)
-  return <A>(rsc: T, userId: UserId, ok: (rsc: T) => A) => auth(rsc, userId, flow(ok, Effect.succeed))
-}
-
-export function accessM<T, UserId, Err>(
-  canAccess: (rsc: T, userId: UserId) => boolean,
-  bad: (rsc: T, userId: UserId) => Err
-) {
-  return <R, E, A>(userId: UserId, ok: (rsc: T) => Effect<R, E, A>) =>
-    (rsc: T): Effect<R, E | Err, A> => {
-      if (canAccess(rsc, userId)) {
-        return ok(rsc)
-      }
-      return Effect.fail(bad(rsc, userId))
-    }
-}
-
-export function access<T, UserId, Err>(
-  canAccess: (rsc: T, userId: UserId) => boolean,
-  bad: (rsc: T, userId: UserId) => Err
-) {
-  const auth = accessM(canAccess, bad)
-  return <A>(userId: UserId, ok: (rsc: T) => A) => auth(userId, flow(ok, Effect.succeed))
-}
-
-export function makeAuthorize<T, UserId>(
-  canAccess: (rsc: T, userId: UserId) => boolean,
-  type: string,
-  getId: (t: T) => string | number
-) {
-  return {
-    access_: access_(canAccess, () => new UnauthorizedError()),
-    access: access(canAccess, () => new UnauthorizedError()),
-    accessM_: accessM_(canAccess, () => new UnauthorizedError()),
-    accessM: accessM(canAccess, () => new UnauthorizedError()),
-
-    accessOrHide_: access_(
-      canAccess,
-      r => new NotFoundError(type, getId(r).toString())
-    ),
-    accessOrHide: access(
-      canAccess,
-      r => new NotFoundError(type, getId(r).toString())
-    ),
-    accessOrHideM_: accessM_(
-      canAccess,
-      r => new NotFoundError(type, getId(r).toString())
-    ),
-    accessOrHideM: accessM(
-      canAccess,
-      r => new NotFoundError(type, getId(r).toString())
-    )
-  }
-}

package/_src/api/errors.ts.bak

@@ -1,20 +0,0 @@
-export class NotFoundError {
-  public readonly _tag = "NotFoundError"
-  public readonly message: string
-  constructor(type: string, id: string) {
-    this.message = `Didn't find ${type}#${id}`
-  }
-}
-
-export class ValidationError {
-  public readonly _tag = "ValidationError"
-  constructor(public readonly errors: ReadonlyArray<unknown>) {}
-}
-
-export class NotLoggedInError {
-  public readonly _tag = "NotLoggedInError"
-}
-
-export class UnauthorizedError {
-  public readonly _tag = "UnauthorizedError"
-}

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

@@ -1,460 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import * as S from "@effect-app/schema"
-import { Encoder, extractSchema } from "@effect-app/schema"
-import type express from "express"
-
-import * as Ex from "@effect-app/infra-adapters/express"
-import type { NotFoundError, NotLoggedInError, UnauthorizedError, ValidationError } from "../../../errors.js"
-import type {
-  Encode,
-  Middleware,
-  MiddlewareHandler,
-  RequestHandler,
-  RequestHandlerOptRes,
-  RequestParsers
-} from "./schema/requestHandler.js"
-import { makeRequestParsers, parseRequestParams, respondSuccess } from "./schema/requestHandler.js"
-import { makeRouteDescriptor } from "./schema/routing.js"
-
-/*
-An app should take ownership over these
-*/
-export type SupportedErrors =
-  | ValidationError
-  | NotFoundError
-  | NotLoggedInError
-  | UnauthorizedError
-
-export function match<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA,
-  R2 = never,
-  PR = never
->(
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.match(r.Request.method.toLowerCase() as any)(
-    r.Request.path.split("?")[0],
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(
-    Effect(makeRouteDescriptor(r.Request.path, r.Request.method, r))
-  )
-}
-
-export function makeRequestHandler<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA = void,
-  R2 = never,
-  PR = never
->(
-  handle: RequestHandlerOptRes<
-    R | PR,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  h?: (req: express.Request, res: express.Response) => Layer<R2, SupportedErrors, PR>
-) {
-  const { Request, Response } = handle
-  const res = Response ? extractSchema(Response as any) : S.Void
-  const encodeResponse = handle.adaptResponse
-    ? (req: ReqA) => Encoder.for(handle.adaptResponse(req))
-    : () => Encoder.for(res)
-
-  return handleRequest<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ResA,
-    never,
-    ReqA,
-    R2,
-    PR
-  >(makeRequestParsers(Request), encodeResponse as any, handle.h, h)
-}
-export function handleRequest<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ResA,
-  ResE,
-  ReqA extends {} & PathA & BodyA & QueryA,
-  R2 = never,
-  PR = never
->(
-  requestParsers: RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>,
-  encodeResponse: (r: ReqA) => Encode<ResA, ResE>,
-  handle: (r: ReqA) => Effect<R | PR, SupportedErrors, ResA>,
-  h?: (req: express.Request, res: express.Response) => Layer<R2, SupportedErrors, PR>
-) {
-  const parseRequest = parseRequestParams(requestParsers)
-  const respond = respondSuccess(encodeResponse)
-  return (req: express.Request, res: express.Response) =>
-    parseRequest(req)
-      .map(({ body, path, query }) => {
-        const hn = {
-          ...body.value,
-          ...query.value,
-          ...path.value
-        } as ReqA
-        return hn
-      })
-      .flatMap(inp => {
-        const hn = handle(inp)
-        const r = h ? hn.provide(h(req, res)) : hn
-        return (
-          r as never as Effect<Exclude<R | R2, PR>, SupportedErrors, ResA>
-        ).flatMap(outp => respond(inp, res)(outp))
-      })
-      .catchTag("ValidationError", err =>
-        Effect.sync(() => {
-          res.status(400).send(err.errors)
-        }))
-      .catchTag("NotFoundError", err =>
-        Effect.sync(() => {
-          res.status(404).send(err)
-        }))
-      .catchTag("NotLoggedInError", err =>
-        Effect.sync(() => {
-          res.status(401).send(err)
-        }))
-      .catchTag("UnauthorizedError", err =>
-        Effect.sync(() => {
-          res.status(403).send(err)
-        }))
-      // final catch all; expecting never so that unhandled known errors will show up
-      .catchAll((err: never) =>
-        Effect(
-          console.error(
-            "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect",
-            err
-          )
-        ).flatMap(Effect.die)
-      )
-  // .tapCause(() => Effect(res.status(500).send()))
-}
-
-// Additional convenience helpers
-
-export function get<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA,
-  R2 = never,
-  PR = never
->(
-  path: string,
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.get(
-    path,
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(Effect(makeRouteDescriptor(path, "GET", r)))
-}
-
-export function post<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA = void,
-  R2 = never,
-  PR = never
->(
-  path: string,
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.post(
-    path,
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(Effect(makeRouteDescriptor(path, "POST", r)))
-}
-
-export function put<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA = void,
-  R2 = never,
-  PR = never
->(
-  path: string,
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.put(
-    path,
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(Effect(makeRouteDescriptor(path, "PUT", r)))
-}
-
-export function patch<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA = void,
-  R2 = never,
-  PR = never
->(
-  path: string,
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.patch(
-    path,
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(Effect(makeRouteDescriptor(path, "PATCH", r)))
-}
-
-function del<
-  R,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends {} & PathA & QueryA & BodyA,
-  ResA = void,
-  R2 = never,
-  PR = never
->(
-  path: string,
-  r: RequestHandler<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors
-  >,
-  mw?: Middleware<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    SupportedErrors,
-    R2,
-    PR
-  >
-) {
-  let h: MiddlewareHandler<SupportedErrors, R2, PR> | undefined = undefined
-  if (mw) {
-    const { handle, handler } = mw(r)
-    r = handler
-    h = handle
-  }
-  return Ex.delete(
-    path,
-    makeRequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, R2, PR>(
-      r,
-      h
-    )
-  ).zipRight(Effect(makeRouteDescriptor(path, "DELETE", r)))
-}
-
-export { del as delete }