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

package/dist/HttpRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpRouter.d.ts","sourceRoot":"","sources":["../src/HttpRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,KAAK,UAAU,EAA4B,MAAM,iCAAiC,CAAC;AAK5F,OAAO,EAQL,KAAK,OAAO,EAGZ,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEvE,KAAK,cAAc,GAAG,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;AAE3C,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,EAAE,CAAC,EACH,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAChC,CAAC,MAAM,EAAE,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC,EAAE,CAAC,EACH,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;CAY1D,CAAC;AAEH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,yGAQvD"}
+{"version":3,"file":"HttpRouter.d.ts","sourceRoot":"","sources":["../src/HttpRouter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAOxC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,QAAQ,IAAI,kBAAkB,EACnC,KAAK,OAAO,IAAI,iBAAiB,EAGlC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,eAAe,MAAM,sCAAsC,CAAC;AAGxE,OAAO,EAML,KAAK,OAAO,EAKZ,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAoC,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAErF,KAAK,cAAc,GAAG,kBAAkB,GAAG,UAAU,GAAG,MAAM,CAAC;AAE/D,KAAK,qBAAqB,CAAC,CAAC,EAAE,CAAC,IAC3B,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,GAC1B,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;AAEzE,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AA+EtF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAClD,CAAC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,mBAAmB,EAAE;IAChC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACjD,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,yEAQvD"}

package/dist/HttpRouter.js

@@ -1,36 +1,182 @@
+import { Fx } from "@typed/fx";
 import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
 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 Context from "effect/Context";
-import { RouteContext } from "effect/unstable/http/HttpRouter";
+import { hasProperty } from "effect/Predicate";
+import * as Stream from "effect/Stream";
+import { RouteContext, } from "effect/unstable/http/HttpRouter";
 import * as HttpServerError from "effect/unstable/http/HttpServerError";
 import * as HttpServerRequest from "effect/unstable/http/HttpServerRequest";
 import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse";
-import { RefSubject } from "@typed/fx";
-import { compile, CurrentRoute, makeCatchManager, makeLayerManager, makeLayoutManager, Join, Parse, } from "@typed/router";
+import { compile, CurrentRoute, makeRouteExecutor, Join, Parse, } from "@typed/router";
+import { Ids } from "@typed/id";
 import { initialMemory } from "@typed/navigation";
-import { renderToHtmlString } from "@typed/template";
-export const ssrForHttp = dual(2, (router, input) => {
-    return Effect.gen(function* () {
-        const matcher = Option.match(yield* Effect.serviceOption(CurrentRoute), {
-            onNone: () => input,
-            onSome: (parent) => input.prefix(parent.route),
+import { renderToHtml, renderToHtmlString } from "@typed/template";
+const htmlResponseHeaders = { "content-type": "text/html; charset=utf-8" };
+const bufferedResponse = () => Effect.fn((rendered, requestServices) => Effect.gen(function* () {
+    const html = yield* renderToHtmlString(rendered).pipe(Effect.provideContext(requestServices));
+    return HttpServerResponse.text(html, { headers: htmlResponseHeaders });
+}));
+const streamingResponse = () => Effect.fn((rendered, requestServices) => Effect.gen(function* () {
+    const context = Context.merge(requestServices, yield* Effect.context());
+    return HttpServerResponse.stream(Stream.provideContext(renderToHtml(rendered).pipe(Fx.provideContext(requestServices), Fx.toStream, Stream.encodeText), context), { headers: htmlResponseHeaders });
+}));
+function makeSsrForHttp(createResponse) {
+    return dual(2, (router, input) => {
+        return Effect.gen(function* () {
+            const matcher = Option.match(yield* Effect.serviceOption(CurrentRoute), {
+                onNone: () => input,
+                onSome: (parent) => input.prefix(parent.route),
+            });
+            const entries = compile(matcher.cases);
+            const currentServices = yield* Effect.context();
+            const candidatesByPath = new Map();
+            for (const entry of entries) {
+                const path = getMatcherPath(entry.route.path);
+                const candidates = candidatesByPath.get(path);
+                if (candidates === undefined) {
+                    candidatesByPath.set(path, [entry]);
+                }
+                else {
+                    candidates.push(entry);
+                }
+            }
+            yield* router.addAll(Array.from(candidatesByPath, ([path, candidates]) => toRoute(path, candidates, currentServices, createResponse)));
         });
-        const entries = compile(matcher.cases);
-        const currentServices = yield* Effect.context();
-        yield* router.addAll(entries.map((e) => toRoute(e, currentServices)));
     });
-});
+}
+function getMatcherPath(path) {
+    const queryStart = path.search(/\?[^/?]+=/);
+    return (queryStart < 0 ? path : path.slice(0, queryStart));
+}
+/**
+ * Registers buffered, GET-only HTML routes for a matcher.
+ *
+ * Path captures take precedence over same-named query parameters. Rendering
+ * completes before the response is created; this adapter does not stream.
+ *
+ * @remarks
+ * ## Why
+ *
+ * Typed route matchers already describe decoding, guards, parent prefixes, and
+ * render output. `ssrForHttp` installs that same model in Effect's HttpRouter
+ * and buffers one complete HTML document for runtimes that require a known body.
+ *
+ * ## Ownership and lifetime
+ *
+ * Registration adds GET routes to the supplied Effect HttpRouter. Each request
+ * creates request-local memory navigation and current-route services; the
+ * request Effect owns rendering and all finalizers. Buffered rendering must
+ * complete before the response is returned. Rendering HTML does not mount or
+ * hydrate a browser client.
+ *
+ * ## Routing behavior
+ *
+ * Matcher cases sharing a path are tried in their compiled order. Path params
+ * overwrite same-named query params. Decode/guard failures continue candidate
+ * selection; a matched renderer failure stays in the typed request error channel.
+ *
+ * @example
+ * ```ts
+ * import { ssrForHttp } from "@typed/ui/HttpRouter"
+ * import { Effect } from "effect"
+ * import * as HttpRouter from "effect/unstable/http/HttpRouter"
+ * import { Parse, match } from "@typed/router"
+ * import { html } from "@typed/template"
+ *
+ * const pages = match(Parse("/"), html`<h1>Home</h1>`)
+ * const routes = Effect.gen(function* () {
+ *   const router = yield* HttpRouter.make
+ *   yield* ssrForHttp(router, pages)
+ *   return router
+ * })
+ * ```
+ *
+ * @since 1.0.0
+ * @category http
+ */
+export const ssrForHttp = makeSsrForHttp(bufferedResponse());
+/**
+ * Registers streaming, GET-only HTML routes for a matcher.
+ *
+ * Path captures take precedence over same-named query parameters. HTML chunks
+ * are emitted as they are rendered via `renderToHtml` and `HttpServerResponse.stream`.
+ *
+ * @remarks
+ * ## Why
+ *
+ * Streaming lets the server send ordered renderer-owned HTML chunks before the
+ * whole page completes while preserving the same Typed matcher and Effect HTTP model.
+ *
+ * ## Ownership and lifetime
+ *
+ * Registration adds GET routes to the supplied router. Each request owns its
+ * navigation/router services and stream Scope. Client cancellation interrupts
+ * rendering and runs finalizers. The stream carries typed renderer failures;
+ * producing HTML alone does not attach client hydration behavior.
+ *
+ * @example
+ * ```ts
+ * import { streamingSsrForHttp } from "@typed/ui/HttpRouter"
+ * import { Effect } from "effect"
+ * import * as HttpRouter from "effect/unstable/http/HttpRouter"
+ * import { Parse, match } from "@typed/router"
+ * import { html } from "@typed/template"
+ *
+ * const pages = match(Parse("/"), html`<h1>Streamed home</h1>`)
+ * const routes = Effect.gen(function* () {
+ *   const router = yield* HttpRouter.make
+ *   yield* streamingSsrForHttp(router, pages)
+ *   return router
+ * })
+ * ```
+ *
+ * @since 1.0.0
+ * @category http
+ */
+export const streamingSsrForHttp = makeSsrForHttp(streamingResponse());
+/**
+ * Converts Effect HTTP server errors into empty 400, 404, or 500 responses.
+ * Other failures remain in the global error channel.
+ *
+ * @remarks
+ * ## Why
+ *
+ * Effect's structured server failures have a safe transport status, whereas
+ * application/domain errors must remain visible for deliberate handling.
+ *
+ * ## Ownership and lifetime
+ *
+ * The middleware is installed on the supplied router and runs in each request
+ * lifetime. It allocates no long-lived resource and does not log, swallow, or
+ * reclassify non-HttpServerError failures.
+ *
+ * @example
+ * ```ts
+ * import { handleHttpServerError } from "@typed/ui/HttpRouter"
+ * import { Effect } from "effect"
+ * import * as HttpRouter from "effect/unstable/http/HttpRouter"
+ *
+ * const router = Effect.gen(function* () {
+ *   const router = yield* HttpRouter.make
+ *   yield* handleHttpServerError(router)
+ *   return router
+ * })
+ * ```
+ *
+ * @since 1.0.0
+ * @category http
+ */
 export function handleHttpServerError(router) {
     return router.addGlobalMiddleware(Effect.catch((error) => HttpServerError.isHttpServerError(error)
-        ? Effect.succeed(HttpServerResponse.text(error.message, { status: getStatus(error) }))
+        ? Effect.succeed(HttpServerResponse.empty({ status: getStatus(error) }))
         : Effect.fail(error)));
 }
 function getStatus(error) {
-    switch (error.reason._tag) {
+    const reason = error.reason;
+    switch (reason._tag) {
         case "RouteNotFound":
             return 404;
         case "RequestParseError":
@@ -38,20 +184,23 @@ function getStatus(error) {
         case "InternalError":
         case "ResponseError":
             return 500;
+        default: {
+            const _exhaustive = reason;
+            return 500;
+        }
     }
 }
-function toRoute(entry, currentServices) {
+function toRoute(path, candidates, currentServices, createResponse) {
     return {
         ["~effect/http/HttpRouter/Route"]: "~effect/http/HttpRouter/Route",
         method: "GET",
-        path: entry.route.path,
+        path,
         handler: Effect.gen(function* () {
-            const fiberId = yield* Effect.fiberId;
-            const rootScope = yield* Effect.scope;
             const routeContext = yield* RouteContext;
             const request = yield* HttpServerRequest.HttpServerRequest;
             const searchParams = yield* HttpServerRequest.ParsedSearchParams;
-            const provided = Layer.mergeAll(initialMemory({ url: request.url }), Layer.succeed(CurrentRoute, yield* Effect.serviceOption(CurrentRoute).pipe(Effect.map(Option.match({
+            const requestUrl = Option.getOrElse(HttpServerRequest.toURL(request), () => new URL(request.url, "http://localhost"));
+            const provided = Layer.mergeAll(initialMemory({ url: requestUrl, origin: requestUrl.origin }).pipe(Layer.provide(Ids.Default)), Layer.succeed(CurrentRoute, yield* Effect.serviceOption(CurrentRoute).pipe(Effect.map(Option.match({
                 onNone: () => ({
                     route: Parse(request.url),
                     parent: undefined,
@@ -61,39 +210,33 @@ function toRoute(entry, currentServices) {
                     parent,
                 }),
             })))));
-            const input = { ...routeContext.params, ...searchParams };
-            const params = yield* Effect.mapError(entry.decode(input), (cause) => new HttpServerError.HttpServerError({
-                reason: new HttpServerError.RequestParseError({ request, cause }),
-            }));
-            const memoMap = yield* Layer.makeMemoMap;
-            const layerManager = makeLayerManager(memoMap, rootScope, fiberId);
-            const layoutManager = makeLayoutManager(rootScope, fiberId);
-            const catchManager = makeCatchManager(rootScope, fiberId);
-            const prepared = yield* layerManager.prepare(entry.layers.concat(provided));
-            const guardExit = yield* entry
-                .guard(params)
-                .pipe(Effect.provideContext(prepared.services), Effect.exit);
-            if (Exit.isFailure(guardExit) || Option.isNone(guardExit.value)) {
-                yield* prepared.rollback;
-                return yield* new HttpServerError.HttpServerError({
-                    reason: new HttpServerError.RouteNotFound({ request }),
-                });
-            }
-            const matchedParams = guardExit.value.value;
-            yield* prepared.commit;
-            const scope = yield* Scope.fork(rootScope);
-            const paramsRef = yield* RefSubject.make(matchedParams).pipe(Scope.provide(scope));
-            const preparedServices = prepared.services;
-            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.provideContext(handlerServices));
-            return HttpServerResponse.text(html, {
-                headers: { "content-type": "text/html; charset=utf-8" },
-            });
+            const input = { ...searchParams, ...routeContext.params };
+            const requestServices = Context.merge(currentServices, yield* Effect.context());
+            const executor = yield* makeRouteExecutor().pipe(Effect.provideContext(requestServices));
+            const rendered = yield* executor
+                .transition({
+                path: request.url,
+                input,
+                candidates,
+                layers: [provided],
+            })
+                .pipe(Effect.catchIf(isRouteDecodeError, (error) => new HttpServerError.HttpServerError({
+                reason: new HttpServerError.RequestParseError({ request, cause: error }),
+            })), Effect.catchIf(isRouteGuardError, () => new HttpServerError.HttpServerError({
+                reason: new HttpServerError.RouteNotFound({ request }),
+            })));
+            return yield* createResponse(rendered, requestServices);
         }),
         uninterruptible: false,
         prefix: Option.none(),
     };
 }
+function hasTag(value, tag) {
+    return hasProperty(value, "_tag") && value._tag === tag;
+}
+function isRouteDecodeError(value) {
+    return hasTag(value, "RouteDecodeError");
+}
+function isRouteGuardError(value) {
+    return hasTag(value, "RouteGuardError");
+}

package/dist/Link.d.ts

@@ -1,36 +1,75 @@
-import * as Effect from "effect/Effect";
 import type { Scope } from "effect/Scope";
-import type { Stream } from "effect/Stream";
-import { type Fx } from "@typed/fx/Fx";
-import { EventHandler, type Renderable, type RenderEvent, type RenderTemplate } from "@typed/template";
-type EventHandlerProperty = `on${string}`;
-type AnchorEventHandlers = {
-    readonly [K in keyof HTMLAnchorElement as K extends EventHandlerProperty ? K : never]?: Effect.Effect<unknown, any, any> | EventHandler.EventHandler<Event, any, any>;
-};
-type AnchorRef = {
-    readonly ref?: (element: HTMLAnchorElement) => void | Effect.Effect<unknown, any, any> | Stream<unknown, any, any> | Fx<unknown, any, any>;
-};
-type IfEquals<X, Y, Output> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? Output : never;
-type WritableKeys<T> = {
-    [P in keyof T]-?: IfEquals<{
-        [Q in P]: T[P];
-    }, {
-        -readonly [Q in P]: T[P];
-    }, P>;
-}[keyof T];
-type AnchorProperties = {
-    readonly [K in WritableKeys<HTMLAnchorElement> as K extends EventHandlerProperty | "ref" ? never : K]?: Renderable<HTMLAnchorElement[K], any, any>;
-};
-export interface LinkOptions extends AnchorEventHandlers, AnchorRef, AnchorProperties {
+import * as Fx from "@typed/fx/Fx";
+import { type NavigationError, Navigation } from "@typed/navigation";
+import { type Renderable, type RenderEvent, type RenderTemplate } from "@typed/template";
+import * as Dom from "./Dom.js";
+import type { HostResult } from "./Dom/Types.js";
+/**
+ * Native anchor options plus Typed navigation behavior.
+ *
+ * @remarks
+ * ## Why
+ *
+ * `href` and content remain renderable, while `replace` selects history policy.
+ * Ordinary anchor options—including target, download, rel, and user click
+ * handlers—stay available through the DOM host model.
+ *
+ * ## Ownership and lifetime
+ *
+ * Options are inert. Rendering owns subscriptions to renderable values and the
+ * click listener for its Effect Scope; the `Navigation` service owns history.
+ *
+ * @since 1.0.0
+ * @category models
+ */
+export type LinkOptions = Dom.HostOptions<HTMLAnchorElement> & Dom.ElementOptions<HTMLAnchorElement> & {
     readonly href: Renderable<string, any, any>;
     readonly content: Renderable<string | number | boolean | null | undefined | void | RenderEvent, any, any>;
     readonly replace?: boolean;
-}
+};
+type LinkError<Options extends object> = Renderable.ErrorFromObject<Options> | NavigationError;
+type LinkServices<Options extends object> = Renderable.ServicesFromObject<Options> | Navigation | Scope | RenderTemplate;
 /**
- * Renders an `<a href="...">` that intercepts same-origin, same-document clicks
- * and navigates via `Navigation.navigate` instead of full page load. Requires
- * `Navigation` and `RenderTemplate` in the Effect context (e.g. `BrowserRouter`).
+ * Renders a native anchor with safe, eligible same-origin SPA navigation.
+ *
+ * Modified clicks, downloads, external URLs, non-HTTP(S) destinations, and
+ * non-self targets retain browser behavior. Unsafe executable schemes are
+ * rendered as `about:blank` and their clicks are canceled. A user click handler
+ * runs first through DOM host event chaining; `preventDefault()` prevents the
+ * internal navigation decision.
+ *
+ * @remarks
+ * ## Why
+ *
+ * `Link` keeps the anchor as the integration boundary: native opening, copying,
+ * status previews, modifier keys, downloads, and external navigation continue
+ * to work. Only an unmodified primary click to same-origin HTTP(S) is handed to
+ * Typed's Effect-native `Navigation` service.
+ *
+ * ## Ownership and lifetime
+ *
+ * Calling `Link` starts no work. Running the returned Fx subscribes to dynamic
+ * href/content and installs a real, non-passive DOM click listener in its
+ * Effect Scope. Scope finalization removes only those resources. Navigation
+ * failures and required services remain visible in the Fx type. A custom host
+ * must preserve the sanitized href, chained click handler, content, and native
+ * anchor behavior.
+ *
+ * @example
+ * ```ts
+ * import { Link } from "@typed/ui/Link"
+ *
+ * const profile = Link({
+ *   href: "/account/profile",
+ *   content: "Profile",
+ *   replace: false
+ * })
+ * ```
+ *
+ * @since 1.0.0
+ * @category components
  */
-export declare function Link<const Opts extends LinkOptions>(options: Opts): Fx<RenderEvent, Renderable.ErrorFromObject<Opts>, Renderable.ServicesFromObject<Opts> | Scope | RenderTemplate>;
+export declare function Link<const Options extends object>(options: Options, ..._: Options extends LinkOptions ? [] : ["Link options must satisfy LinkOptions"]): Fx.Fx<RenderEvent, LinkError<Options>, LinkServices<Options>>;
+export declare function Link<const Options extends object, const Host extends HostResult>(options: Options, host: Dom.HostOverride<Dom.HostProps<HTMLAnchorElement>, Renderable.Any, Host>, ..._: Options extends LinkOptions ? [] : ["Link options must satisfy LinkOptions"]): Fx.Fx<RenderEvent, LinkError<Options> | Fx.Error<Host>, LinkServices<Options> | Fx.Services<Host>>;
 export {};
 //# sourceMappingURL=Link.d.ts.map

package/dist/Link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../src/Link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,EAAO,MAAM,cAAc,CAAC;AAG5C,OAAO,EACL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,oBAAoB,GAAG,KAAK,MAAM,EAAE,CAAC;AAE1C,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,CAAC,IAAI,MAAM,iBAAiB,IAAI,CAAC,SAAS,oBAAoB,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,EAClF,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAChC,YAAY,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;CAC/C,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,GAAG,CAAC,EAAE,CACb,OAAO,EAAE,iBAAiB,KACvB,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAClG,CAAC;AAEF,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,IACxB,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEvF,KAAK,YAAY,CAAC,CAAC,IAAI;KACpB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;SAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAAE,EAAE;QAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAAE,EAAE,CAAC,CAAC;CAChF,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,CAAC,IAAI,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,oBAAoB,GAAG,KAAK,GACpF,KAAK,GACL,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;CACpD,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,mBAAmB,EAAE,SAAS,EAAE,gBAAgB;IACnF,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,UAAU,CAC1B,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,GAAG,WAAW,EACjE,GAAG,EACH,GAAG,CACJ,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAyBD;;;;GAIG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,WAAW,EACjD,OAAO,EAAE,IAAI,GACZ,EAAE,CACH,WAAW,EACX,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,EAChC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,cAAc,CAC7D,CAqBA"}
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../src/Link.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,KAAK,eAAe,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,iBAAiB,CAAC,GAC1D,GAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG;IACtC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,UAAU,CAC1B,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,GAAG,WAAW,EACjE,GAAG,EACH,GAAG,CACJ,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEJ,KAAK,SAAS,CAAC,OAAO,SAAS,MAAM,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC;AAE/F,KAAK,YAAY,CAAC,OAAO,SAAS,MAAM,IACpC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,GACtC,UAAU,GACV,KAAK,GACL,cAAc,CAAC;AA2EnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAC/C,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,OAAO,SAAS,WAAW,GAAG,EAAE,GAAG,CAAC,uCAAuC,CAAC,GACjF,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;AACjE,wBAAgB,IAAI,CAAC,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,KAAK,CAAC,IAAI,SAAS,UAAU,EAC9E,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,EAC9E,GAAG,CAAC,EAAE,OAAO,SAAS,WAAW,GAAG,EAAE,GAAG,CAAC,uCAAuC,CAAC,GACjF,EAAE,CAAC,EAAE,CACN,WAAW,EACX,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EACnC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC1C,CAAC"}

package/dist/Link.js

@@ -1,45 +1,99 @@
 import * as Effect from "effect/Effect";
-import { gen } from "@typed/fx/Fx";
-import { RefSubject } from "@typed/fx/RefSubject";
-import { getUrl, Navigation } from "@typed/navigation";
+import * as Stream from "effect/Stream";
+import * as Fx from "@typed/fx/Fx";
+import { Navigation } from "@typed/navigation";
 import { EventHandler, html, } from "@typed/template";
-function makeLinkClickHandler(replace$) {
-    return EventHandler.make((ev) => Effect.gen(function* () {
-        const href = ev.currentTarget.href;
-        if (ev.ctrlKey || ev.metaKey || ev.shiftKey)
+import * as Dom from "./Dom.js";
+function makeLinkClickHandler(replace) {
+    // Classification and native cancellation must run during event dispatch;
+    // only the resulting router navigation is lazy.
+    return EventHandler.make((event) => {
+        const anchor = Dom.currentTarget(event);
+        const href = anchor.href;
+        if (event.defaultPrevented ||
+            event.button !== 0 ||
+            event.metaKey ||
+            event.altKey ||
+            event.ctrlKey ||
+            event.shiftKey)
             return;
-        const t = ev.currentTarget.target;
-        if (t && t !== "_self")
+        const target = anchor.target;
+        if (target && target !== "_self")
             return;
-        const nav = yield* Navigation;
-        const target = getUrl(nav.origin, href);
-        if (target.origin !== nav.origin)
+        if (anchor.hasAttribute("download"))
             return;
-        ev.preventDefault();
-        const replace = yield* replace$;
-        yield* nav.navigate(href, { history: replace ? "replace" : "push" });
-    }));
+        if (!isSafeLinkHref(href)) {
+            event.preventDefault();
+            return;
+        }
+        const destination = new URL(href);
+        if (destination.protocol !== "http:" && destination.protocol !== "https:")
+            return;
+        if (destination.origin !== anchor.ownerDocument.defaultView?.location.origin)
+            return;
+        event.preventDefault();
+        return Effect.flatMap(Navigation, (navigation) => navigation.navigate(href, { history: replace ? "replace" : "push" }));
+    }, { passive: false });
+}
+function legacyProps(options) {
+    const modern = options.props;
+    const props = {};
+    for (const [key, value] of Object.entries(options)) {
+        if (key === "content" ||
+            key === "href" ||
+            key === "props" ||
+            key === "ref" ||
+            key === "replace" ||
+            key[0] === "@" ||
+            (key[0] === "o" && key[1] === "n") ||
+            (modern !== undefined && Object.hasOwn(modern, key)))
+            continue;
+        props[key] = value;
+    }
+    return props;
 }
-/**
- * Renders an `<a href="...">` that intercepts same-origin, same-document clicks
- * and navigates via `Navigation.navigate` instead of full page load. Requires
- * `Navigation` and `RenderTemplate` in the Effect context (e.g. `BrowserRouter`).
- */
-export function Link(options) {
-    return gen(function* () {
-        const { replace = false, onclick, content: children, ...rest } = options;
-        const replace$ = yield* RefSubject.make(replace);
-        const navigationHandler = makeLinkClickHandler(replace$);
-        const userHandler = onclick ? EventHandler.fromEffectOrEventHandler(onclick) : undefined;
-        const clickHandler = userHandler
-            ? EventHandler.make(Effect.fn(function* (ev) {
-                yield* userHandler.handler(ev);
-                if (ev.defaultPrevented)
-                    return;
-                yield* navigationHandler.handler(ev);
-            }), { ...userHandler.options, preventDefault: true })
-            : navigationHandler;
-        const props = { ...rest, onclick: clickHandler };
-        return html `<a ...${props}>${children}</a>`;
+function internalProps(options) {
+    return () => ({
+        ...legacyProps(options),
+        href: sanitizeLinkHref(options.href),
+        onclick: makeLinkClickHandler(options.replace ?? false),
     });
 }
+// Keep the implementation erased: constraining it to LinkOptions widens the
+// Renderable `any` slots and loses the exact error/service inference above.
+export function Link(options, host, ..._) {
+    const render = Dom.renderHost();
+    return render(options, host, internalProps(options), options.content, (props, content) => html `<a ...${props}>${content}</a>`);
+}
+function sanitizeLinkHref(href) {
+    if (Fx.isFx(href))
+        return Fx.map(href, neutralizeExecutableHref);
+    if (Stream.isStream(href)) {
+        return Stream.map(href, neutralizeExecutableHref);
+    }
+    if (Effect.isEffect(href))
+        return Effect.map(href, neutralizeExecutableHref);
+    if (Array.isArray(href)) {
+        return href.map((value) => sanitizeLinkHref(value));
+    }
+    return (typeof href === "string" ? neutralizeExecutableHref(href) : href);
+}
+function neutralizeExecutableHref(href) {
+    return isSafeLinkHref(href) ? href : "about:blank";
+}
+function isSafeLinkHref(href) {
+    try {
+        switch (new URL(href, "http://localhost").protocol) {
+            case "http:":
+            case "https:":
+            case "mailto:":
+            case "tel:":
+                return true;
+            default:
+                return false;
+        }
+    }
+    catch {
+        return false;
+    }
+}