effect-start 0.34.0 → 0.35.0

package/dist/_HtmlScanner.js

@@ -0,0 +1,385 @@
+const TEXT = 0;
+const TAG_OPEN = 1;
+const TAG_NAME = 2;
+const BEFORE_ATTR_NAME = 3;
+const ATTR_NAME = 4;
+const AFTER_ATTR_NAME = 5;
+const BEFORE_ATTR_VALUE = 6;
+const ATTR_VALUE_DOUBLE_QUOTED = 7;
+const ATTR_VALUE_SINGLE_QUOTED = 8;
+const ATTR_VALUE_UNQUOTED = 9;
+const SELF_CLOSING = 10;
+const BOGUS_COMMENT = 11;
+const RAW_TEXT_TAGS = ["script", "style", "textarea", "title"];
+function* tokenize(html) {
+    const len = html.length;
+    let i = 0;
+    let state = TEXT;
+    let tag = "";
+    let attrName = "";
+    let attrNameStart = 0;
+    let attrValue = "";
+    let attrValueStart = 0;
+    let attrs = new Map();
+    let pending;
+    const emit = () => {
+        const lower = tag.toLowerCase();
+        pending = { tag, attrs, end: i };
+        tag = "";
+        attrs = new Map();
+        return RAW_TEXT_TAGS.includes(lower) ? lower : undefined;
+    };
+    const emitAndContinue = () => {
+        const rawTag = emit();
+        state = TEXT;
+        if (rawTag) {
+            const needle = `</${rawTag}`;
+            const idx = html.toLowerCase().indexOf(needle, i);
+            if (idx === -1) {
+                i = len;
+            }
+            else {
+                const end = html.indexOf(">", idx + needle.length);
+                i = end === -1 ? len : end + 1;
+            }
+        }
+    };
+    const commitAttr = () => {
+        if (attrName) {
+            attrs.set(attrName.toLowerCase(), {
+                value: attrValue,
+                nameSpan: { start: attrNameStart, end: attrNameStart + attrName.length },
+                valueSpan: attrValueStart > 0
+                    ? { start: attrValueStart, end: attrValueStart + attrValue.length }
+                    : undefined,
+            });
+            attrName = "";
+            attrValue = "";
+            attrValueStart = 0;
+        }
+    };
+    while (i < len) {
+        const ch = html[i];
+        switch (state) {
+            case TEXT:
+                if (ch === "<") {
+                    const next = html[i + 1];
+                    if (next === "!" && html[i + 2] === "-" && html[i + 3] === "-") {
+                        const end = html.indexOf("-->", i + 4);
+                        i = end === -1 ? len : end + 3;
+                    }
+                    else if (next === "!" || next === "?") {
+                        state = BOGUS_COMMENT;
+                        i++;
+                    }
+                    else {
+                        state = TAG_OPEN;
+                        i++;
+                    }
+                }
+                else {
+                    i++;
+                }
+                break;
+            case BOGUS_COMMENT: {
+                const end = html.indexOf(">", i);
+                i = end === -1 ? len : end + 1;
+                state = TEXT;
+                break;
+            }
+            case TAG_OPEN:
+                if (ch === "/") {
+                    const end = html.indexOf(">", i);
+                    i = end === -1 ? len : end + 1;
+                    state = TEXT;
+                }
+                else if ((ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z")) {
+                    tag = ch;
+                    state = TAG_NAME;
+                    i++;
+                }
+                else {
+                    state = TEXT;
+                }
+                break;
+            case TAG_NAME:
+                if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    state = BEFORE_ATTR_NAME;
+                    i++;
+                }
+                else if (ch === "/") {
+                    state = SELF_CLOSING;
+                    i++;
+                }
+                else if (ch === ">") {
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    tag += ch;
+                    i++;
+                }
+                break;
+            case BEFORE_ATTR_NAME:
+                if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    i++;
+                }
+                else if (ch === "/") {
+                    state = SELF_CLOSING;
+                    i++;
+                }
+                else if (ch === ">") {
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    attrName = ch;
+                    attrNameStart = i;
+                    state = ATTR_NAME;
+                    i++;
+                }
+                break;
+            case ATTR_NAME:
+                if (ch === "=") {
+                    state = BEFORE_ATTR_VALUE;
+                    i++;
+                }
+                else if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    state = AFTER_ATTR_NAME;
+                    i++;
+                }
+                else if (ch === "/" || ch === ">") {
+                    commitAttr();
+                    if (ch === "/") {
+                        state = SELF_CLOSING;
+                        i++;
+                    }
+                    else {
+                        i++;
+                        emitAndContinue();
+                    }
+                }
+                else {
+                    attrName += ch;
+                    i++;
+                }
+                break;
+            case AFTER_ATTR_NAME:
+                if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    i++;
+                }
+                else if (ch === "=") {
+                    state = BEFORE_ATTR_VALUE;
+                    i++;
+                }
+                else if (ch === "/") {
+                    commitAttr();
+                    state = SELF_CLOSING;
+                    i++;
+                }
+                else if (ch === ">") {
+                    commitAttr();
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    commitAttr();
+                    attrName = ch;
+                    attrNameStart = i;
+                    state = ATTR_NAME;
+                    i++;
+                }
+                break;
+            case BEFORE_ATTR_VALUE:
+                if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    i++;
+                }
+                else if (ch === '"') {
+                    attrValueStart = i + 1;
+                    state = ATTR_VALUE_DOUBLE_QUOTED;
+                    i++;
+                }
+                else if (ch === "'") {
+                    attrValueStart = i + 1;
+                    state = ATTR_VALUE_SINGLE_QUOTED;
+                    i++;
+                }
+                else if (ch === ">") {
+                    commitAttr();
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    attrValue = ch;
+                    attrValueStart = i;
+                    state = ATTR_VALUE_UNQUOTED;
+                    i++;
+                }
+                break;
+            case ATTR_VALUE_DOUBLE_QUOTED:
+                if (ch === '"') {
+                    commitAttr();
+                    state = BEFORE_ATTR_NAME;
+                    i++;
+                }
+                else {
+                    attrValue += ch;
+                    i++;
+                }
+                break;
+            case ATTR_VALUE_SINGLE_QUOTED:
+                if (ch === "'") {
+                    commitAttr();
+                    state = BEFORE_ATTR_NAME;
+                    i++;
+                }
+                else {
+                    attrValue += ch;
+                    i++;
+                }
+                break;
+            case ATTR_VALUE_UNQUOTED:
+                if (ch === " " || ch === "\t" || ch === "\n" || ch === "\r" || ch === "\f") {
+                    commitAttr();
+                    state = BEFORE_ATTR_NAME;
+                    i++;
+                }
+                else if (ch === ">") {
+                    commitAttr();
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    attrValue += ch;
+                    i++;
+                }
+                break;
+            case SELF_CLOSING:
+                if (ch === ">") {
+                    i++;
+                    emitAndContinue();
+                }
+                else {
+                    state = BEFORE_ATTR_NAME;
+                }
+                break;
+        }
+        if (pending) {
+            yield pending;
+            pending = undefined;
+        }
+    }
+}
+export function* parse(html) {
+    for (const tok of tokenize(html)) {
+        const attributes = new Map();
+        for (const [name, attr] of tok.attrs) {
+            attributes.set(name, attr.value);
+        }
+        yield { tagName: tok.tag.toLowerCase(), attributes };
+    }
+}
+class MutableElement {
+    tagName;
+    _attrs;
+    _edits;
+    _html;
+    _end;
+    constructor(tok, edits, html) {
+        this.tagName = tok.tag.toLowerCase();
+        this._attrs = tok.attrs;
+        this._edits = edits;
+        this._html = html;
+        this._end = tok.end;
+    }
+    getAttribute(name) {
+        const attr = this._attrs.get(name.toLowerCase());
+        return attr ? attr.value : null;
+    }
+    hasAttribute(name) {
+        return this._attrs.has(name.toLowerCase());
+    }
+    setAttribute(name, value) {
+        const lower = name.toLowerCase();
+        const attr = this._attrs.get(lower);
+        if (attr && attr.valueSpan) {
+            this._edits.push({
+                offset: attr.valueSpan.start,
+                deleteCount: attr.valueSpan.end - attr.valueSpan.start,
+                insert: value,
+            });
+            attr.value = value;
+        }
+        else if (attr) {
+            this._edits.push({
+                offset: attr.nameSpan.start,
+                deleteCount: attr.nameSpan.end - attr.nameSpan.start,
+                insert: `${name}="${value}"`,
+            });
+            attr.value = value;
+            attr.valueSpan = { start: -1, end: -1 };
+        }
+        else {
+            const insertAt = this._end - 1;
+            this._edits.push({
+                offset: insertAt,
+                deleteCount: 0,
+                insert: ` ${name}="${value}"`,
+            });
+            this._attrs.set(lower, {
+                value,
+                nameSpan: { start: -1, end: -1 },
+                valueSpan: { start: -1, end: -1 },
+            });
+        }
+        return this;
+    }
+    removeAttribute(name) {
+        const lower = name.toLowerCase();
+        const attr = this._attrs.get(lower);
+        if (!attr || attr.nameSpan.start === -1)
+            return this;
+        let start = attr.nameSpan.start;
+        const end = attr.valueSpan
+            ? attr.valueSpan.end + 1
+            : attr.nameSpan.end;
+        while (start > 0 && " \t\n\r\f".includes(this._html[start - 1])) {
+            start--;
+        }
+        this._edits.push({ offset: start, deleteCount: end - start, insert: "" });
+        this._attrs.delete(lower);
+        return this;
+    }
+    get attributes() {
+        const entries = this._attrs.entries();
+        return (function* () {
+            for (const [name, attr] of entries) {
+                yield [name, attr.value];
+            }
+        })();
+    }
+}
+export const rewrite = (html) => {
+    const edits = [];
+    return {
+        *[Symbol.iterator]() {
+            for (const tok of tokenize(html)) {
+                yield new MutableElement(tok, edits, html);
+            }
+        },
+        toString() {
+            if (edits.length === 0)
+                return html;
+            edits.sort((a, b) => b.offset - a.offset);
+            let result = html;
+            for (const edit of edits) {
+                result =
+                    result.slice(0, edit.offset) +
+                        edit.insert +
+                        result.slice(edit.offset + edit.deleteCount);
+            }
+            return result;
+        },
+    };
+};
+//# sourceMappingURL=_HtmlScanner.js.map

