effect-start 0.29.0 → 0.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (228) hide show
  1. package/README.md +1 -1
  2. package/dist/{_Development.d.ts → Development.d.ts} +2 -1
  3. package/dist/Development.d.ts.map +1 -0
  4. package/dist/{_Development.js → Development.js} +2 -1
  5. package/dist/Development.js.map +1 -0
  6. package/dist/Fetch.d.ts +0 -8
  7. package/dist/Fetch.d.ts.map +1 -1
  8. package/dist/Fetch.js +6 -22
  9. package/dist/Fetch.js.map +1 -1
  10. package/dist/FileRouter.js +1 -1
  11. package/dist/FileRouter.js.map +1 -1
  12. package/dist/GlobalLayer.d.ts.map +1 -1
  13. package/dist/GlobalLayer.js +1 -1
  14. package/dist/GlobalLayer.js.map +1 -1
  15. package/dist/Html.d.ts +32 -0
  16. package/dist/Html.d.ts.map +1 -0
  17. package/dist/{hyper/HyperHtml.js → Html.js} +45 -26
  18. package/dist/Html.js.map +1 -0
  19. package/dist/Route.d.ts +20 -7
  20. package/dist/Route.d.ts.map +1 -1
  21. package/dist/Route.js +24 -3
  22. package/dist/Route.js.map +1 -1
  23. package/dist/RouteBody.d.ts +13 -6
  24. package/dist/RouteBody.d.ts.map +1 -1
  25. package/dist/RouteBody.js +38 -27
  26. package/dist/RouteBody.js.map +1 -1
  27. package/dist/RouteHttp.d.ts.map +1 -1
  28. package/dist/RouteHttp.js +18 -1
  29. package/dist/RouteHttp.js.map +1 -1
  30. package/dist/RouteMount.js +1 -1
  31. package/dist/RouteMount.js.map +1 -1
  32. package/dist/System.d.ts +1 -1
  33. package/dist/System.d.ts.map +1 -1
  34. package/dist/System.js.map +1 -1
  35. package/dist/_ChildProcess.d.ts +1 -1
  36. package/dist/_ChildProcess.d.ts.map +1 -1
  37. package/dist/_ChildProcess.js.map +1 -1
  38. package/dist/bun/BunRoute.d.ts +1 -1
  39. package/dist/bun/BunRoute.d.ts.map +1 -1
  40. package/dist/bun/BunRoute.js +102 -33
  41. package/dist/bun/BunRoute.js.map +1 -1
  42. package/dist/bun/BunServer.d.ts.map +1 -1
  43. package/dist/bun/BunServer.js.map +1 -1
  44. package/dist/cloudflare/CloudflareTunnel.d.ts +12 -0
  45. package/dist/cloudflare/CloudflareTunnel.d.ts.map +1 -0
  46. package/dist/{x/cloudflare → cloudflare}/CloudflareTunnel.js +1 -1
  47. package/dist/cloudflare/CloudflareTunnel.js.map +1 -0
  48. package/dist/cloudflare/index.d.ts.map +1 -0
  49. package/dist/cloudflare/index.js.map +1 -0
  50. package/dist/index.d.ts +3 -1
  51. package/dist/index.d.ts.map +1 -1
  52. package/dist/index.js +3 -1
  53. package/dist/index.js.map +1 -1
  54. package/dist/jsx-runtime.d.ts +8 -0
  55. package/dist/jsx-runtime.d.ts.map +1 -0
  56. package/dist/{hyper/jsx-runtime.js → jsx-runtime.js} +2 -2
  57. package/dist/jsx-runtime.js.map +1 -0
  58. package/dist/studio/routes/errors/route.d.ts.map +1 -1
  59. package/dist/studio/routes/errors/route.js +3 -4
  60. package/dist/studio/routes/errors/route.js.map +1 -1
  61. package/dist/studio/routes/fiberDetail.d.ts.map +1 -1
  62. package/dist/studio/routes/fiberDetail.js +1 -2
  63. package/dist/studio/routes/fiberDetail.js.map +1 -1
  64. package/dist/studio/routes/fibers/route.d.ts.map +1 -1
  65. package/dist/studio/routes/fibers/route.js +3 -4
  66. package/dist/studio/routes/fibers/route.js.map +1 -1
  67. package/dist/studio/routes/logs/route.d.ts.map +1 -1
  68. package/dist/studio/routes/logs/route.js +3 -4
  69. package/dist/studio/routes/logs/route.js.map +1 -1
  70. package/dist/studio/routes/metrics/route.d.ts.map +1 -1
  71. package/dist/studio/routes/metrics/route.js +3 -4
  72. package/dist/studio/routes/metrics/route.js.map +1 -1
  73. package/dist/studio/routes/route.d.ts +1 -1
  74. package/dist/studio/routes/routes/route.d.ts.map +1 -1
  75. package/dist/studio/routes/routes/route.js +1 -2
  76. package/dist/studio/routes/routes/route.js.map +1 -1
  77. package/dist/studio/routes/services/route.d.ts.map +1 -1
  78. package/dist/studio/routes/services/route.js +1 -2
  79. package/dist/studio/routes/services/route.js.map +1 -1
  80. package/dist/studio/routes/system/route.d.ts.map +1 -1
  81. package/dist/studio/routes/system/route.js +3 -4
  82. package/dist/studio/routes/system/route.js.map +1 -1
  83. package/dist/studio/routes/traceDetail.d.ts.map +1 -1
  84. package/dist/studio/routes/traceDetail.js +1 -2
  85. package/dist/studio/routes/traceDetail.js.map +1 -1
  86. package/dist/studio/routes/traces/route.d.ts.map +1 -1
  87. package/dist/studio/routes/traces/route.js +3 -4
  88. package/dist/studio/routes/traces/route.js.map +1 -1
  89. package/dist/studio/routes/tree.d.ts +1 -1
  90. package/dist/studio/ui/Errors.d.ts +1 -1
  91. package/dist/studio/ui/Errors.d.ts.map +1 -1
  92. package/dist/studio/ui/Fibers.d.ts +2 -2
  93. package/dist/studio/ui/Fibers.d.ts.map +1 -1
  94. package/dist/studio/ui/Logs.d.ts +1 -1
  95. package/dist/studio/ui/Logs.d.ts.map +1 -1
  96. package/dist/studio/ui/Metrics.d.ts +1 -1
  97. package/dist/studio/ui/Metrics.d.ts.map +1 -1
  98. package/dist/studio/ui/Routes.d.ts +1 -1
  99. package/dist/studio/ui/Routes.d.ts.map +1 -1
  100. package/dist/studio/ui/Services.d.ts +1 -1
  101. package/dist/studio/ui/Services.d.ts.map +1 -1
  102. package/dist/studio/ui/Shell.d.ts +2 -2
  103. package/dist/studio/ui/Shell.d.ts.map +1 -1
  104. package/dist/studio/ui/System.d.ts +1 -1
  105. package/dist/studio/ui/System.d.ts.map +1 -1
  106. package/dist/studio/ui/Traces.d.ts +3 -3
  107. package/dist/studio/ui/Traces.d.ts.map +1 -1
  108. package/dist/tailscale/TailscaleTunnel.d.ts +16 -0
  109. package/dist/tailscale/TailscaleTunnel.d.ts.map +1 -0
  110. package/dist/{x/tailscale → tailscale}/TailscaleTunnel.js +2 -2
  111. package/dist/tailscale/TailscaleTunnel.js.map +1 -0
  112. package/dist/tailscale/index.d.ts.map +1 -0
  113. package/dist/tailscale/index.js.map +1 -0
  114. package/dist/tailwind/TailwindPlugin.d.ts.map +1 -0
  115. package/dist/tailwind/TailwindPlugin.js.map +1 -0
  116. package/dist/tailwind/compile.d.ts.map +1 -0
  117. package/dist/{x/tailwind → tailwind}/compile.js +1 -1
  118. package/dist/tailwind/compile.js.map +1 -0
  119. package/dist/tailwind/index.d.ts +3 -0
  120. package/dist/tailwind/index.d.ts.map +1 -0
  121. package/dist/tailwind/index.js +3 -0
  122. package/dist/tailwind/index.js.map +1 -0
  123. package/dist/tailwind/plugin.d.ts.map +1 -0
  124. package/dist/{x/tailwind → tailwind}/plugin.js +1 -1
  125. package/dist/tailwind/plugin.js.map +1 -0
  126. package/package.json +37 -37
  127. package/src/{_Development.ts → Development.ts} +5 -0
  128. package/src/Fetch.ts +10 -37
  129. package/src/FileRouter.ts +1 -1
  130. package/src/GlobalLayer.ts +3 -1
  131. package/src/{hyper/HyperHtml.ts → Html.ts} +90 -30
  132. package/src/Route.ts +67 -11
  133. package/src/RouteBody.ts +87 -62
  134. package/src/RouteHttp.ts +19 -1
  135. package/src/RouteMount.ts +1 -1
  136. package/src/System.ts +1 -1
  137. package/src/_ChildProcess.ts +1 -1
  138. package/src/bun/BunRoute.ts +125 -37
  139. package/src/bun/BunServer.ts +1 -0
  140. package/src/{x/cloudflare → cloudflare}/CloudflareTunnel.ts +1 -1
  141. package/src/index.ts +3 -1
  142. package/src/jsx-runtime.ts +15 -0
  143. package/src/{hyper/jsx.d.ts → jsx.d.ts} +3 -3
  144. package/src/studio/routes/errors/route.tsx +3 -4
  145. package/src/studio/routes/fiberDetail.tsx +1 -2
  146. package/src/studio/routes/fibers/route.tsx +3 -4
  147. package/src/studio/routes/logs/route.tsx +3 -4
  148. package/src/studio/routes/metrics/route.tsx +3 -4
  149. package/src/studio/routes/routes/route.tsx +1 -2
  150. package/src/studio/routes/services/route.tsx +1 -2
  151. package/src/studio/routes/system/route.tsx +3 -4
  152. package/src/studio/routes/traceDetail.tsx +1 -2
  153. package/src/studio/routes/traces/route.tsx +3 -4
  154. package/src/{x/tailscale → tailscale}/TailscaleTunnel.ts +2 -2
  155. package/src/{x/tailwind → tailwind}/compile.ts +1 -1
  156. package/src/tailwind/index.ts +2 -0
  157. package/src/{x/tailwind → tailwind}/plugin.ts +1 -1
  158. package/dist/_Development.d.ts.map +0 -1
  159. package/dist/_Development.js.map +0 -1
  160. package/dist/hyper/Hyper.d.ts +0 -26
  161. package/dist/hyper/Hyper.d.ts.map +0 -1
  162. package/dist/hyper/Hyper.js +0 -24
  163. package/dist/hyper/Hyper.js.map +0 -1
  164. package/dist/hyper/HyperHtml.d.ts +0 -24
  165. package/dist/hyper/HyperHtml.d.ts.map +0 -1
  166. package/dist/hyper/HyperHtml.js.map +0 -1
  167. package/dist/hyper/HyperHtml.test.d.ts +0 -2
  168. package/dist/hyper/HyperHtml.test.d.ts.map +0 -1
  169. package/dist/hyper/HyperHtml.test.js +0 -283
  170. package/dist/hyper/HyperHtml.test.js.map +0 -1
  171. package/dist/hyper/HyperNode.d.ts +0 -14
  172. package/dist/hyper/HyperNode.d.ts.map +0 -1
  173. package/dist/hyper/HyperNode.js +0 -12
  174. package/dist/hyper/HyperNode.js.map +0 -1
  175. package/dist/hyper/HyperRoute.d.ts +0 -9
  176. package/dist/hyper/HyperRoute.d.ts.map +0 -1
  177. package/dist/hyper/HyperRoute.js +0 -33
  178. package/dist/hyper/HyperRoute.js.map +0 -1
  179. package/dist/hyper/HyperRoute.test.d.ts +0 -2
  180. package/dist/hyper/HyperRoute.test.d.ts.map +0 -1
  181. package/dist/hyper/HyperRoute.test.js +0 -84
  182. package/dist/hyper/HyperRoute.test.js.map +0 -1
  183. package/dist/hyper/html.d.ts +0 -12
  184. package/dist/hyper/html.d.ts.map +0 -1
  185. package/dist/hyper/html.js +0 -31
  186. package/dist/hyper/html.js.map +0 -1
  187. package/dist/hyper/index.d.ts +0 -7
  188. package/dist/hyper/index.d.ts.map +0 -1
  189. package/dist/hyper/index.js +0 -6
  190. package/dist/hyper/index.js.map +0 -1
  191. package/dist/hyper/jsx-runtime.d.ts +0 -8
  192. package/dist/hyper/jsx-runtime.d.ts.map +0 -1
  193. package/dist/hyper/jsx-runtime.js.map +0 -1
  194. package/dist/x/cloudflare/CloudflareTunnel.d.ts +0 -12
  195. package/dist/x/cloudflare/CloudflareTunnel.d.ts.map +0 -1
  196. package/dist/x/cloudflare/CloudflareTunnel.js.map +0 -1
  197. package/dist/x/cloudflare/index.d.ts.map +0 -1
  198. package/dist/x/cloudflare/index.js.map +0 -1
  199. package/dist/x/tailscale/TailscaleTunnel.d.ts +0 -16
  200. package/dist/x/tailscale/TailscaleTunnel.d.ts.map +0 -1
  201. package/dist/x/tailscale/TailscaleTunnel.js.map +0 -1
  202. package/dist/x/tailscale/index.d.ts.map +0 -1
  203. package/dist/x/tailscale/index.js.map +0 -1
  204. package/dist/x/tailwind/TailwindPlugin.d.ts.map +0 -1
  205. package/dist/x/tailwind/TailwindPlugin.js.map +0 -1
  206. package/dist/x/tailwind/compile.d.ts.map +0 -1
  207. package/dist/x/tailwind/compile.js.map +0 -1
  208. package/dist/x/tailwind/plugin.d.ts.map +0 -1
  209. package/dist/x/tailwind/plugin.js.map +0 -1
  210. package/src/hyper/Hyper.ts +0 -55
  211. package/src/hyper/HyperHtml.test.tsx +0 -395
  212. package/src/hyper/HyperNode.ts +0 -33
  213. package/src/hyper/HyperRoute.test.tsx +0 -166
  214. package/src/hyper/HyperRoute.ts +0 -59
  215. package/src/hyper/html.ts +0 -47
  216. package/src/hyper/index.ts +0 -6
  217. package/src/hyper/jsx-runtime.ts +0 -15
  218. /package/dist/{x/cloudflare → cloudflare}/index.d.ts +0 -0
  219. /package/dist/{x/cloudflare → cloudflare}/index.js +0 -0
  220. /package/dist/{x/tailscale → tailscale}/index.d.ts +0 -0
  221. /package/dist/{x/tailscale → tailscale}/index.js +0 -0
  222. /package/dist/{x/tailwind → tailwind}/TailwindPlugin.d.ts +0 -0
  223. /package/dist/{x/tailwind → tailwind}/TailwindPlugin.js +0 -0
  224. /package/dist/{x/tailwind → tailwind}/compile.d.ts +0 -0
  225. /package/dist/{x/tailwind → tailwind}/plugin.d.ts +0 -0
  226. /package/src/{x/cloudflare → cloudflare}/index.ts +0 -0
  227. /package/src/{x/tailscale → tailscale}/index.ts +0 -0
  228. /package/src/{x/tailwind → tailwind}/TailwindPlugin.ts +0 -0
