@typed/router 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/MatcherV2.d.ts

@@ -0,0 +1,3 @@
+export interface Matcher<A, E, R> {
+}
+//# sourceMappingURL=MatcherV2.d.ts.map

package/dist/MatcherV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatcherV2.d.ts","sourceRoot":"","sources":["../src/MatcherV2.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;CAE/B"}

package/dist/MatcherV2.js

@@ -0,0 +1 @@
+export {};

package/dist/test-utils/matcherBrowserHarness.d.ts

@@ -0,0 +1,10 @@
+import * as Effect from "effect/Effect";
+/**
+ * Build an absolute URL for the Vitest browser page origin (same pattern as in-memory tests using http://localhost/...).
+ */
+export declare const absoluteUrl: (path: string, win?: Window & typeof globalThis) => string;
+/**
+ * Run an effect with {@link BrowserRouter} scoped over the real (or test) `window`.
+ */
+export declare const runWithBrowserRouter: <A, E, R>(effect: Effect.Effect<A, E, R>, win?: Window & typeof globalThis) => Promise<A>;
+//# sourceMappingURL=matcherBrowserHarness.d.ts.map

package/dist/test-utils/matcherBrowserHarness.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matcherBrowserHarness.d.ts","sourceRoot":"","sources":["../../src/test-utils/matcherBrowserHarness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,MAAK,MAAM,GAAG,OAAO,UAA8B,KAAG,MAG/F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAC1C,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,MAAK,MAAM,GAAG,OAAO,UAA8B,KAClD,OAAO,CAAC,CAAC,CACuE,CAAC"}

package/dist/test-utils/matcherBrowserHarness.js

@@ -0,0 +1,13 @@
+import * as Effect from "effect/Effect";
+import { BrowserRouter } from "../Router.js";
+/**
+ * Build an absolute URL for the Vitest browser page origin (same pattern as in-memory tests using http://localhost/...).
+ */
+export const absoluteUrl = (path, win = globalThis.window) => {
+    const normalized = path.startsWith("/") ? path : `/${path}`;
+    return new URL(normalized, win.location.origin).href;
+};
+/**
+ * Run an effect with {@link BrowserRouter} scoped over the real (or test) `window`.
+ */
+export const runWithBrowserRouter = (effect, win = globalThis.window) => effect.pipe(Effect.provide(BrowserRouter(win)), Effect.scoped, Effect.runPromise);

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@typed/router",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
+  "files": [
+    "dist",
+    "src"
+  ],
   "type": "module",
   "exports": {
     ".": {
@@ -15,25 +19,24 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "[ -d dist ] || rm -f tsconfig.tsbuildinfo; tsc",
+    "test": "vitest run --passWithNoTests --config vitest.config.ts",
+    "test:browser": "vitest run --config vitest.browser.config.ts"
+  },
   "dependencies": {
-    "effect": "4.0.0-beta.21",
+    "@typed/fx": "workspace:*",
+    "@typed/guard": "workspace:*",
+    "@typed/id": "workspace:*",
+    "@typed/navigation": "workspace:*",
+    "effect": "catalog:",
     "find-my-way-ts": "0.1.6",
-    "hkt-core": "1.3.4",
-    "@typed/fx": "2.0.0-beta.2",
-    "@typed/id": "1.0.0-beta.2",
-    "@typed/guard": "1.0.0-beta.2",
-    "@typed/navigation": "1.0.0-beta.2"
+    "hkt-core": "1.3.5"
   },
   "devDependencies": {
-    "typescript": "5.9.3",
-    "vitest": "4.0.18"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "scripts": {
-    "build": "[ -d dist ] || rm -f tsconfig.tsbuildinfo; tsc",
-    "test": "vitest run --passWithNoTests"
+    "@vitest/browser-playwright": "catalog:",
+    "playwright": "^1.59.1",
+    "typescript": "catalog:",
+    "vitest": "catalog:"
   }
-}
+}

package/src/CurrentRoute.ts

@@ -1,6 +1,6 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { Navigation } from "@typed/navigation/Navigation";
 import { Parse, type Route } from "./Route.js";
 
@@ -9,10 +9,10 @@ export interface CurrentRouteTree {
   readonly parent?: CurrentRouteTree | undefined;
 }
 
-export class CurrentRoute extends ServiceMap.Service<CurrentRoute, CurrentRouteTree>()(
+export class CurrentRoute extends Context.Service<CurrentRoute, CurrentRouteTree>()(
   "@typed/router/CurrentRoute",
   {
-    make: Effect.map(Navigation.base, (base) => ({ route: Parse(base) })),
+    make: Effect.map(Navigation.base, (base) => ({ route: Parse(base) } )),
   },
 ) {
   static readonly Default = Layer.effect(CurrentRoute, CurrentRoute.make);
@@ -20,8 +20,8 @@ export class CurrentRoute extends ServiceMap.Service<CurrentRoute, CurrentRouteT
   static readonly extend = (route: Route.Any) =>
     Layer.unwrap(
       Effect.gen(function* () {
-        const services = yield* Effect.services<never>();
-        const parent = ServiceMap.getOrUndefined(services, CurrentRoute);
+        const services = yield* Effect.context<never>();
+        const parent = Context.getOrUndefined(services, CurrentRoute);
         return Layer.succeed(CurrentRoute, {
           route,
           parent,