package/dist/_HtmlScanner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_HtmlScanner.js","sourceRoot":"","sources":["../src/_HtmlScanner.ts"],"names":[],"mappings":"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"}

package/dist/_RouteLink.d.ts

@@ -0,0 +1,16 @@
+import type * as PathPattern from "./_PathPattern.ts";
+import type * as Route from "./Route.ts";
+import type { Routes as DevRoutes } from "effect-start/dev";
+export type LinkParams<Routes, P extends string, B = P extends keyof Routes ? Routes[P] extends [...any[], infer L] ? L extends () => Promise<{
+    default: infer R extends Route.RouteSet.Any;
+}> ? Route.Route.Bindings<R> : {} : {} : {}> = {
+    [K in keyof PathPattern.Params<P>]: B extends {
+        pathParams: infer S;
+    } ? K extends keyof S ? S[K] : string | number : string | number;
+} & (B extends {
+    searchParams: infer S;
+} ? {
+    [K in keyof S]?: S[K];
+} : {});
+export declare function link<Routes = DevRoutes, P extends keyof Routes extends never ? string : keyof Routes & string = keyof Routes extends never ? string : keyof Routes & string>(...args: {} extends LinkParams<Routes, P> ? [path: P, params?: LinkParams<Routes, P>] : [path: P, params: LinkParams<Routes, P>]): string;
+//# sourceMappingURL=_RouteLink.d.ts.map