@@ -8,28 +8,35 @@ export type Format = "text" | "html" | "json" | "bytes" | "*";
8
8
  type UnwrapStream<T> = T extends Stream.Stream<infer V, any, any> ? V : T;
9
9
  type YieldError<T> = T extends Utils.YieldWrap<Effect.Effect<any, infer E, any>> ? E : never;
10
10
  type YieldContext<T> = T extends Utils.YieldWrap<Effect.Effect<any, any, infer R>> ? R : never;
11
- export type GeneratorHandler<B, A, Y> = (context: Values.Simplify<B>, next: (context?: Partial<B> & Record<string, unknown>) => Entity.Entity<UnwrapStream<A>>) => Generator<Y, A | Entity.Entity<A>, never>;
12
- export type HandlerInput<B, A, E, R> = A | Entity.Entity<A> | Effect.Effect<A | Entity.Entity<A>, E, R> | ((context: Values.Simplify<B>, next: (context?: Partial<B> & Record<string, unknown>) => Entity.Entity<UnwrapStream<A>>) => Effect.Effect<A | Entity.Entity<A>, E, R> | Generator<Utils.YieldWrap<Effect.Effect<unknown, E, R>>, A | Entity.Entity<A>, unknown>);
11
+ type Next<B, A> = (context?: Partial<B> & Record<string, unknown>) => Entity.Entity<UnwrapStream<A>>;
12
+ type HandlerReturn<A> = A | Entity.Entity<A> | ((self: Route.RouteSet.Any) => Route.RouteSet.Any);
13
+ type HandlerFunction<B, A, E, R> = (context: Values.Simplify<B>, next: Next<B, A>) => Effect.Effect<HandlerReturn<A>, E, R> | Generator<Utils.YieldWrap<Effect.Effect<unknown, E, R>>, HandlerReturn<A>, unknown>;
14
+ export type GeneratorHandler<B, A, Y> = (context: Values.Simplify<B>, next: Next<B, A>) => Generator<Y, HandlerReturn<A>, never>;
15
+ export type HandlerInput<B, A, E, R> = A | Entity.Entity<A> | Effect.Effect<HandlerReturn<A>, E, R> | HandlerFunction<B, A, E, R>;
13
16
  export declare function handle<B, A, Y extends Utils.YieldWrap<Effect.Effect<any, any, any>>>(handler: GeneratorHandler<B, A, Y>): Route.Route.Handler<B, A, YieldError<Y>, YieldContext<Y>>;
