effect-start 0.17.0 → 0.17.2

package/package.json

@@ -1,32 +1,82 @@
 {
   "name": "effect-start",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "type": "module",
   "license": "MIT",
   "exports": {
-    ".": "./src/index.ts",
-    "./StartApp": "./src/StartApp.ts",
-    "./bun": "./src/bun/index.ts",
-    "./client": "./src/client/index.ts",
-    "./testing": "./src/testing/index.ts",
-    "./x/*": "./src/x/*/index.ts",
-    "./x/tailwind/plugin": "./src/x/tailwind/plugin.ts",
-    "./middlewares": "./src/middlewares/index.ts",
-    "./experimental": "./src/experimental/index.ts",
+    ".": {
+      "bun": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./StartApp": {
+      "bun": "./src/StartApp.ts",
+      "types": "./dist/StartApp.d.ts",
+      "default": "./dist/StartApp.js"
+    },
+    "./bun": {
+      "bun": "./src/bun/index.ts",
+      "types": "./dist/bun/index.d.ts",
+      "default": "./dist/bun/index.js"
+    },
+    "./client": {
+      "bun": "./src/client/index.ts",
+      "types": "./dist/client/index.d.ts",
+      "default": "./dist/client/index.js"
+    },
+    "./testing": {
+      "bun": "./src/testing/index.ts",
+      "types": "./dist/testing/index.d.ts",
+      "default": "./dist/testing/index.js"
+    },
+    "./x/*": {
+      "bun": "./src/x/*/index.ts",
+      "types": "./dist/x/*/index.d.ts",
+      "default": "./dist/x/*/index.js"
+    },
+    "./x/tailwind/plugin": {
+      "bun": "./src/x/tailwind/plugin.ts",
+      "types": "./dist/x/tailwind/plugin.d.ts",
+      "default": "./dist/x/tailwind/plugin.js"
+    },
+    "./middlewares": {
+      "bun": "./src/middlewares/index.ts",
+      "types": "./dist/middlewares/index.d.ts",
+      "default": "./dist/middlewares/index.js"
+    },
+    "./experimental": {
+      "bun": "./src/experimental/index.ts",
+      "types": "./dist/experimental/index.d.ts",
+      "default": "./dist/experimental/index.js"
+    },
     "./client/assets.d.ts": "./src/assets.d.ts",
-    "./hyper": "./src/hyper/index.ts",
-    "./jsx-runtime": "./src/hyper/jsx-runtime.ts",
-    "./jsx-dev-runtime": "./src/hyper/jsx-runtime.ts",
+    "./hyper": {
+      "bun": "./src/hyper/index.ts",
+      "types": "./dist/hyper/index.d.ts",
+      "default": "./dist/hyper/index.js"
+    },
+    "./jsx-runtime": {
+      "bun": "./src/hyper/jsx-runtime.ts",
+      "types": "./dist/hyper/jsx-runtime.d.ts",
+      "default": "./dist/hyper/jsx-runtime.js"
+    },
+    "./jsx-dev-runtime": {
+      "bun": "./src/hyper/jsx-runtime.ts",
+      "types": "./dist/hyper/jsx-runtime.d.ts",
+      "default": "./dist/hyper/jsx-runtime.js"
+    },
     "./package.json": "./package.json"
   },
   "scripts": {
+    "build": "bunx --bun tsc -p tsconfig.build.json",
+    "prepare": "bun run build",
     "format": "bunx dprint fmt",
     "test": "bun test ./src/",
-    "deploy": "bunx npm publish --access public"
+    "deploy": "bunx --bun npm publish --access public"
   },
   "dependencies": {
-    "effect": ">=3.16.4",
-    "@effect/platform": "^0.93.6"
+    "effect": ">=3.19.0",
+    "@effect/platform": ">=0.93.0"
   },
   "peerDependencies": {
     "typescript": "^5.9.3"
@@ -48,6 +98,8 @@
   },
   "files": [
     "src/",
+    "dist/",
+    "README.md",
     "package.json"
   ]
 }

package/src/RouteBody.test.ts

@@ -1,4 +1,5 @@
 import * as test from "bun:test"
+import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as ParseResult from "effect/ParseResult"
 import * as Stream from "effect/Stream"
@@ -211,4 +212,21 @@ test.describe(`${RouteBody.handle.name}()`, () => {
       .expect(result.body)
       .toBe("got: next")
   })
+
+  test.it("generator type checks missing services", async () => {
+    interface ServiceA {
+      readonly _: unique symbol
+    }
+    const ServiceA = Context.GenericTag<ServiceA>("ServiceA")
+
+    const handler = RouteBody.handle(function*() {
+      yield* ServiceA
+      return "ok"
+    })
+
+    // This should fail type checking because ServiceA is not provided
+    // @ts-expect-error ServiceA is missing
+    const promise = Effect.runPromise(handler(ctx, next))
+    test.expect(promise).rejects.toThrow(/Service not found: ServiceA/)
+  })
 })