package/dist/_RouteLink.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_RouteLink.d.ts","sourceRoot":"","sources":["../src/_RouteLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,WAAW,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE3D,MAAM,MAAM,UAAU,CACpB,MAAM,EACN,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,CAAC,SAAS,MAAM,MAAM,GACtB,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,GACnC,CAAC,SAAS,MAAM,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC,SAAS,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAA;CAAE,CAAC,GACtE,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GACvB,EAAE,GACJ,EAAE,GACJ,EAAE,IACJ;KACD,CAAC,IAAI,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS;QAAE,UAAU,EAAE,MAAM,CAAC,CAAA;KAAE,GACjE,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,GACJ,MAAM,GAAG,MAAM,GACjB,MAAM,GAAG,MAAM;CACpB,GAAG,CAAC,CAAC,SAAS;IAAE,YAAY,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC,CAAA;AAE1E,wBAAgB,IAAI,CAClB,MAAM,GAAG,SAAS,EAClB,CAAC,SAAS,MAAM,MAAM,SAAS,KAAK,GAAG,MAAM,GAAG,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,MAAM,SAAS,KAAK,GAC9F,MAAM,GACN,MAAM,MAAM,GAAG,MAAM,EAEzB,GAAG,IAAI,EAAE,EAAE,SAAS,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GACrC,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GACzC,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAC3C,MAAM,CAsBR"}