14
17
  export declare function handle<B, A, E, R>(handler: HandlerInput<B, A, E, R>): Route.Route.Handler<B, A, E, R>;
15
- export interface BuildReturn<Value, F extends Format> {
18
+ export interface BuildReturn<Value, F extends Format, Body = never> {
16
19
  <D extends Route.RouteDescriptor.Any, B, I extends Route.Route.Tuple, A extends F extends "json" ? Value : Value | Stream.Stream<Value, any, any>, Y extends Utils.YieldWrap<Effect.Effect<any, any, any>>>(handler: GeneratorHandler<NoInfer<D & B & Route.ExtractBindings<I> & {
17
20
  format: F;
18
21
  }>, A, Y>): (self: Route.RouteSet.RouteSet<D, B, I>) => Route.RouteSet.RouteSet<D, B, [
19
22
  ...I,
20
23
  Route.Route.Route<{
21
24
  format: F;
22
- }, {}, A, YieldError<Y>, YieldContext<Y>>
25
+ }, {}, [Body] extends [never] ? A : Body, YieldError<Y>, YieldContext<Y>>
23
26
  ]>;
24
27
  <D extends Route.RouteDescriptor.Any, B, I extends Route.Route.Tuple, A extends F extends "json" ? Value : Value | Stream.Stream<Value, any, any>, E = never, R = never>(handler: HandlerInput<NoInfer<D & B & Route.ExtractBindings<I> & {
25
28
  format: F;
26
29
  }>, A, E, R>): (self: Route.RouteSet.RouteSet<D, B, I>) => Route.RouteSet.RouteSet<D, B, [...I, Route.Route.Route<{
27
30
  format: F;
28
- }, {}, A, E, R>]>;
31
+ }, {}, [Body] extends [never] ? A : Body, E, R>]>;
29
32
  }
