@effect/platform 0.35.0 → 0.37.0

package/dist/esm/internal/http/router.js

@@ -6,7 +6,7 @@ import * as Effectable from "effect/Effectable";
 import { dual } from "effect/Function";
 import * as Inspectable from "effect/Inspectable";
 import * as Option from "effect/Option";
-import FindMyWay from "find-my-way";
+import * as FindMyWay from "find-my-way-ts";
 import * as Error from "../../Http/ServerError.js";
 import * as ServerRequest from "../../Http/ServerRequest.js";
 /** @internal */
@@ -72,17 +72,14 @@ class RouterImpl extends Effectable.StructuralClass {
   }
 }
 const toHttpApp = self => {
-  const router = FindMyWay();
+  const router = FindMyWay.make();
   const mounts = Chunk.toReadonlyArray(self.mounts);
   const mountsLen = mounts.length;
   Chunk.forEach(self.routes, route => {
-    function fn() {
-      return route;
-    }
     if (route.method === "*") {
-      router.all(route.path, fn);
+      router.all(route.path, route);
     } else {
-      router.on(route.method, route.path, fn);
+      router.on(route.method, route.path, route);
     }
   });
   return Effect.flatMap(ServerRequest.ServerRequest, request => {
@@ -95,15 +92,15 @@ const toHttpApp = self => {
       }
     }
     let result = router.find(request.method, request.url);
-    if (result === null && request.method === "HEAD") {
+    if (result === undefined && request.method === "HEAD") {
       result = router.find("GET", request.url);
     }
-    if (result === null) {
+    if (result === undefined) {
       return Effect.fail(Error.RouteNotFound({
         request
       }));
     }
-    const route = result.handler();
+    const route = result.handler;
     if (route.prefix._tag === "Some") {
       request = sliceRequestUrl(request, route.prefix.value);
     }

package/dist/esm/internal/http/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","names":["Schema","Chunk","Context","Effect","Effectable","dual","Inspectable","Option","FindMyWay","Error","ServerRequest","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","Tag","params","map","_","searchParams","schemaParams","schema","parse","flatMap","schemaPathParams","schemaSearchParams","RouterImpl","StructuralClass","routes","mounts","constructor","httpApp","commit","undefined","toHttpApp","toJSON","_id","toString","format","NodeInspectSymbol","self","router","toReadonlyArray","mountsLen","length","forEach","route","fn","method","all","path","on","request","i","app","url","startsWith","provideService","sliceRequestUrl","result","find","fail","RouteNotFound","handler","prefix","_tag","value","mapInputContext","context","add","RouteContextImpl","prefexLen","modify","slice","RouteImpl","none","empty","fromIterable","makeRoute","concat","that","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","some","mount","mountApp","append","get","post","put","patch","del","head","options","use","f","catchAll","catchAllCause","catchTag","k","catchTags","cases","tag","service","provideServiceEffect","effect"],"sources":["../../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"router.js","names":["Schema","Chunk","Context","Effect","Effectable","dual","Inspectable","Option","FindMyWay","Error","ServerRequest","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","Tag","params","map","_","searchParams","schemaParams","schema","parse","flatMap","schemaPathParams","schemaSearchParams","RouterImpl","StructuralClass","routes","mounts","constructor","httpApp","commit","undefined","toHttpApp","toJSON","_id","toString","format","NodeInspectSymbol","self","router","make","toReadonlyArray","mountsLen","length","forEach","route","method","all","path","on","request","i","app","url","startsWith","provideService","sliceRequestUrl","result","find","fail","RouteNotFound","handler","prefix","_tag","value","mapInputContext","context","add","RouteContextImpl","prefexLen","modify","slice","RouteImpl","none","empty","fromIterable","makeRoute","concat","that","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","some","mount","mountApp","append","get","post","put","patch","del","head","options","use","f","catchAll","catchAllCause","catchTag","k","catchTags","cases","tag","service","provideServiceEffect","effect"],"sources":["../../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/esm/internal/http/server.js

@@ -1,6 +1,7 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import { dual } from "effect/Function";
+import * as Layer from "effect/Layer";
 /** @internal */
 export const TypeId = /*#__PURE__*/Symbol.for("@effect/platform/Http/Server");
 /** @internal */
@@ -13,5 +14,7 @@ export const isServer = u => typeof u === "object" && u !== null && TypeId in u;
 /** @internal */
 export const make = options => Object.assign(Object.create(serverProto), options);
 /** @internal */
-export const serve = /*#__PURE__*/dual(args => Effect.isEffect(args[0]), (httpApp, middleware) => Effect.flatMap(serverTag, server => server.serve(httpApp, middleware)));
+export const serve = /*#__PURE__*/dual(args => Effect.isEffect(args[0]), (httpApp, middleware) => Layer.scopedDiscard(Effect.flatMap(serverTag, server => server.serve(httpApp, middleware))));
+/** @internal */
+export const serveEffect = /*#__PURE__*/dual(args => Effect.isEffect(args[0]), (httpApp, middleware) => Effect.flatMap(serverTag, server => server.serve(httpApp, middleware)));
 //# sourceMappingURL=server.js.map

package/dist/esm/internal/http/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","names":["Context","Effect","dual","TypeId","Symbol","for","serverTag","Tag","serverProto","isServer","u","make","options","Object","assign","create","serve","args","isEffect","httpApp","middleware","flatMap","server"],"sources":["../../../../src/internal/http/server.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,IAAI,QAAQ,iBAAiB;AAQtC;AACA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAAC,8BAA8B,CAAkB;AAEhG;AACA,OAAO,MAAMC,SAAS,gBAAGN,OAAO,CAACO,GAAG,CAAgBJ,MAAM,CAAC;AAE3D,MAAMK,WAAW,GAAG;EAClB,CAACL,MAAM,GAAGA;CACX;AAED;AACA,OAAO,MAAMM,QAAQ,GAAIC,CAAU,IAAyB,OAAOA,CAAC,KAAK,QAAQ,IAAIA,CAAC,KAAK,IAAI,IAAIP,MAAM,IAAIO,CAAC;AAE9G;AACA,OAAO,MAAMC,IAAI,GACfC,OAMC,IACiBC,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAACP,WAAW,CAAC,EAAEI,OAAO,CAAC;AAEtE;AACA,OAAO,MAAMI,KAAK,gBAAGd,IAAI,CA+BtBe,IAAI,IAAKhB,MAAM,CAACiB,QAAQ,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,EACjC,CACCE,OAA0B,EAC1BC,UAAoD,KAMpDnB,MAAM,CAACoB,OAAO,CACZf,SAAS,EACRgB,MAAM,IAAKA,MAAM,CAACN,KAAK,CAACG,OAAO,EAAEC,UAAU,CAAC,CACtC,CACZ"}
+{"version":3,"file":"server.js","names":["Context","Effect","dual","Layer","TypeId","Symbol","for","serverTag","Tag","serverProto","isServer","u","make","options","Object","assign","create","serve","args","isEffect","httpApp","middleware","scopedDiscard","flatMap","server","serveEffect"],"sources":["../../../../src/internal/http/server.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAOrC;AACA,OAAO,MAAMC,MAAM,gBAAkBC,MAAM,CAACC,GAAG,CAAC,8BAA8B,CAAkB;AAEhG;AACA,OAAO,MAAMC,SAAS,gBAAGP,OAAO,CAACQ,GAAG,CAAgBJ,MAAM,CAAC;AAE3D,MAAMK,WAAW,GAAG;EAClB,CAACL,MAAM,GAAGA;CACX;AAED;AACA,OAAO,MAAMM,QAAQ,GAAIC,CAAU,IAAyB,OAAOA,CAAC,KAAK,QAAQ,IAAIA,CAAC,KAAK,IAAI,IAAIP,MAAM,IAAIO,CAAC;AAE9G;AACA,OAAO,MAAMC,IAAI,GACfC,OAMC,IACiBC,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAACP,WAAW,CAAC,EAAEI,OAAO,CAAC;AAEtE;AACA,OAAO,MAAMI,KAAK,gBAAGf,IAAI,CA+BtBgB,IAAI,IAAKjB,MAAM,CAACkB,QAAQ,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,EAClC,CACEE,OAA0B,EAC1BC,UAAqD,KAMrDlB,KAAK,CAACmB,aAAa,CACjBrB,MAAM,CAACsB,OAAO,CACZhB,SAAS,EACRiB,MAAM,IAAKA,MAAM,CAACP,KAAK,CAACG,OAAO,EAAEC,UAAW,CAAC,CAC/C,CACK,CACX;AAED;AACA,OAAO,MAAMI,WAAW,gBAAGvB,IAAI,CA+B5BgB,IAAI,IAAKjB,MAAM,CAACkB,QAAQ,CAACD,IAAI,CAAC,CAAC,CAAC,CAAC,EACjC,CACCE,OAA0B,EAC1BC,UAAoD,KAMpDpB,MAAM,CAACsB,OAAO,CACZhB,SAAS,EACRiB,MAAM,IAAKA,MAAM,CAACP,KAAK,CAACG,OAAO,EAAEC,UAAU,CAAC,CACtC,CACZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform",
-  "version": "0.35.0",
+  "version": "0.37.0",
   "description": "Unified interfaces for common platform-specific services",
   "license": "MIT",
   "repository": {
@@ -10,7 +10,7 @@
   "sideEffects": [],
   "author": "Effect contributors",
   "dependencies": {
-    "find-my-way": "^7.7.0",
+    "find-my-way-ts": "^0.1.0",
     "multipasta": "^0.1.19",
     "path-browserify": "^1.0.1"
   },

package/src/Http/Router.ts

@@ -59,6 +59,12 @@ export const RouteTypeId: unique symbol = internal.RouteTypeId
  */
 export type RouteTypeId = typeof RouteTypeId
 
+/**
+ * @since 1.0.0
+ * @category models
+ */
+export type PathInput = `/${string}` | "*"
+
 /**
  * @since 1.0.0
  * @category models
@@ -66,7 +72,7 @@ export type RouteTypeId = typeof RouteTypeId
 export interface Route<R, E> {
   readonly [RouteTypeId]: RouteTypeId
   readonly method: Method.Method | "*"
-  readonly path: string
+  readonly path: PathInput
   readonly handler: Route.Handler<R, E>
   readonly prefix: Option.Option<string>
 }
@@ -177,8 +183,9 @@ export const fromIterable: <R, E>(
  */
 export const makeRoute: <R, E>(
   method: Method.Method,
-  path: string,
-  handler: Route.Handler<R, E>
+  path: PathInput,
+  handler: Route.Handler<R, E>,
+  prefix?: Option.Option<string>
 ) => Route<R, E> = internal.makeRoute
 
 /**
@@ -186,8 +193,8 @@ export const makeRoute: <R, E>(
  * @category combinators
  */
 export const prefixAll: {
-  (prefix: string): <R, E>(self: Router<R, E>) => Router<R, E>
-  <R, E>(self: Router<R, E>, prefix: string): Router<R, E>
+  (prefix: PathInput): <R, E>(self: Router<R, E>) => Router<R, E>
+  <R, E>(self: Router<R, E>, prefix: PathInput): Router<R, E>
 } = internal.prefixAll
 
 /**
@@ -209,8 +216,8 @@ export const concat: {
  * @category routing
  */
 export const mount: {
-  <R1, E1>(path: string, that: Router<R1, E1>): <R, E>(self: Router<R, E>) => Router<R1 | R, E1 | E>
-  <R, E, R1, E1>(self: Router<R, E>, path: string, that: Router<R1, E1>): Router<R | R1, E | E1>
+  <R1, E1>(path: `/${string}`, that: Router<R1, E1>): <R, E>(self: Router<R, E>) => Router<R1 | R, E1 | E>
+  <R, E, R1, E1>(self: Router<R, E>, path: `/${string}`, that: Router<R1, E1>): Router<R | R1, E | E1>
 } = internal.mount
 
 /**
@@ -219,7 +226,7 @@ export const mount: {
  */
 export const mountApp: {
   <R1, E1>(
-    path: string,
+    path: `/${string}`,
     that: App.Default<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -229,7 +236,7 @@ export const mountApp: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: `/${string}`,
     that: App.Default<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -245,7 +252,7 @@ export const route: (
   method: Method.Method | "*"
 ) => {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -255,7 +262,7 @@ export const route: (
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -269,7 +276,7 @@ export const route: (
  */
 export const all: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -279,7 +286,7 @@ export const all: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -293,7 +300,7 @@ export const all: {
  */
 export const get: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -303,7 +310,7 @@ export const get: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -317,7 +324,7 @@ export const get: {
  */
 export const post: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -327,7 +334,7 @@ export const post: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -341,7 +348,7 @@ export const post: {
  */
 export const patch: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -351,7 +358,7 @@ export const patch: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -365,7 +372,7 @@ export const patch: {
  */
 export const put: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -375,7 +382,7 @@ export const put: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -389,7 +396,7 @@ export const put: {
  */
 export const del: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -399,7 +406,7 @@ export const del: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -413,7 +420,7 @@ export const del: {
  */
 export const head: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -423,7 +430,7 @@ export const head: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,
@@ -437,7 +444,7 @@ export const head: {
  */
 export const options: {
   <R1, E1>(
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): <R, E>(
     self: Router<R, E>
@@ -447,7 +454,7 @@ export const options: {
   >
   <R, E, R1, E1>(
     self: Router<R, E>,
-    path: string,
+    path: PathInput,
     handler: Route.Handler<R1, E1>
   ): Router<
     Exclude<R, RouteContext | ServerRequest.ServerRequest> | Exclude<R1, RouteContext | ServerRequest.ServerRequest>,

package/src/Http/Server.ts

@@ -3,11 +3,11 @@
  */
 import type * as Context from "effect/Context"
 import type * as Effect from "effect/Effect"
+import type * as Layer from "effect/Layer"
 import type * as Scope from "effect/Scope"
 import * as internal from "../internal/http/server.js"
 import type * as App from "./App.js"
 import type * as Middleware from "./Middleware.js"
-import type * as Error from "./ServerError.js"
 import type * as ServerRequest from "./ServerRequest.js"
 
 /**
@@ -31,16 +31,16 @@ export interface Server {
   readonly serve: {
     <R, E>(httpApp: App.Default<R, E>): Effect.Effect<
       Exclude<R, ServerRequest.ServerRequest> | Scope.Scope,
-      Error.ServeError,
-      never
+      never,
+      void
     >
     <R, E, App extends App.Default<any, any>>(
       httpApp: App.Default<R, E>,
       middleware: Middleware.Middleware.Applied<R, E, App>
     ): Effect.Effect<
       Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest> | Scope.Scope,
-      Error.ServeError,
-      never
+      never,
+      void
     >
   }
   readonly address: Address
@@ -94,7 +94,7 @@ export const make: (
     readonly serve: (
       httpApp: App.Default<never, unknown>,
       middleware?: Middleware.Middleware
-    ) => Effect.Effect<Scope.Scope, Error.ServeError, never>
+    ) => Effect.Effect<Scope.Scope, never, void>
     readonly address: Address
   }
 ) => Server = internal.make
@@ -104,31 +104,41 @@ export const make: (
  * @category accessors
  */
 export const serve: {
+  (): <R, E>(httpApp: App.Default<R, E>) => Layer.Layer<Server | Exclude<R, ServerRequest.ServerRequest>, never, never>
+  <R, E, App extends App.Default<any, any>>(
+    middleware: Middleware.Middleware.Applied<R, E, App>
+  ): (
+    httpApp: App.Default<R, E>
+  ) => Layer.Layer<Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>, never, never>
+  <R, E>(httpApp: App.Default<R, E>): Layer.Layer<Server | Exclude<R, ServerRequest.ServerRequest>, never, never>
+  <R, E, App extends App.Default<any, any>>(
+    httpApp: App.Default<R, E>,
+    middleware: Middleware.Middleware.Applied<R, E, App>
+  ): Layer.Layer<Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>, never, never>
+} = internal.serve
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const serveEffect: {
   (): <R, E>(
     httpApp: App.Default<R, E>
-  ) => Effect.Effect<
-    Server | Scope.Scope | Exclude<R, ServerRequest.ServerRequest>,
-    Error.ServeError,
-    never
-  >
+  ) => Effect.Effect<Scope.Scope | Server | Exclude<R, ServerRequest.ServerRequest>, never, void>
   <R, E, App extends App.Default<any, any>>(
     middleware: Middleware.Middleware.Applied<R, E, App>
   ): (
     httpApp: App.Default<R, E>
   ) => Effect.Effect<
-    Server | Scope.Scope | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>,
-    Error.ServeError,
-    never
+    Scope.Scope | Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>,
+    never,
+    void
   >
   <R, E>(
     httpApp: App.Default<R, E>
-  ): Effect.Effect<Server | Scope.Scope | Exclude<R, ServerRequest.ServerRequest>, Error.ServeError, never>
+  ): Effect.Effect<Scope.Scope | Server | Exclude<R, ServerRequest.ServerRequest>, never, void>
   <R, E, App extends App.Default<any, any>>(
     httpApp: App.Default<R, E>,
     middleware: Middleware.Middleware.Applied<R, E, App>
-  ): Effect.Effect<
-    Server | Scope.Scope | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>,
-    Error.ServeError,
-    never
-  >
-} = internal.serve
+  ): Effect.Effect<Scope.Scope | Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>, never, void>
+} = internal.serveEffect

package/src/internal/http/router.ts

@@ -7,8 +7,7 @@ import * as Effectable from "effect/Effectable"
 import { dual } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
 import * as Option from "effect/Option"
-import type { HTTPMethod } from "find-my-way"
-import FindMyWay from "find-my-way"
+import * as FindMyWay from "find-my-way-ts"
 import type * as App from "../../Http/App.js"
 import type * as Method from "../../Http/Method.js"
 import type * as Router from "../../Http/Router.js"
@@ -95,17 +94,14 @@ class RouterImpl<R, E> extends Effectable.StructuralClass<
 const toHttpApp = <R, E>(
   self: Router.Router<R, E>
 ): App.Default<Router.Router.ExcludeProvided<R>, E | Error.RouteNotFound> => {
-  const router = FindMyWay()
+  const router = FindMyWay.make<Router.Route<R, E>>()
   const mounts = Chunk.toReadonlyArray(self.mounts)
   const mountsLen = mounts.length
   Chunk.forEach(self.routes, (route) => {
-    function fn() {
-      return route
-    }
     if (route.method === "*") {
-      router.all(route.path, fn)
+      router.all(route.path, route)
     } else {
-      router.on(route.method, route.path, fn)
+      router.on(route.method, route.path, route)
     }
   })
   return Effect.flatMap(
@@ -124,14 +120,14 @@ const toHttpApp = <R, E>(
         }
       }
 
-      let result = router.find(request.method as HTTPMethod, request.url)
-      if (result === null && request.method === "HEAD") {
+      let result = router.find(request.method, request.url)
+      if (result === undefined && request.method === "HEAD") {
         result = router.find("GET", request.url)
       }
-      if (result === null) {
+      if (result === undefined) {
         return Effect.fail(Error.RouteNotFound({ request }))
       }
-      const route = (result.handler as any)() as Router.Route<R, E>
+      const route = result.handler
       if (route.prefix._tag === "Some") {
         request = sliceRequestUrl(request, route.prefix.value)
       }
@@ -157,7 +153,7 @@ class RouteImpl<R, E> implements Router.Route<R, E> {
   readonly [RouteTypeId]: Router.RouteTypeId
   constructor(
     readonly method: Method.Method | "*",
-    readonly path: string,
+    readonly path: Router.PathInput,
     readonly handler: Router.Route.Handler<R, E>,
     readonly prefix = Option.none<string>()
   ) {
@@ -186,7 +182,7 @@ export const fromIterable = <R, E>(
 /** @internal */
 export const makeRoute = <R, E>(
   method: Method.Method,
-  path: string,
+  path: Router.PathInput,
   handler: Router.Route.Handler<R, E>,
   prefix: Option.Option<string> = Option.none()
 ): Router.Route<R, E> => new RouteImpl(method, path, handler, prefix)
@@ -197,12 +193,14 @@ export const concat = dual<
   <R, E, R1, E1>(self: Router.Router<R, E>, that: Router.Router<R1, E1>) => Router.Router<R | R1, E | E1>
 >(2, (self, that) => new RouterImpl(Chunk.appendAll(self.routes, that.routes) as any, self.mounts))
 
-const removeTrailingSlash = (path: string) => (path.endsWith("/") ? path.slice(0, -1) : path)
+const removeTrailingSlash = (
+  path: Router.PathInput
+): Router.PathInput => (path.endsWith("/") ? path.slice(0, -1) : path) as any
 
 /** @internal */
 export const prefixAll = dual<
-  (prefix: string) => <R, E>(self: Router.Router<R, E>) => Router.Router<R, E>,
-  <R, E>(self: Router.Router<R, E>, prefix: string) => Router.Router<R, E>
+  (prefix: Router.PathInput) => <R, E>(self: Router.Router<R, E>) => Router.Router<R, E>,
+  <R, E>(self: Router.Router<R, E>, prefix: Router.PathInput) => Router.Router<R, E>
 >(
   2,
   (self, prefix) => {
@@ -211,7 +209,7 @@ export const prefixAll = dual<
       Chunk.map(self.routes, (route) =>
         new RouteImpl(
           route.method,
-          route.path === "/" ? prefix : prefix + route.path,
+          route.path === "/" ? prefix : prefix + route.path as Router.PathInput,
           route.handler,
           Option.orElse(
             Option.map(route.prefix, (_) => prefix + _),
@@ -226,12 +224,12 @@ export const prefixAll = dual<
 /** @internal */
 export const mount = dual<
   <R1, E1>(
-    path: string,
+    path: `/${string}`,
     that: Router.Router<R1, E1>
   ) => <R, E>(self: Router.Router<R, E>) => Router.Router<R | R1, E | E1>,
   <R, E, R1, E1>(
     self: Router.Router<R, E>,
-    path: string,
+    path: `/${string}`,
     that: Router.Router<R1, E1>
   ) => Router.Router<R | R1, E | E1>
 >(
@@ -242,14 +240,14 @@ export const mount = dual<
 /** @internal */
 export const mountApp = dual<
   <R1, E1>(
-    path: string,
+    path: `/${string}`,
     that: App.Default<R1, E1>
   ) => <R, E>(
     self: Router.Router<R, E>
   ) => Router.Router<Router.Router.ExcludeProvided<R | R1>, E | E1>,
   <R, E, R1, E1>(
     self: Router.Router<R, E>,
-    path: string,
+    path: `/${string}`,
     that: App.Default<R1, E1>
   ) => Router.Router<Router.Router.ExcludeProvided<R | R1>, E | E1>
 >(
@@ -261,27 +259,27 @@ export const mountApp = dual<
 /** @internal */
 export const route = (method: Method.Method | "*"): {
   <R1, E1>(
-    path: string,
+    path: Router.PathInput,
     handler: Router.Route.Handler<R1, E1>
   ): <R, E>(
     self: Router.Router<R, E>
   ) => Router.Router<Router.Router.ExcludeProvided<R | R1>, E1 | E>
   <R, E, R1, E1>(
     self: Router.Router<R, E>,
-    path: string,
+    path: Router.PathInput,
     handler: Router.Route.Handler<R1, E1>
   ): Router.Router<Router.Router.ExcludeProvided<R | R1>, E1 | E>
 } =>
   dual<
     <R1, E1>(
-      path: string,
+      path: Router.PathInput,
       handler: Router.Route.Handler<R1, E1>
     ) => <R, E>(
       self: Router.Router<R, E>
     ) => Router.Router<Router.Router.ExcludeProvided<R | R1>, E | E1>,
     <R, E, R1, E1>(
       self: Router.Router<R, E>,
-      path: string,
+      path: Router.PathInput,
       handler: Router.Route.Handler<R1, E1>
     ) => Router.Router<Router.Router.ExcludeProvided<R | R1>, E | E1>
   >(3, (self, path, handler) =>