package/dist/_RouteLink.js

@@ -0,0 +1,22 @@
+export function link(...args) {
+    const path = args[0];
+    const remaining = { ...args[1] };
+    const result = path.replace(/\/:(\w+)([?*+])?/g, (_, name, modifier) => {
+        const value = remaining[name];
+        delete remaining[name];
+        if (value == null) {
+            if (modifier === "?" || modifier === "*")
+                return "";
+            return "/";
+        }
+        return "/" + encodeURIComponent(String(value));
+    });
+    const search = new URLSearchParams();
+    for (const key in remaining) {
+        if (remaining[key] != null)
+            search.set(key, String(remaining[key]));
+    }
+    const qs = search.toString();
+    return qs ? result + "?" + qs : result;
+}
+//# sourceMappingURL=_RouteLink.js.map

package/dist/_RouteLink.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_RouteLink.js","sourceRoot":"","sources":["../src/_RouteLink.ts"],"names":[],"mappings":"AAsBA,MAAM,UAAU,IAAI,CAMlB,GAAG,IAEyC;IAE5C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAW,CAAA;IAC9B,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAiD,CAAA;IAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CACzB,mBAAmB,EACnB,CAAC,CAAC,EAAE,IAAY,EAAE,QAA4B,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;QACtB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,QAAQ,KAAK,GAAG,IAAI,QAAQ,KAAK,GAAG;gBAAE,OAAO,EAAE,CAAA;YACnD,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,OAAO,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAChD,CAAC,CACF,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;IACpC,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACrE,CAAC;IACD,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAC5B,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;AACxC,CAAC"}

package/dist/bun/BunRoute.d.ts

@@ -2,7 +2,7 @@ import * as Bun from "bun";
 import * as Option from "effect/Option";
 import * as Route from "../Route.ts";
 import * as BunServer from "./BunServer.ts";