30
- export declare function build<Value, F extends Format>(descriptors: {
33
+ export declare function build<Value, F extends Format>(options: {
31
34
  format: F;
32
35
  }): BuildReturn<Value, F>;
36
+ export declare function build<Value, Body, F extends Format>(options: {
37
+ format: F;
38
+ handle: (body: Value) => Body;
39
+ }): BuildReturn<Value, F, Body>;
33
40
  export type RenderValue = string | Uint8Array | Stream.Stream<string | Uint8Array, any, any>;
34
41
  export declare function render<D extends Route.RouteDescriptor.Any, B extends {}, I extends Route.Route.Tuple, A extends RenderValue, Y extends Utils.YieldWrap<Effect.Effect<any, any, any>>>(handler: GeneratorHandler<NoInfer<D & B & Route.ExtractBindings<I> & {
35
42
  format: "*";
@@ -1 +1 @@
1
- {"version":3,"file":"RouteBody.d.ts","sourceRoot":"","sources":["../src/RouteBody.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RouteBody.d.ts","sourceRoot":"","sources":["../src/RouteBody.ts"],"names":[],"mappings":"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"}
package/dist/RouteBody.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import * as Effect from "effect/Effect";
2
2
  import * as Entity from "./Entity.js";
3
3
  import * as Route from "./Route.js";
4
+ import * as StreamExtra from "./_StreamExtra.js";
4
5
  const formatToContentType = {
5
6
  text: "text/plain; charset=utf-8",
6
7
  html: "text/html; charset=utf-8",
@@ -8,61 +9,71 @@ const formatToContentType = {
8
9
  bytes: "application/octet-stream",
9
10
  "*": undefined,
10
11
  };
12
+ function isHandlerFunction(handler) {
13
+ return typeof handler === "function";
14
+ }
11
15
  export function handle(handler) {
12
- if (typeof handler === "function") {
13
- return (context, next) => {
16
+ if (isHandlerFunction(handler)) {
17
+ return ((context, next) => {
14
18
  const result = handler(context, next);
15
19
  const effect = Effect.isEffect(result)
16
20
  ? result
17
21
  : Effect.gen(function* () {
18
22
  return yield* result;
19
23
  });
20
- return Effect.map(effect, normalizeToEntity);
21
- };
24
+ return Effect.flatMap(effect, normalizeToEntity);
25
+ });
22
26
  }
23
27
  if (Effect.isEffect(handler)) {
24
- return (_context, _next) => Effect.map(handler, normalizeToEntity);
28
+ return ((_context, _next) => Effect.flatMap(handler, normalizeToEntity));
25
29
  }
26
30
  if (Entity.isEntity(handler)) {
27
31
  return (_context, _next) => Effect.succeed(handler);
28
32
  }
29
- return (_context, _next) => Effect.succeed(normalizeToEntity(handler));
33
+ return ((_context, _next) => normalizeToEntity(handler));
30
34
  }
31
35
  function normalizeToEntity(value) {
36
+ if (typeof value === "function") {
37
+ const result = value(Route.empty);
38
+ const routes = Route.items(result);
39
+ const route = routes[0];
40
+ if (route) {
41
+ return route.handler({}, () => Entity.make(""));
42
+ }
43
+ }
32
44
  if (Entity.isEntity(value)) {
33
- return value;
45
+ return Effect.succeed(value);
34
46
  }
35
- return Entity.make(value, { status: 200 });
47
+ return Effect.succeed(Entity.make(value, { status: 200 }));
36
48
  }
37
- export function build(descriptors) {
49
+ export function build(options) {
50
+ const { handle: handleBody, ...descriptors } = options;
38
51
  return function (handler) {
39
- return function (self) {
52
+ return (self) => {
40
53
  const contentType = formatToContentType[descriptors.format];
41
54
  const baseHandler = handle(handler);
42
- const wrappedHandler = (ctx, next) => Effect.map(baseHandler(ctx, next), (entity) => entity.headers["content-type"]
43
- ? entity
44
- : Entity.make(entity.body, {
55
+ const wrappedHandler = (ctx, next) => baseHandler(ctx, next).pipe(Effect.map((entity) => {
56
+ const body = handleBody && !StreamExtra.isStream(entity.body) ? handleBody(entity.body) : entity.body;
57
+ if (body === entity.body && (entity.headers["content-type"] || contentType === undefined))
58
+ return entity;
59
+ return Entity.make(body, {
45
60
  status: entity.status,
46
61
  url: entity.url,
47
- headers: { ...entity.headers, "content-type": contentType },
48
- }));
62
+ headers: entity.headers["content-type"] || contentType === undefined
63
+ ? entity.headers
64
+ : { ...entity.headers, "content-type": contentType },
65
+ });
66
+ }));
49
67
  const route = Route.make(wrappedHandler, descriptors);
50
- const items = [
51
- ...Route.items(self),
52
- route,
53
- ];
54
- return Route.set(items, Route.descriptor(self));
68
+ return Route.set([...Route.items(self), route], Route.descriptor(self));
55
69
  };
56
70
  };
57
71
  }
58
72
  export function render(handler) {
59
- return function (self) {
60
- const route = Route.make(handle(handler), { format: "*" });
61
- const items = [
62
- ...Route.items(self),
63
- route,
64
- ];
65
- return Route.set(items, Route.descriptor(self));
73
+ return (self) => {
74
+ const baseHandler = handle(handler);
75
+ const route = Route.make((ctx, next) => baseHandler(ctx, next), { format: "*" });
76
+ return Route.set([...Route.items(self), route], Route.descriptor(self));
66
77
  };
67
78
  }
68
79
  //# sourceMappingURL=RouteBody.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"RouteBody.js","sourceRoot":"","sources":["../src/RouteBody.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RouteBody.js","sourceRoot":"","sources":["../src/RouteBody.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"RouteHttp.d.ts","sourceRoot":"","sources":["../src/RouteHttp.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAKzC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAIzC,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAEhD,OAAO,KAAK,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAG3C,KAAK,wBAAwB,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAA;IACpC,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,CAAA;CAC1B,CAAC,CAAA;AAmBF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,iBAA2B,CAAA;AAwH1D,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAGxD,QAAQ,QAAQ,CAAC,wBAAwB,CAAC,KAAG,IAAI,CAAC,UAmN3D,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,wBAAwB,CAAC,KAAK,IAAI,CAAC,UACnC,CAAA;AAE7C,wBAAiB,WAAW,CAC1B,IAAI,EAAE,SAAS,CAAC,SAAS,EACzB,OAAO,GAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAA0B,GACvD,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAcrD"}
1
+ {"version":3,"file":"RouteHttp.d.ts","sourceRoot":"","sources":["../src/RouteHttp.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAKzC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAKzC,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAEhD,OAAO,KAAK,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAG3C,KAAK,wBAAwB,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM,CAAA;IACpC,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,CAAA;CAC1B,CAAC,CAAA;AAmBF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,iBAA2B,CAAA;AAwH1D,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAGxD,QAAQ,QAAQ,CAAC,wBAAwB,CAAC,KAAG,IAAI,CAAC,UAmN3D,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,wBAAwB,CAAC,KAAK,IAAI,CAAC,UACnC,CAAA;AAE7C,wBAAiB,WAAW,CAC1B,IAAI,EAAE,SAAS,CAAC,SAAS,EACzB,OAAO,GAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAA0B,GACvD,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CA+BrD"}
package/dist/RouteHttp.js CHANGED
@@ -7,6 +7,7 @@ import * as Option from "effect/Option";
7
7
  import * as Runtime from "effect/Runtime";
8
8
  import * as Stream from "effect/Stream";
9
9
  import * as ContentNegotiation from "./_ContentNegotiation.js";
10
+ import * as Development from "./Development.js";
10
11
  import * as Entity from "./Entity.js";
11
12
  import * as Route from "./Route.js";
12
13
  import * as RouteHttpTracer from "./RouteHttpTracer.js";
@@ -252,8 +253,24 @@ export const toWebHandlerRuntime = (runtime) => {
252
253
  export const toWebHandler = toWebHandlerRuntime(Runtime.defaultRuntime);
253
254
  export function* walkHandles(tree, runtime = Runtime.defaultRuntime) {
254
255
  const pathGroups = new Map();
256
+ const runSync = Runtime.runSync(runtime);
257
+ const inDevelopment = Option.isSome(runSync(Development.option));
258
+ const developmentPaths = new Set();
255
259
  for (const route of RouteTree.walk(tree)) {
256
- const path = Route.descriptor(route).path;
260
+ const descriptor = Route.descriptor(route);
261
+ if (descriptor.dev === true) {
262
+ developmentPaths.add(descriptor.path);
263
+ }
264
+ }
265
+ for (const route of RouteTree.walk(tree)) {
266
+ const descriptor = Route.descriptor(route);
267
+ if (descriptor.dev === true) {
268
+ continue;
269
+ }
270
+ const path = descriptor.path;
271
+ if (!inDevelopment && developmentPaths.has(path)) {
272
+ continue;
273
+ }
257
274
  const group = pathGroups.get(path) ?? [];
258
275
  group.push(route);
259
276
  pathGroups.set(path, group);
@@ -1 +1 @@
1
- {"version":3,"file":"RouteHttp.js","sourceRoot":"","sources":["../src/RouteHttp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RouteHttp.js","sourceRoot":"","sources":["../src/RouteHttp.ts"],"names":[],"mappings":"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"}
@@ -51,7 +51,7 @@ function makeMethodDescriber(method) {
51
51
  const f = Function.flow(...fs);
52
52
  const result = f(methodSet);
53
53
  const resultItems = Route.items(result);
54
- // Items are already flat (only Routes), just merge method into each descriptor
54
+ // Items are already flat (only Routes), merge method into each descriptor
55
55
  const flattenedItems = resultItems.map((item) => {
56
56
  const itemDescriptor = Route.descriptor(item);
57
57
  const newDescriptor = { method, ...itemDescriptor };
@@ -1 +1 @@
1
- {"version":3,"file":"RouteMount.js","sourceRoot":"","sources":["../src/RouteMount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RouteMount.js","sourceRoot":"","sources":["../src/RouteMount.ts"],"names":[],"mappings":"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"}
package/dist/System.d.ts CHANGED
@@ -19,6 +19,6 @@ export declare class SystemError extends SystemError_base<{
19
19
  }
20
20
  export declare const cwd: Effect.Effect<string>;
21
21
  export declare const which: (name: string) => Effect.Effect<string, SystemError>;
22
- export declare const spawn: (cmd: readonly [string, ...Array<string>], options?: ChildProcess.Command.Options) => Effect.Effect<ChildProcess.ChildProcessHandle, SystemError, ChildProcess.ChildProcessSpawner | Scope.Scope>;
22
+ export declare const spawn: (cmd: [string, ...Array<string>] | string[], options?: ChildProcess.Command.Options) => Effect.Effect<ChildProcess.ChildProcessHandle, SystemError, ChildProcess.ChildProcessSpawner | Scope.Scope>;
23
23
  export {};
24
24
  //# sourceMappingURL=System.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"System.d.ts","sourceRoot":"","sources":["../src/System.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAElD,MAAM,MAAM,OAAO,GAAG,YAAY,CAAC,mBAAmB,CAAA;AAEtD,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,aAAa,GACb,aAAa,GACb,MAAM,GACN,aAAa,GACb,UAAU,GACV,kBAAkB,GAClB,UAAU,GACV,eAAe,GACf,SAAS,GACT,YAAY,GACZ,WAAW,CAAA;;;;AAEf,qBAAa,WAAY,SAAQ,iBAAgC;IAC/D,MAAM,EAAE,iBAAiB,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAC;IACA,IAAI,OAAO,IAAI,MAAM,CAIpB;CACF;AAED,eAAO,MAAM,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAoC,CAAA;AAE1E,eAAO,MAAM,KAAK,GAAI,MAAM,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAwBnE,CAAA;AAEH,eAAO,MAAM,KAAK,GAChB,KAAK,SAAS,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EACxC,UAAU,YAAY,CAAC,OAAO,CAAC,OAAO,KACrC,MAAM,CAAC,MAAM,CACd,YAAY,CAAC,kBAAkB,EAC/B,WAAW,EACX,YAAY,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK,CACQ,CAAA"}
1
+ {"version":3,"file":"System.d.ts","sourceRoot":"","sources":["../src/System.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAElD,MAAM,MAAM,OAAO,GAAG,YAAY,CAAC,mBAAmB,CAAA;AAEtD,MAAM,MAAM,iBAAiB,GACzB,eAAe,GACf,aAAa,GACb,aAAa,GACb,MAAM,GACN,aAAa,GACb,UAAU,GACV,kBAAkB,GAClB,UAAU,GACV,eAAe,GACf,SAAS,GACT,YAAY,GACZ,WAAW,CAAA;;;;AAEf,qBAAa,WAAY,SAAQ,iBAAgC;IAC/D,MAAM,EAAE,iBAAiB,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAC;IACA,IAAI,OAAO,IAAI,MAAM,CAIpB;CACF;AAED,eAAO,MAAM,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAoC,CAAA;AAE1E,eAAO,MAAM,KAAK,GAAI,MAAM,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAwBnE,CAAA;AAEH,eAAO,MAAM,KAAK,GAChB,KAAK,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE,EAC1C,UAAU,YAAY,CAAC,OAAO,CAAC,OAAO,KACrC,MAAM,CAAC,MAAM,CACd,YAAY,CAAC,kBAAkB,EAC/B,WAAW,EACX,YAAY,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK,CACQ,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"System.js","sourceRoot":"","sources":["../src/System.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAkBlD,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAQ7D;IACA,IAAI,OAAO;QACT,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,GAClD,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,EACxE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACtD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,GAAG,GAA0B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAsC,EAAE,CACxE,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;IAC1B,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,IAAI,WAAW,CAAC;QACd,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,IAAI,GAAG;QAC/E,KAAK,EAAE,GAAG;KACX,CAAC;CACL,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,KAAK,IAAI;IACX,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,WAAW,CAAC;QACd,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,0BAA0B,IAAI,GAAG;KAC/C,CAAC,CACH;IACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAC3B,CAAA;AAEH,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,GAAwC,EACxC,OAAsC,EAKtC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"System.js","sourceRoot":"","sources":["../src/System.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAkBlD,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAQ7D;IACA,IAAI,OAAO;QACT,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,GAClD,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,EACxE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACtD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,GAAG,GAA0B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAsC,EAAE,CACxE,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,GAAG,CAAC;IACT,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;IAC1B,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CACb,IAAI,WAAW,CAAC;QACd,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,IAAI,GAAG;QAC/E,KAAK,EAAE,GAAG;KACX,CAAC;CACL,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,KAAK,IAAI;IACX,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,WAAW,CAAC;QACd,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,0BAA0B,IAAI,GAAG;KAC/C,CAAC,CACH;IACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAC3B,CAAA;AAEH,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,GAA0C,EAC1C,OAAsC,EAKtC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA"}
@@ -35,7 +35,7 @@ export declare namespace Command {
35
35
  }
36
36
  }
37
37
  export declare const isCommand: (u: unknown) => u is Command;
38
- export declare const make: (cmd: readonly [string, ...Array<string>], options?: Command.Options) => Command;
38
+ export declare const make: (cmd: [string, ...Array<string>] | string[], options?: Command.Options) => Command;
39
39
  export type Signal = "SIGABRT" | "SIGALRM" | "SIGBUS" | "SIGCHLD" | "SIGCONT" | "SIGFPE" | "SIGHUP" | "SIGILL" | "SIGINT" | "SIGIO" | "SIGIOT" | "SIGKILL" | "SIGPIPE" | "SIGPOLL" | "SIGPROF" | "SIGPWR" | "SIGQUIT" | "SIGSEGV" | "SIGSTKFLT" | "SIGSTOP" | "SIGSYS" | "SIGTERM" | "SIGTRAP" | "SIGTSTP" | "SIGTTIN" | "SIGTTOU" | "SIGUNUSED" | "SIGURG" | "SIGUSR1" | "SIGUSR2" | "SIGVTALRM" | "SIGWINCH" | "SIGXCPU" | "SIGXFSZ" | "SIGBREAK" | "SIGLOST" | "SIGINFO";
40
40
  export interface KillOptions {
41
41
  readonly killSignal?: Signal | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"_ChildProcess.d.ts","sourceRoot":"","sources":["../src/_ChildProcess.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_ChildProcess.d.ts","sourceRoot":"","sources":["../src/_ChildProcess.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"_ChildProcess.js","sourceRoot":"","sources":["../src/_ChildProcess.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAI7C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,MAAM,GAAG,oCAA6C,CAAA;AA6B5D,MAAM,YAAY,GAAG;IACnB,CAAC,MAAM,CAAC,EAAE,MAAM;IAChB,IAAI;QACF,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IACD,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAQ,CAAA;IACzE,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAU,EAAgB,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;AAEvF,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,GAAwC,EACxC,OAAyB,EAChB,EAAE,CACX,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;IACzC,GAAG;IACH,GAAG,OAAO;CACX,CAAC,CAAA;AAuDJ,MAAM,OAAO,mBAAoB,SAAQ,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAOrF;CAAG;AAEN,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,OAAgB,EAC0E,EAAE,CAC5F,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"_ChildProcess.js","sourceRoot":"","sources":["../src/_ChildProcess.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAI7C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,MAAM,GAAG,oCAA6C,CAAA;AA6B5D,MAAM,YAAY,GAAG;IACnB,CAAC,MAAM,CAAC,EAAE,MAAM;IAChB,IAAI;QACF,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAChD,CAAC;IACD,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAQ,CAAA;IACzE,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAU,EAAgB,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;AAEvF,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,GAA0C,EAC1C,OAAyB,EAChB,EAAE,CACX,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;IACzC,GAAG;IACH,GAAG,OAAO;CACX,CAAC,CAAA;AAuDJ,MAAM,OAAO,mBAAoB,SAAQ,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAOrF;CAAG;AAEN,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,OAAgB,EAC0E,EAAE,CAC5F,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA"}
@@ -1,4 +1,4 @@
1
- import type * as Bun from "bun";
1
+ import * as Bun from "bun";
2
2
  import * as Option from "effect/Option";
3
3
  import * as Route from "../Route.ts";
4
4
  import * as BunServer from "./BunServer.ts";
@@ -1 +1 @@
1
- {"version":3,"file":"BunRoute.d.ts","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,KAAK,CAAA;AAI/B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAKvC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;;;;AAI3C,qBAAa,aAAc,SAAQ,mBAAkC;IACnE,MAAM,EAAE,YAAY,GAAG,oBAAoB,CAAA;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC;CAAG;AAEL,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;CACvC,CAAA;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAChD,cAAc,GAAG,SAAS,CAM5B;AAED,KAAK,gBAAgB,GAAG,GAAG,CAAC,UAAU,GAAG;IAAE,OAAO,EAAE,GAAG,CAAC,UAAU,CAAA;CAAE,CAAA;AAEpE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAMhE,CAAC,SAAS,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,KAAK,EAC7F,MAAM,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACrC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC,EACD,CAAC,EACD,CACE,GAAG,CAAC,EACJ,KAAK,CAAC,KAAK,CAAC,KAAK,CACf,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACnC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EACpB,MAAM,EACN,aAAa,EACb,SAAS,CAAC,SAAS,CACpB,CACF,CACF,CA0FF;AAED,KAAK,qBAAqB,GAAG,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KACxB,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEjC,KAAK,qBAAqB,GACtB,GAAG,CAAC,UAAU,GACd,GAAG,CAAC,OAAO,GACX,qBAAqB,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAA;AAEhE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;AAE7D;;;;;;;;;;;;;;;GAeG;AAEH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAahF;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,GAAG,YAMvC,CAAA"}
1
+ {"version":3,"file":"BunRoute.d.ts","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAM1B,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAIvC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;;;;AAI3C,qBAAa,aAAc,SAAQ,mBAAkC;IACnE,MAAM,EAAE,YAAY,GAAG,oBAAoB,CAAA;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC;CAAG;AAEL,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;CACvC,CAAA;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAChD,cAAc,GAAG,SAAS,CAM5B;AAED,KAAK,gBAAgB,GAAG,GAAG,CAAC,UAAU,GAAG;IAAE,OAAO,EAAE,GAAG,CAAC,UAAU,CAAA;CAAE,CAAA;AAIpE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAMhE,CAAC,SAAS,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,KAAK,EAC7F,MAAM,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACrC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC,EACD,CAAC,EACD,CACE,GAAG,CAAC,EACJ,KAAK,CAAC,KAAK,CAAC,KAAK,CACf,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACnC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EACpB,MAAM,EACN,aAAa,EACb,SAAS,CAAC,SAAS,CACpB,CACF,CACF,CAkHF;AA+DD,KAAK,qBAAqB,GAAG,CAC3B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KACxB,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEjC,KAAK,qBAAqB,GACtB,GAAG,CAAC,UAAU,GACd,GAAG,CAAC,OAAO,GACX,qBAAqB,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAA;AAEhE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;AAE7D;;;;;;;;;;;;;;;GAeG;AAEH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAahF;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,GAAG,YAMvC,CAAA"}
@@ -1,10 +1,12 @@
1
+ import * as Bun from "bun";
2
+ import * as NPath from "node:path";
1
3
  import * as Data from "effect/Data";
2
4
  import * as Either from "effect/Either";
3
5
  import * as Effect from "effect/Effect";
6
+ import * as FiberRef from "effect/FiberRef";
4
7
  import * as Option from "effect/Option";
5
8
  import * as Entity from "../Entity.js";
6
- import * as Hyper from "../hyper/Hyper.js";
7
- import * as HyperHtml from "../hyper/HyperHtml.js";
9
+ import * as Html from "../Html.js";
8
10
  import * as PathPattern from "../_PathPattern.js";
9
11
  import * as Route from "../Route.js";
10
12
  import * as Unique from "../Unique.js";
@@ -19,6 +21,7 @@ export function descriptors(route) {
19
21
  }
20
22
  return undefined;
21
23
  }
24
+ const bundleDepthRef = FiberRef.unsafeMake(0);
22
25
  export function htmlBundle(load) {
23
26
  const bunPrefix = `/.BunRoute-${Unique.token(10)}`;
24
27
  const bunLoad = () => Promise.resolve(load()).then((mod) => ("default" in mod ? mod.default : mod));
@@ -26,6 +29,7 @@ export function htmlBundle(load) {
26
29
  return function (self) {
27
30
  const handler = (context, next) => Effect.gen(function* () {
28
31
  const originalRequest = context.request;
32
+ const bundleDepth = yield* FiberRef.get(bundleDepthRef);
29
33
  if (originalRequest.headers.get(INTERNAL_FETCH_HEADER) === "true") {
30
34
  const url = new URL(originalRequest.url);
31
35
  return yield* Effect.fail(new BunRouteError({
@@ -34,51 +38,66 @@ export function htmlBundle(load) {
34
38
  message: "Request to internal Bun server was caught by BunRoute handler. This should not happen. Please report a bug.",
35
39
  }));
36
40
  }
37
- const bunServer = yield* BunServer.BunServer;
38
- const url = new URL(originalRequest.url);
39
- const internalPath = `${bunPrefix}${url.pathname}`;
40
- const internalUrl = new URL(internalPath, bunServer.server.url);
41
- const headers = new Headers(originalRequest.headers);
42
- headers.set(INTERNAL_FETCH_HEADER, "true");
43
- const proxyRequest = new Request(internalUrl, {
44
- method: originalRequest.method,
45
- headers,
46
- });
47
- const response = yield* Effect.tryPromise({
48
- try: () => fetch(proxyRequest),
49
- catch: (error) => new BunRouteError({
50
- reason: "ProxyError",
51
- pattern: internalPath,
52
- message: `Failed to fetch internal HTML bundle: ${String(error)}`,
53
- }),
54
- });
55
- let html = yield* Effect.tryPromise({
56
- try: () => response.text(),
57
- catch: (error) => new BunRouteError({
41
+ let html = "";
42
+ let status = 200;
43
+ let contentType = "text/html;charset=utf-8";
44
+ if (bundleDepth === 0) {
45
+ const bunServer = yield* BunServer.BunServer;
46
+ const url = new URL(originalRequest.url);
47
+ const internalPath = `${bunPrefix}${url.pathname}`;
48
+ const internalUrl = new URL(internalPath, bunServer.server.url);
49
+ const headers = new Headers(originalRequest.headers);
50
+ headers.set(INTERNAL_FETCH_HEADER, "true");
51
+ const proxyRequest = new Request(internalUrl, {
52
+ method: originalRequest.method,
53
+ headers,
54
+ });
55
+ const response = yield* Effect.tryPromise({
56
+ try: () => fetch(proxyRequest),
57
+ catch: (error) => new BunRouteError({
58
+ reason: "ProxyError",
59
+ pattern: internalPath,
60
+ message: `Failed to fetch internal HTML bundle: ${String(error)}`,
61
+ }),
62
+ });
63
+ html = yield* Effect.tryPromise({
64
+ try: () => response.text(),
65
+ catch: (error) => new BunRouteError({
66
+ reason: "ProxyError",
67
+ pattern: internalPath,
68
+ message: String(error),
69
+ }),
70
+ });
71
+ status = response.status;
72
+ contentType = response.headers.get("content-type") ?? contentType;
73
+ }
74
+ else {
75
+ html = yield* readBundleHtml(bunLoad).pipe(Effect.mapError((error) => new BunRouteError({
58
76
  reason: "ProxyError",
59
- pattern: internalPath,
60
- message: String(error),
61
- }),
62
- });
63
- const childEntity = yield* next(context);
77
+ pattern: bunPrefix,
78
+ message: `Failed to load nested HTML bundle: ${String(error)}`,
79
+ })));
80
+ }
81
+ const childEntity = yield* next(context).pipe(Effect.locally(bundleDepthRef, bundleDepth + 1));
64
82
  const children = childEntity?.body ?? childEntity;
65
83
  let childrenHtml = "";
66
84
  if (children != null) {
67
85
  if (children instanceof Response) {
68
86
  childrenHtml = yield* Effect.promise(() => children.text());
69
87
  }
70
- else if (Hyper.isGenericJsxObject(children)) {
71
- childrenHtml = HyperHtml.renderToString(children);
88
+ else if (Html.isGenericJsxObject(children)) {
89
+ childrenHtml = Html.renderToString(children);
72
90
  }
73
91
  else {
74
92
  childrenHtml = String(children);
75
93
  }
76
94
  }
77
- html = html.replace(/%children%/g, childrenHtml);
95
+ childrenHtml = yield* stripInjectedBunScripts(childrenHtml);
96
+ html = html.replaceAll("%children%", childrenHtml);
78
97
  return Entity.make(html, {
79
- status: response.status,
98
+ status,
80
99
  headers: {
81
- "content-type": response.headers.get("content-type"),
100
+ "content-type": contentType,
82
101
  },
83
102
  });
84
103
  });
@@ -86,6 +105,56 @@ export function htmlBundle(load) {
86
105
  return Route.set([...Route.items(self), route], Route.descriptor(self));
87
106
  };
88
107
  }
108
+ function stripInjectedBunScripts(html) {
109
+ let removeNextInlineScript = false;
110
+ const rewriter = new HTMLRewriter().on("script", {
111
+ element(element) {
112
+ const src = element.getAttribute("src");
113
+ const hasDevAttribute = element.getAttribute("data-bun-dev-server-script") !== null;
114
+ if (hasDevAttribute || (src !== null && src.startsWith("/_bun/client/"))) {
115
+ element.remove();
116
+ removeNextInlineScript = true;
117
+ return;
118
+ }
119
+ if (removeNextInlineScript && src === null) {
120
+ element.remove();
121
+ removeNextInlineScript = false;
122
+ return;
123
+ }
124
+ removeNextInlineScript = false;
125
+ },
126
+ });
127
+ return Effect.tryPromise({
128
+ try: () => rewriter.transform(new Response(html)).text(),
129
+ catch: (error) => new BunRouteError({
130
+ reason: "ProxyError",
131
+ pattern: "stripInjectedBunScripts",
132
+ message: String(error),
133
+ }),
134
+ });
135
+ }
136
+ function readBundleHtml(bunLoad) {
137
+ return Effect.tryPromise({
138
+ try: () => bunLoad(),
139
+ catch: (error) => new BunRouteError({
140
+ reason: "ProxyError",
141
+ pattern: "readBundleHtml",
142
+ message: String(error),
143
+ }),
144
+ }).pipe(Effect.andThen((bundle) => {
145
+ const indexPath = NPath.isAbsolute(bundle.index)
146
+ ? bundle.index
147
+ : NPath.resolve(NPath.dirname(Bun.main), bundle.index);
148
+ return Effect.tryPromise({
149
+ try: () => Bun.file(indexPath).text(),
150
+ catch: (error) => new BunRouteError({
151
+ reason: "ProxyError",
152
+ pattern: indexPath,
153
+ message: String(error),
154
+ }),
155
+ });
156
+ }));
157
+ }
89
158
  /**
90
159
  * Validates that a route pattern can be implemented with Bun.serve routes.
91
160
  *