@typed/ui 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/HttpRouter.js

@@ -4,7 +4,7 @@ import { dual } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Scope from "effect/Scope";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { RouteContext } from "effect/unstable/http/HttpRouter";
 import * as HttpServerError from "effect/unstable/http/HttpServerError";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
@@ -20,7 +20,7 @@ export const ssrForHttp = dual(2, (router, input) => {
             onSome: (parent) => input.prefix(parent.route),
         });
         const entries = compile(matcher.cases);
-        const currentServices = yield* Effect.services();
+        const currentServices = yield* Effect.context();
         yield* router.addAll(entries.map((e) => toRoute(e, currentServices)));
     });
 });
@@ -72,7 +72,7 @@ function toRoute(entry, currentServices) {
             const prepared = yield* layerManager.prepare(entry.layers.concat(provided));
             const guardExit = yield* entry
                 .guard(params)
-                .pipe(Effect.provideServices(prepared.services), Effect.exit);
+                .pipe(Effect.provideContext(prepared.services), Effect.exit);
             if (Exit.isFailure(guardExit) || Option.isNone(guardExit.value)) {
                 yield* prepared.rollback;
                 return yield* new HttpServerError.HttpServerError({
@@ -84,11 +84,11 @@ function toRoute(entry, currentServices) {
             const scope = yield* Scope.fork(rootScope);
             const paramsRef = yield* RefSubject.make(matchedParams).pipe(Scope.provide(scope));
             const preparedServices = prepared.services;
-            const handlerServices = ServiceMap.merge(ServiceMap.merge(currentServices, preparedServices), ServiceMap.make(Scope.Scope, scope));
+            const handlerServices = Context.merge(Context.merge(currentServices, preparedServices), Context.make(Scope.Scope, scope));
             const handlerFx = entry.handler(paramsRef);
             const withLayouts = yield* layoutManager.apply(entry.layouts, matchedParams, handlerFx, preparedServices);
             const withCatches = yield* catchManager.apply(entry.catches, withLayouts, preparedServices);
-            const html = yield* renderToHtmlString(withCatches).pipe(Effect.provideServices(handlerServices));
+            const html = yield* renderToHtmlString(withCatches).pipe(Effect.provideContext(handlerServices));
             return HttpServerResponse.text(html, {
                 headers: { "content-type": "text/html; charset=utf-8" },
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/ui",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "files": [
     "dist",
     "src"
@@ -19,22 +19,22 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@effect/platform-node": "4.0.0-beta.38",
-    "effect": "4.0.0-beta.38",
-    "happy-dom": "20.8.7",
-    "@typed/fx": "2.0.0-beta.3",
-    "@typed/template": "1.0.0-beta.3",
-    "@typed/router": "1.0.0-beta.3",
-    "@typed/navigation": "1.0.0-beta.3",
-    "@typed/id": "1.0.0-beta.3"
-  },
-  "devDependencies": {
-    "typescript": "5.9.3",
-    "vitest": "4.1.1"
-  },
   "scripts": {
     "build": "[ -d dist ] || rm -f tsconfig.tsbuildinfo; tsc",
     "test": "vitest run --passWithNoTests"
+  },
+  "dependencies": {
+    "@effect/platform-node": "catalog:",
+    "@typed/fx": "workspace:*",
+    "@typed/id": "workspace:*",
+    "@typed/navigation": "workspace:*",
+    "@typed/router": "workspace:*",
+    "@typed/template": "workspace:*",
+    "effect": "catalog:",
+    "happy-dom": "catalog:"
+  },
+  "devDependencies": {
+    "typescript": "catalog:",
+    "vitest": "catalog:"
   }
-}
+}

package/src/HttpRouter.test.ts

@@ -13,12 +13,7 @@ import { HttpClient, HttpRouter } from "effect/unstable/http";
 
 describe("typed/ui/HttpRouter", () => {
   it("renders simple html template", () => {
-    const matcher = Matcher.empty.match(
-      Route.Parse("home"),
-      html`
-        <div>Hello, world!</div>
-      `,
-    );
+    const matcher = Matcher.empty.match(Route.Parse("home"), html` <div>Hello, world!</div> `);
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
       HttpRouter.serve,
@@ -49,12 +44,7 @@ describe("typed/ui/HttpRouter", () => {
 
   it("renders html template with search params", () => {
     const route = Route.Parse("search");
-    const matcher = Matcher.empty.match(
-      route,
-      html`
-        <div>Search results</div>
-      `,
-    );
+    const matcher = Matcher.empty.match(route, html` <div>Search results</div> `);
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
       HttpRouter.serve,
@@ -70,18 +60,8 @@ describe("typed/ui/HttpRouter", () => {
     const home = Route.Parse("home");
     const about = Route.Parse("about");
     const matcher = Matcher.empty
-      .match(
-        home,
-        html`
-          <div>Home</div>
-        `,
-      )
-      .match(
-        about,
-        html`
-          <div>About</div>
-        `,
-      );
+      .match(home, html` <div>Home</div> `)
+      .match(about, html` <div>About</div> `);
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
       HttpRouter.serve,
@@ -96,12 +76,7 @@ describe("typed/ui/HttpRouter", () => {
   });
 
   it("returns 404 for unmatched routes", () => {
-    const matcher = Matcher.empty.match(
-      Route.Parse("home"),
-      html`
-        <div>Home</div>
-      `,
-    );
+    const matcher = Matcher.empty.match(Route.Parse("home"), html` <div>Home</div> `);
     const Live = HttpRouter.use(
       Effect.fn(function* (router) {
         yield* ssrForHttp(router, matcher);
@@ -135,12 +110,7 @@ describe("typed/ui/HttpRouter", () => {
   });
 
   it("sets correct content-type header", () => {
-    const matcher = Matcher.empty.match(
-      Route.Parse("home"),
-      html`
-        <div>Hello</div>
-      `,
-    );
+    const matcher = Matcher.empty.match(Route.Parse("home"), html` <div>Hello</div> `);
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
       HttpRouter.serve,
@@ -157,12 +127,7 @@ describe("typed/ui/HttpRouter", () => {
     const users = Route.Join(Route.Parse("api"), Route.Parse("users"));
     const user = Route.Join(users, Route.Param("id"));
     const matcher = Matcher.empty
-      .match(
-        users,
-        html`
-          <div>Users list</div>
-        `,
-      )
+      .match(users, html` <div>Users list</div> `)
       .match(user, (params) => html`<div>User ${params.pipe(Fx.map((p) => p.id))}</div>`);
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
@@ -186,7 +151,11 @@ describe("typed/ui/HttpRouter", () => {
         const origin = yield* Navigation.origin;
         const base = yield* Navigation.base;
         const currentEntry = yield* Navigation.currentEntry;
-        return html`<div data-origin="${origin}" data-base="${base}" data-url="${currentEntry.url.href}"></div>`;
+        return html`<div
+          data-origin="${origin}"
+          data-base="${base}"
+          data-url="${currentEntry.url.href}"
+        ></div>`;
       }),
     );
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
@@ -244,22 +213,15 @@ describe("typed/ui/HttpRouter", () => {
   it("provides CurrentRoute with parent for nested routes", () => {
     const api = Route.Parse("api");
     const users = Route.Parse("users");
-    const matcher = Matcher.empty
-      .match(
-        Route.Slash,
-        html`
-          <div>API</div>
-        `,
-      )
-      .match(
-        users,
-        Fx.gen(function* () {
-          const currentRoute = yield* CurrentRoute;
-          const hasParent = currentRoute.parent !== undefined;
-          const parentPath = currentRoute.parent?.route.path ?? "none";
-          return html`<div data-has-parent="${hasParent}" data-parent-path="${parentPath}"></div>`;
-        }),
-      );
+    const matcher = Matcher.empty.match(Route.Slash, html` <div>API</div> `).match(
+      users,
+      Fx.gen(function* () {
+        const currentRoute = yield* CurrentRoute;
+        const hasParent = currentRoute.parent !== undefined;
+        const parentPath = currentRoute.parent?.route.path ?? "none";
+        return html`<div data-has-parent="${hasParent}" data-parent-path="${parentPath}"></div>`;
+      }),
+    );
     const Live = HttpRouter.use(ssrForHttp(matcher)).pipe(
       Layer.provide(StaticHtmlRenderTemplate),
       HttpRouter.serve,

package/src/HttpRouter.ts

@@ -4,7 +4,7 @@ import { dual } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Scope from "effect/Scope";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { type HttpRouter, type Route, RouteContext } from "effect/unstable/http/HttpRouter";
 import * as HttpServerError from "effect/unstable/http/HttpServerError";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
@@ -43,7 +43,7 @@ export const ssrForHttp: {
       onSome: (parent: CurrentRouteTree) => input.prefix(parent.route),
     });
     const entries = compile(matcher.cases);
-    const currentServices = yield* Effect.services<R>();
+    const currentServices = yield* Effect.context<R>();
 
     yield* router.addAll(entries.map((e: CompiledEntry) => toRoute(e, currentServices)));
   });
@@ -71,10 +71,7 @@ function getStatus(error: HttpServerError.HttpServerError): number {
   }
 }
 
-function toRoute(
-  entry: CompiledEntry,
-  currentServices: ServiceMap.ServiceMap<never>,
-): Route<any, any> {
+function toRoute(entry: CompiledEntry, currentServices: Context.Context<never>): Route<any, any> {
   return {
     ["~effect/http/HttpRouter/Route"]: "~effect/http/HttpRouter/Route",
     method: "GET",
@@ -123,7 +120,7 @@ function toRoute(
 
       const guardExit = yield* entry
         .guard(params)
-        .pipe(Effect.provideServices(prepared.services), Effect.exit);
+        .pipe(Effect.provideContext(prepared.services), Effect.exit);
 
       if (Exit.isFailure(guardExit) || Option.isNone(guardExit.value)) {
         yield* prepared.rollback;
@@ -138,10 +135,10 @@ function toRoute(
       const scope = yield* Scope.fork(rootScope);
       const paramsRef = yield* RefSubject.make(matchedParams).pipe(Scope.provide(scope));
 
-      const preparedServices = prepared.services as ServiceMap.ServiceMap<any>;
-      const handlerServices = ServiceMap.merge(
-        ServiceMap.merge(currentServices, preparedServices),
-        ServiceMap.make(Scope.Scope, scope),
+      const preparedServices = prepared.services as Context.Context<any>;
+      const handlerServices = Context.merge(
+        Context.merge(currentServices, preparedServices),
+        Context.make(Scope.Scope, scope),
       );
 
       const handlerFx = entry.handler(paramsRef);
@@ -156,7 +153,7 @@ function toRoute(
       const withCatches = yield* catchManager.apply(entry.catches, withLayouts, preparedServices);
 
       const html = yield* renderToHtmlString(withCatches).pipe(
-        Effect.provideServices(handlerServices),
+        Effect.provideContext(handlerServices),
       );
       return HttpServerResponse.text(html, {
         headers: { "content-type": "text/html; charset=utf-8" },