-declare const BunRouteError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+declare const BunRouteError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "BunRouteError";
 } & Readonly<A>;
 export declare class BunRouteError extends BunRouteError_base<{
@@ -15,15 +15,13 @@ export type BunDescriptors = {
     bunPrefix: string;
     bunLoad: () => Promise<Bun.HTMLBundle>;
 };
-export declare function descriptors(route: Route.Route.Route<any, any, any, any, any>): BunDescriptors | undefined;
+export declare function descriptors(route: Route.Route<any, any, any, any, any>): BunDescriptors | undefined;
 type HTMLBundleModule = Bun.HTMLBundle | {
     default: Bun.HTMLBundle;
 };
-export declare function htmlBundle(load: () => HTMLBundleModule | Promise<HTMLBundleModule>): <D extends Route.RouteDescriptor.Any, B extends {}, I extends Route.Route.Tuple>(self: Route.RouteSet.RouteSet<D, B, I>) => Route.RouteSet.RouteSet<D, B, [...I, Route.Route.Route<BunDescriptors & {
+export declare function htmlBundle(load: () => HTMLBundleModule | Promise<HTMLBundleModule>): <D extends Route.RouteDescriptor.Any, B extends {}, I extends Route.Route.Tuple>(self: Route.RouteSet<D, B, I>) => Route.RouteSet<D, B, [...I, Route.Route<BunDescriptors & {
     format: "html";
-}, {
-    request: Request;
-}, string, BunRouteError, BunServer.BunServer>]>;
+}, {}, string, BunRouteError, BunServer.BunServer | Route.Request>]>;
 type BunServerFetchHandler = (request: Request, server: Bun.Server<unknown>) => Response | Promise<Response>;
 type BunServerRouteHandler = Bun.HTMLBundle | Bun.BunFile | BunServerFetchHandler | Partial<Record<Bun.Serve.HTTPMethod, BunServerFetchHandler>>;
 export type BunRoutes = Record<string, BunServerRouteHandler>;

package/dist/bun/BunRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BunRoute.d.ts","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAK1B,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,CA2FF;AAuHD,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"}
+{"version":3,"file":"BunRoute.d.ts","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAK1B,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,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAC1C,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,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC5B,KAAK,CAAC,QAAQ,CACf,CAAC,EACD,CAAC,EACD,CACE,GAAG,CAAC,EACJ,KAAK,CAAC,KAAK,CACT,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACnC,EAAE,EACF,MAAM,EACN,aAAa,EACb,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CACpC,CACF,CACF,CA2FF;AAuHD,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"}

package/dist/bun/BunRoute.js

@@ -26,7 +26,7 @@ export function htmlBundle(load) {
     const descriptors = { bunPrefix, bunLoad, format: "html" };
     return function (self) {
         const handler = (context, next) => Effect.gen(function* () {
-            const originalRequest = context.request;
+            const originalRequest = yield* Route.Request;
             const bundleDepth = yield* FiberRef.get(bundleDepthRef);
             if (originalRequest.headers.get(INTERNAL_FETCH_HEADER) === "true") {
                 const url = new URL(originalRequest.url);

package/dist/bun/BunRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"BunRoute.js","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BunRoute.js","sourceRoot":"","sources":["../../src/bun/BunRoute.ts"],"names":[],"mappings":"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"}

package/dist/bundler/Bundle.d.ts

@@ -40,7 +40,7 @@ export type BundleContext = BundleManifest & {
     getArtifact: (path: string) => Blob | null;
     events?: PubSub.PubSub<BundleEvent>;
 };
-declare const BundleError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+declare const BundleError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "BundleError";
 } & Readonly<A>;
 export declare class BundleError extends BundleError_base<{

package/dist/bundler/BundleRoute.d.ts

@@ -1,5 +1,4 @@
 import type * as Context from "effect/Context";
-import * as Layer from "effect/Layer";
 import * as PathPattern from "../_PathPattern.ts";
 import * as Route from "../Route.ts";
 import * as Bundle from "./Bundle.ts";
@@ -13,16 +12,16 @@ import * as Bundle from "./Bundle.ts";
  * })
  * ```
  */
-export declare const make: <Tag extends Context.Tag<any, Bundle.BundleContext>>(tag: Tag) => Omit<import("../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+export declare const make: <Tag extends Context.Tag<any, Bundle.BundleContext>>(tag: Tag) => import("../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "*";
-}, {}, Uint8Array<ArrayBuffer>, never, any>]>, "use">;
-export declare const client: () => Omit<import("../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+}, {}, Uint8Array<ArrayBuffer>, never, any>]>;
+export declare const client: () => import("../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "*";
-}, {}, Uint8Array<ArrayBuffer>, never, any>]>, "use">;
+}, {}, Uint8Array<ArrayBuffer>, never, any>]>;
 export declare const layer: (options?: {
     bundle?: Context.Tag<any, Bundle.BundleContext>;
     path?: PathPattern.PathPattern;
-}) => Layer.Layer<Route.Routes, never, never>;
+}) => import("effect/Layer").Layer<Route.Routes, never, never>;
 //# sourceMappingURL=BundleRoute.d.ts.map

package/dist/bundler/BundleRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BundleRoute.d.ts","sourceRoot":"","sources":["../../src/bundler/BundleRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAE9C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAGpC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,GAAG;;;qDAuB9E,CAAA;AAEH,eAAO,MAAM,MAAM;;;qDAAkC,CAAA;AAErD,eAAO,MAAM,KAAK,GAAI,UAAU;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC,WAAW,CAAA;CAC/B,4CAcE,CAAA"}
+{"version":3,"file":"BundleRoute.d.ts","sourceRoot":"","sources":["../../src/bundler/BundleRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAG9C,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI,GAAI,GAAG,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,GAAG;;;6CAwB9E,CAAA;AAEH,eAAO,MAAM,MAAM;;;6CAAkC,CAAA;AAErD,eAAO,MAAM,KAAK,GAAI,UAAU;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC,WAAW,CAAA;CAC/B,6DAKA,CAAA"}

package/dist/bundler/BundleRoute.js

@@ -1,10 +1,7 @@
 import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Entity from "../Entity.js";
 import * as PathPattern from "../_PathPattern.js";
 import * as Route from "../Route.js";
-import * as RouteTree from "../RouteTree.js";
 import * as Values from "../_Values.js";
 import * as Bundle from "./Bundle.js";
 /**
@@ -19,7 +16,8 @@ import * as Bundle from "./Bundle.js";
  */
 export const make = (tag) => Route.get(Route.render(function* (ctx) {
     const bundle = yield* tag;
-    const url = new URL(ctx.request.url);
+    const request = yield* Route.Request;
+    const url = new URL(request.url);
     const mountPath = ctx.path ?? "/";
     const params = PathPattern.match(mountPath, url.pathname);
     const artifactPath = params ? Values.firstValue(params) : undefined;
@@ -39,14 +37,10 @@ export const make = (tag) => Route.get(Route.render(function* (ctx) {
     });
 }));
 export const client = () => make(Bundle.ClientBundle);
-export const layer = (options) => Layer.effect(Route.Routes, Effect.gen(function* () {
-    const existing = yield* Effect.serviceOption(Route.Routes).pipe(Effect.andThen(Option.getOrUndefined));
+export const layer = (options) => {
     const path = options?.path ?? "/_bundle/:path+";
-    const bundleTree = Route.tree({
+    return Route.layerMerge({
         [path]: make(options?.bundle ?? Bundle.ClientBundle),
     });
-    if (!existing)
-        return bundleTree;
-    return RouteTree.merge(existing, bundleTree);
-}));
+};
 //# sourceMappingURL=BundleRoute.js.map

package/dist/bundler/BundleRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"BundleRoute.js","sourceRoot":"","sources":["../../src/bundler/BundleRoute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BundleRoute.js","sourceRoot":"","sources":["../../src/bundler/BundleRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAqD,GAAQ,EAAE,EAAE,CACnF,KAAK,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG;IACzB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;IACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;IACpC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,MAAM,SAAS,GAAI,GAAoC,CAAC,IAAI,IAAI,GAAG,CAAA;IACnE,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACzD,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;IAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE;QACxB,OAAO,EAAE;YACP,cAAc,EAAE,IAAI,CAAC,IAAI,IAAI,0BAA0B;YACvD,eAAe,EAAE,qCAAqC;SACvD;KACF,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAErD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,OAGrB,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,iBAAiB,CAAA;IAC/C,OAAO,KAAK,CAAC,UAAU,CAAC;QACtB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC;KACrD,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/datastar/watchers/patchElements.js

@@ -325,7 +325,7 @@ const removeNode = (node) => {
     ctxIdMap.has(node) ? moveBefore(ctxPantry, node, null) : node.parentNode?.removeChild(node);
 };
 const moveBefore = removeNode.call.bind(
-// @ts-expect-error
+// @ts-ignore
 ctxPantry.moveBefore ?? ctxPantry.insertBefore);
 const aliasedPreserveAttr = aliasify("preserve-attr");
 const morphNode = (oldNode, newNode) => {