package/src/RouteBody.ts

@@ -22,6 +22,21 @@ const formatToContentType: Record<Format, string | undefined> = {
 
 type UnwrapStream<T> = T extends Stream.Stream<infer V, any, any> ? V : T
 
+type YieldError<T> = T extends Utils.YieldWrap<Effect.Effect<any, infer E, any>>
+  ? E
+  : never
+
+type YieldContext<T> = T extends
+  Utils.YieldWrap<Effect.Effect<any, any, infer R>> ? R
+  : never
+
+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>, unknown>
+
 export type HandlerInput<B, A, E, R> =
   | A
   | Entity.Entity<A>
@@ -39,6 +54,16 @@ export type HandlerInput<B, A, E, R> =
       unknown
     >)
 
+export 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>>
+export function handle<B, A, E, R>(
+  handler: HandlerInput<B, A, E, R>,
+): Route.Route.Handler<B, A, E, R>
 export function handle<B, A, E, R>(
   handler: HandlerInput<B, A, E, R>,
 ): Route.Route.Handler<B, A, E, R> {
@@ -80,13 +105,67 @@ function normalizeToEntity<A>(value: A | Entity.Entity<A>): Entity.Entity<A> {
   return Entity.make(value as A, { status: 200 })
 }
 
+export interface BuildReturn<
+  Value,
+  F extends Format,
+> {
+  <
+    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> & { format: F }>,
+      A,
+      Y
+    >,
+  ): (
+    self: Route.RouteSet.RouteSet<D, B, I>,
+  ) => Route.RouteSet.RouteSet<
+    D,
+    B,
+    [
+      ...I,
+      Route.Route.Route<{ format: F }, {}, A, YieldError<Y>, YieldContext<Y>>,
+    ]
+  >
+
+  <
+    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> & { format: F }
+      >,
+      A,
+      E,
+      R
+    >,
+  ): (
+    self: Route.RouteSet.RouteSet<D, B, I>,
+  ) => Route.RouteSet.RouteSet<
+    D,
+    B,
+    [...I, Route.Route.Route<{ format: F }, {}, A, E, R>]
+  >
+}
+
 export function build<
   Value,
   F extends Format,
 >(
   descriptors: { format: F },
 ) {
-  return function<
+  return (function<
     D extends Route.RouteDescriptor.Any,
     B extends {},
     I extends Route.Route.Tuple,
@@ -146,7 +225,7 @@ export function build<
         Route.descriptor(self),
       )
     }
-  }
+  }) as unknown as BuildReturn<Value, F>
 }
 
 export type RenderValue =
@@ -154,6 +233,51 @@ export type RenderValue =
   | Uint8Array
   | Stream.Stream<string | Uint8Array, any, any>
 
+export 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> & { format: "*" }>,
+    A,
+    Y
+  >,
+): (
+  self: Route.RouteSet.RouteSet<D, B, I>,
+) => Route.RouteSet.RouteSet<
+  D,
+  B,
+  [
+    ...I,
+    Route.Route.Route<{ format: "*" }, {}, A, YieldError<Y>, YieldContext<Y>>,
+  ]
+>
+export function render<
+  D extends Route.RouteDescriptor.Any,
+  B extends {},
+  I extends Route.Route.Tuple,
+  A extends RenderValue,
+  E = never,
+  R = never,
+>(
+  handler: HandlerInput<
+    NoInfer<
+      D & B & Route.ExtractBindings<I> & { format: "*" }
+    >,
+    A,
+    E,
+    R
+  >,
+): (
+  self: Route.RouteSet.RouteSet<D, B, I>,
+) => Route.RouteSet.RouteSet<
+  D,
+  B,
+  [...I, Route.Route.Route<{ format: "*" }, {}, A, E, R>]
+>
 export function render<
   D extends Route.RouteDescriptor.Any,
   B extends {},

package/src/x/tailwind/compile.ts

@@ -88,13 +88,19 @@ async function ensureSourceDetectionRootExists(compiler: {
   }
 }
 
-export async function compileAst(ast: AstNode[], options: CompileOptions) {
+export async function compileAst(
+  ast: AstNode[],
+  options: CompileOptions,
+): ReturnType<typeof _compileAst> {
   let compiler = await _compileAst(ast, createCompileOptions(options))
   await ensureSourceDetectionRootExists(compiler)
   return compiler
 }
 
-export async function compile(css: string, options: CompileOptions) {
+export async function compile(
+  css: string,
+  options: CompileOptions,
+): ReturnType<typeof _compile> {
   let compiler = await _compile(css, createCompileOptions(options))
   await ensureSourceDetectionRootExists(compiler)
   return compiler