effect-start 0.30.1 → 0.32.0

package/dist/RouteSse.d.ts

@@ -5,17 +5,16 @@ import * as Entity from "./Entity.ts";
 import * as Route from "./Route.ts";
 import type * as Values from "./_Values.ts";
 interface SseEvent {
-    readonly [key: string]: unknown;
     readonly _tag?: string;
     readonly data?: string | undefined;
-    readonly type?: string;
+    readonly event?: string;
     readonly retry?: number;
 }
 type SseHandlerInput<B, E, R> = Stream.Stream<SseEvent, E, R> | Effect.Effect<Stream.Stream<SseEvent, E, R>, E, R> | ((context: Values.Simplify<B>, next: (context?: Partial<B> & Record<string, unknown>) => Entity.Entity<string>) => Stream.Stream<SseEvent, E, R> | Effect.Effect<Stream.Stream<SseEvent, E, R>, E, R> | Generator<Utils.YieldWrap<Effect.Effect<unknown, E, R>>, Stream.Stream<SseEvent, E, R>, unknown>);
 export declare function sse<D extends Route.RouteDescriptor.Any, B extends {}, I extends Route.Route.Tuple, E = never, R = never>(handler: SseHandlerInput<NoInfer<D & B & Route.ExtractBindings<I> & {
-    format: "text";
+    format: "sse";
 }>, E, R>): (self: Route.RouteSet.RouteSet<D, B, I>) => Route.RouteSet.RouteSet<D, B, [...I, Route.Route.Route<{
-    format: "text";
+    format: "sse";
 }, {}, Stream.Stream<string, E, R>, E, R>]>;
 export {};
 //# sourceMappingURL=RouteSse.d.ts.map

package/dist/RouteSse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteSse.d.ts","sourceRoot":"","sources":["../src/RouteSse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAA;AAK3C,UAAU,QAAQ;IAChB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CACxB;AA0BD,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IACxB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,GAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAClD,CAAC,CACC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAE7E,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,GAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAClD,SAAS,CACP,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7B,OAAO,CACR,CAAC,CAAA;AAEV,wBAAgB,GAAG,CACjB,CAAC,SAAS,KAAK,CAAC,eAAe,CAAC,GAAG,EACnC,CAAC,SAAS,EAAE,EACZ,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,KAAK,EAC3B,CAAC,GAAG,KAAK,EACT,CAAC,GAAG,KAAK,EACT,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAC7E,MAAM,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YA6DhB,MAAM;4CAG9C"}
+{"version":3,"file":"RouteSse.d.ts","sourceRoot":"","sources":["../src/RouteSse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAA;AAK3C,UAAU,QAAQ;IAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CACxB;AA0BD,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IACxB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,GAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAClD,CAAC,CACC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAE3B,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAE7E,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,GAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAClD,SAAS,CACP,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7B,OAAO,CACR,CAAC,CAAA;AAEV,wBAAgB,GAAG,CACjB,CAAC,SAAS,KAAK,CAAC,eAAe,CAAC,GAAG,EACnC,CAAC,SAAS,EAAE,EACZ,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,KAAK,EAC3B,CAAC,GAAG,KAAK,EACT,CAAC,GAAG,KAAK,EACT,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAC5E,MAAM,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YA6DhB,KAAK;4CAG7C"}

package/dist/RouteSse.js

@@ -13,8 +13,8 @@ function formatSseEvent(event) {
         return `event: ${event._tag}\ndata: ${json}\n\n`;
     }
     let result = "";
-    if (event.type) {
-        result += `event: ${event.type}\n`;
+    if (event.event) {
+        result += `event: ${event.event}\n`;
     }
     if (typeof event.data === "string") {
         for (const line of event.data.split("\n")) {
@@ -68,7 +68,7 @@ export function sse(handler) {
                 });
             });
         };
-        const route = Route.make(sseHandler, { format: "text" });
+        const route = Route.make(sseHandler, { format: "sse" });
         const items = [...Route.items(self), route];
         return Route.set(items, Route.descriptor(self));
     };

package/dist/RouteSse.js.map

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

package/dist/RouteTree.d.ts

@@ -1,8 +1,9 @@
-import * as PathPattern from "./_PathPattern.ts";
+import type * as PathPattern from "./_PathPattern.ts";
 import * as Route from "./Route.ts";
 import type * as RouteMount from "./RouteMount.ts";
 declare const TypeId: "~effect-start/RouteTree";
 declare const RouteTreeRoutes: unique symbol;
+declare const CompiledRoutesKey: unique symbol;
 type MethodRoute = Route.Route.With<{
     method: string;
 }>;
@@ -21,9 +22,23 @@ export type RouteMap = {
     [path: PathPattern.PathPattern]: Route.Route.Tuple;
 };
 export type Routes<T extends RouteTree> = T[typeof RouteTreeRoutes];
+interface CompiledMethod {
+    regex: RegExp;
+    table: Array<{
+        path: PathPattern.PathPattern;
+        routes: Array<RouteMount.MountedRoute>;
+        paramNames: Array<string>;
+        paramGroupIndices: Array<number>;
+        sentinelIndex: number;
+    }>;
+}
+interface CompiledRoutes {
+    methods: Record<string, CompiledMethod>;
+}
 export interface RouteTree<Routes extends RouteMap = RouteMap> {
     [TypeId]: typeof TypeId;
     [RouteTreeRoutes]: Routes;
+    [CompiledRoutesKey]?: CompiledRoutes;
 }
 type PrefixKeys<T, Prefix extends string> = {
     [K in keyof T as K extends string ? `${Prefix}${K}` : never]: T[K];
@@ -41,18 +56,18 @@ type PrependLayers<T extends RouteMap, L extends Route.Route.Tuple> = {
     [K in keyof T]: T[K] extends Route.Route.Tuple ? [...L, ...T[K]] : never;
 };
 type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
-export declare function make<const Routes extends InputRouteMap>(input: Routes): RouteTree<FlattenRouteMap<Routes>>;
 export type WalkDescriptor = {
     path: PathPattern.PathPattern;
     method: string;
 } & Route.RouteDescriptor.Any;
-export declare function walk(tree: RouteTree): Generator<RouteMount.MountedRoute>;
-export declare function merge(a: RouteTree, b: RouteTree): RouteTree;
-export declare function isRouteTree(input: unknown): input is RouteTree;
 export interface LookupResult {
     route: RouteMount.MountedRoute;
     params: Record<string, string>;
 }
+export declare function make<const Routes extends InputRouteMap>(input: Routes): RouteTree<FlattenRouteMap<Routes>>;
+export declare function walk(tree: RouteTree): Generator<RouteMount.MountedRoute>;
+export declare function merge(a: RouteTree, b: RouteTree): RouteTree;
+export declare function isRouteTree(input: unknown): input is RouteTree;
 export declare function lookup(tree: RouteTree, method: string, path: string): LookupResult | null;
 export {};
 //# sourceMappingURL=RouteTree.d.ts.map

package/dist/RouteTree.d.ts.map

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

package/dist/RouteTree.js

@@ -1,31 +1,9 @@
 import * as Predicate from "effect/Predicate";
-import * as PathPattern from "./_PathPattern.js";
 import * as Route from "./Route.js";
 const TypeId = "~effect-start/RouteTree";
 const RouteTreeRoutes = Symbol();
+const CompiledRoutesKey = Symbol();
 const LayerKey = "*";
-function routes(tree) {
-    return tree[RouteTreeRoutes];
-}
-// segment priority: static (0) < :param (1) < :param? (2) < :param+ (3) < :param* (4)
-function sortScore(path) {
-    const segments = path.split("/");
-    const greedyIdx = segments.findIndex((s) => s.endsWith("*") || s.endsWith("+"));
-    const maxPriority = Math.max(...segments.map((s) => !s.startsWith(":") ? 0 : s.endsWith("*") ? 4 : s.endsWith("+") ? 3 : s.endsWith("?") ? 2 : 1), 0);
-    return greedyIdx === -1
-        ? // non-greedy: sort by depth, then by max segment priority
-            (segments.length << 16) + (maxPriority << 8)
-        : // greedy: sort after non-greedy, by greedy position (later = first), then priority
-            (1 << 24) + ((16 - greedyIdx) << 16) + (maxPriority << 8);
-}
-function sortRoutes(input) {
-    const keys = Object.keys(input).sort((a, b) => sortScore(a) - sortScore(b) || a.localeCompare(b));
-    const sorted = {};
-    for (const key of keys) {
-        sorted[key] = input[key];
-    }
-    return sorted;
-}
 export function make(input) {
     const layerRoutes = [...(input[LayerKey] ?? [])];
     const merged = {};
@@ -45,20 +23,12 @@ export function make(input) {
         }
     }
     flatten(input, "", layerRoutes);
+    const sorted = sortRoutes(merged);
     return {
         [TypeId]: TypeId,
-        [RouteTreeRoutes]: sortRoutes(merged),
+        [RouteTreeRoutes]: sorted,
     };
 }
-function* flattenRoutes(path, routes) {
-    for (const route of routes) {
-        const descriptor = {
-            ...route[Route.RouteDescriptor],
-            path,
-        };
-        yield Route.make(route.handler, descriptor);
-    }
-}
 export function* walk(tree) {
     const _routes = routes(tree);
     for (const path of Object.keys(_routes)) {
@@ -71,23 +41,185 @@ export function merge(a, b) {
         const key = path;
         combined[key] = combined[key] ? [...combined[key], ...items] : items;
     }
+    const sorted = sortRoutes(combined);
     return {
         [TypeId]: TypeId,
-        [RouteTreeRoutes]: sortRoutes(combined),
+        [RouteTreeRoutes]: sorted,
     };
 }
 export function isRouteTree(input) {
     return Predicate.hasProperty(input, TypeId);
 }
 export function lookup(tree, method, path) {
-    for (const route of walk(tree)) {
-        const descriptor = Route.descriptor(route);
-        if (descriptor.method !== "*" && descriptor.method !== method)
+    tree[CompiledRoutesKey] ??= compileRoutes(routes(tree));
+    const { methods } = tree[CompiledRoutesKey];
+    const wildcard = methods["*"];
+    if (wildcard) {
+        const result = execCompiled(wildcard, path);
+        if (result)
+            return result;
+    }
+    const specific = methods[method];
+    if (specific) {
+        const result = execCompiled(specific, path);
+        if (result)
+            return result;
+    }
+    return null;
+}
+function routes(tree) {
+    return tree[RouteTreeRoutes];
+}
+// segment priority: static (0) < :param (1) < :param? (2) < :param+ (3) < :param* (4)
+function sortScore(path) {
+    const segments = path.split("/");
+    const greedyIdx = segments.findIndex((s) => s.endsWith("*") || s.endsWith("+"));
+    const maxPriority = Math.max(...segments.map((s) => !s.startsWith(":") ? 0 : s.endsWith("*") ? 4 : s.endsWith("+") ? 3 : s.endsWith("?") ? 2 : 1), 0);
+    return greedyIdx === -1
+        ? // non-greedy: sort by depth, then by max segment priority
+            (segments.length << 16) + (maxPriority << 8)
+        : // greedy: sort after non-greedy, by greedy position (later = first), then priority
+            (1 << 24) + ((16 - greedyIdx) << 16) + (maxPriority << 8);
+}
+function sortRoutes(input) {
+    const keys = Object.keys(input).sort((a, b) => sortScore(a) - sortScore(b) || a.localeCompare(b));
+    const sorted = {};
+    for (const key of keys) {
+        sorted[key] = input[key];
+    }
+    return sorted;
+}
+function* flattenRoutes(path, routes) {
+    for (const route of routes) {
+        const descriptor = {
+            ...route[Route.RouteDescriptor],
+            path,
+        };
+        yield Route.make(route.handler, descriptor);
+    }
+}
+function escapeRegex(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function patternToRegex(pattern) {
+    const segments = pattern.split("/").filter(Boolean);
+    const paramNames = [];
+    let fragment = "";
+    let groupCount = 0;
+    for (let i = 0; i < segments.length; i++) {
+        const seg = segments[i];
+        if (seg.startsWith(":")) {
+            const last = seg[seg.length - 1];
+            if (last === "+") {
+                const name = seg.slice(1, -1);
+                paramNames.push(name);
+                fragment += "\\/(.+)";
+                groupCount++;
+            }
+            else if (last === "*") {
+                const name = seg.slice(1, -1);
+                paramNames.push(name);
+                fragment += "(?:\\/(.+))?";
+                groupCount++;
+            }
+            else if (last === "?") {
+                const name = seg.slice(1, -1);
+                paramNames.push(name);
+                fragment += "(?:\\/([^\\/]+))?";
+                groupCount++;
+            }
+            else {
+                const name = seg.slice(1);
+                paramNames.push(name);
+                fragment += "\\/([^\\/]+)";
+                groupCount++;
+            }
+        }
+        else {
+            fragment += "\\/" + escapeRegex(seg);
+        }
+    }
+    return { fragment, paramNames, groupCount };
+}
+function compileRoutes(sortedRoutes) {
+    const methodGroups = {};
+    for (const path of Object.keys(sortedRoutes)) {
+        for (const routeData of sortedRoutes[path]) {
+            const descriptor = {
+                ...routeData[Route.RouteDescriptor],
+                path,
+            };
+            const mounted = Route.make(routeData.handler, descriptor);
+            const method = descriptor.method;
+            if (!methodGroups[method])
+                methodGroups[method] = [];
+            methodGroups[method].push({ path, route: mounted });
+        }
+    }
+    const pathRoutesByMethod = {};
+    for (const method of Object.keys(methodGroups)) {
+        const map = new Map();
+        for (const { path, route } of methodGroups[method]) {
+            let entry = map.get(path);
+            if (!entry) {
+                entry = { path, routes: [] };
+                map.set(path, entry);
+            }
+            entry.routes.push(route);
+        }
+        pathRoutesByMethod[method] = map;
+    }
+    const methods = {};
+    for (const method of Object.keys(pathRoutesByMethod)) {
+        const pathMap = pathRoutesByMethod[method];
+        const sortedPaths = Object.keys(sortedRoutes);
+        const orderedPaths = sortedPaths.filter((p) => pathMap.has(p));
+        const branches = [];
+        const table = [];
+        let groupOffset = 1;
+        for (const path of orderedPaths) {
+            const entry = pathMap.get(path);
+            const { fragment, paramNames, groupCount } = patternToRegex(path);
+            const paramGroupIndices = [];
+            for (let i = 0; i < groupCount; i++) {
+                paramGroupIndices.push(groupOffset + i);
+            }
+            const sentinelIndex = groupOffset + groupCount;
+            branches.push(fragment + "()");
+            groupOffset += groupCount + 1;
+            table.push({
+                path: entry.path,
+                routes: entry.routes,
+                paramNames,
+                paramGroupIndices,
+                sentinelIndex,
+            });
+        }
+        if (branches.length === 0)
             continue;
-        const params = PathPattern.match(descriptor.path, path);
-        if (params !== null) {
-            return { route, params };
+        const pattern = "^(?:" + branches.join("|") + ")\\/*$";
+        methods[method] = {
+            regex: new RegExp(pattern),
+            table,
+        };
+    }
+    return { methods };
+}
+function execCompiled(compiled, path) {
+    const match = compiled.regex.exec(path);
+    if (!match)
+        return null;
+    for (const entry of compiled.table) {
+        if (match[entry.sentinelIndex] === undefined)
+            continue;
+        const params = {};
+        for (let i = 0; i < entry.paramNames.length; i++) {
+            const val = match[entry.paramGroupIndices[i]];
+            if (val !== undefined) {
+                params[entry.paramNames[i]] = val;
+            }
         }
+        return { route: entry.routes[0], params };
     }
     return null;
 }

package/dist/RouteTree.js.map

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

package/dist/StaticFiles.d.ts

@@ -0,0 +1,23 @@
+import * as Layer from "effect/Layer";
+import * as FileSystem from "./FileSystem.ts";
+import * as Route from "./Route.ts";
+import * as System from "./System.ts";
+export declare const make: (directory: string) => import("./RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+    method: "GET";
+}, {
+    pathParams: {
+        readonly path?: string | undefined;
+    };
+}, unknown, import("effect/ParseResult").ParseError, never>, Route.Route.Route<{
+    method: "GET";
+    format: "*";
+}, {
+    pathParams: {
+        readonly path?: string | undefined;
+    };
+}, Uint8Array<ArrayBufferLike>, System.SystemError, FileSystem.FileSystem>]>;
+export declare const layer: (options: {
+    directory: string;
+    path?: string;
+}) => Layer.Layer<Route.Routes, never, never>;
+//# sourceMappingURL=StaticFiles.d.ts.map

package/dist/StaticFiles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StaticFiles.d.ts","sourceRoot":"","sources":["../src/StaticFiles.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAG7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAGnC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AASrC,eAAO,MAAM,IAAI,GAAI,WAAW,MAAM;;;;;;;;;;;;;4EAmCnC,CAAA;AAEH,eAAO,MAAM,KAAK,GAAI,SAAS;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,4CAmBE,CAAA"}

package/dist/StaticFiles.js

@@ -0,0 +1,74 @@
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Entity from "./Entity.js";
+import * as FileSystem from "./FileSystem.js";
+import * as Mime from "./_Mime.js";
+import * as Route from "./Route.js";
+import * as RouteSchema from "./RouteSchema.js";
+import * as RouteTree from "./RouteTree.js";
+const defaultMountPath = "/assets";
+const PathParamsSchema = Schema.Struct({
+    path: Schema.optional(Schema.String),
+});
+const emptyNotFound = Entity.make(new Uint8Array(0), { status: 404 });
+export const make = (directory) => Route.get(RouteSchema.schemaPathParams(PathParamsSchema), Route.render(function* (ctx) {
+    const fs = yield* FileSystem.FileSystem;
+    const relativePath = typeof ctx.pathParams.path === "string" ? normalizeRelativePath(ctx.pathParams.path) : null;
+    if (!relativePath) {
+        return emptyNotFound;
+    }
+    const absolutePath = `${directory.replace(/[\\/]+$/, "")}/${relativePath}`;
+    const info = yield* fs.stat(absolutePath).pipe(Effect.catchAll((error) => isNotFound(error) ? Effect.succeed(null) : Effect.fail(error)));
+    if (info === null || info.type !== "File") {
+        return emptyNotFound;
+    }
+    const headers = {
+        "content-length": String(info.size),
+        "content-type": Mime.fromPath(relativePath),
+    };
+    if (Option.isSome(info.mtime)) {
+        headers["last-modified"] = info.mtime.value.toUTCString();
+    }
+    const bytes = yield* fs.readFile(absolutePath);
+    return Entity.make(bytes, { headers });
+}));
+export const layer = (options) => Layer.effect(Route.Routes, Effect.gen(function* () {
+    const existing = yield* Effect.serviceOption(Route.Routes).pipe(Effect.andThen(Option.getOrUndefined));
+    const trimmedMountPath = (options.path ?? defaultMountPath).trim().replace(/^\/+|\/+$/g, "");
+    const mountPattern = (trimmedMountPath.length > 0 ? `/${trimmedMountPath}/:path+` : "/:path+");
+    const staticFilesTree = Route.tree({
+        [mountPattern]: make(options.directory),
+    });
+    if (!existing) {
+        return staticFilesTree;
+    }
+    return RouteTree.merge(existing, staticFilesTree);
+}));
+function normalizeRelativePath(path) {
+    if (path.length === 0 || path.startsWith("/") || path.startsWith("\\")) {
+        return null;
+    }
+    const segments = path.split(/[\\/]+/);
+    const normalized = [];
+    for (const segment of segments) {
+        if (segment === "" || segment === ".") {
+            continue;
+        }
+        if (segment === ".." || segment.includes("\0")) {
+            return null;
+        }
+        normalized.push(segment);
+    }
+    return normalized.length > 0 ? normalized.join("/") : null;
+}
+function isNotFound(error) {
+    return (typeof error === "object" &&
+        error !== null &&
+        "_tag" in error &&
+        error._tag === "SystemError" &&
+        "reason" in error &&
+        error.reason === "NotFound");
+}
+//# sourceMappingURL=StaticFiles.js.map

package/dist/StaticFiles.js.map

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

package/dist/_Mime.d.ts

@@ -0,0 +1,2 @@
+export declare function fromPath(path: string): string;
+//# sourceMappingURL=_Mime.d.ts.map

package/dist/_Mime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_Mime.d.ts","sourceRoot":"","sources":["../src/_Mime.ts"],"names":[],"mappings":"AA2BA,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK7C"}

package/dist/_Mime.js

@@ -0,0 +1,33 @@
+const mediaTypes = {
+    ".avif": "image/avif",
+    ".bmp": "image/bmp",
+    ".css": "text/css",
+    ".csv": "text/csv",
+    ".gif": "image/gif",
+    ".html": "text/html",
+    ".ico": "image/x-icon",
+    ".js": "text/javascript",
+    ".jpeg": "image/jpeg",
+    ".jpg": "image/jpeg",
+    ".json": "application/json",
+    ".map": "application/json",
+    ".md": "text/markdown",
+    ".mjs": "text/javascript",
+    ".pdf": "application/pdf",
+    ".png": "image/png",
+    ".svg": "image/svg+xml",
+    ".txt": "text/plain",
+    ".wasm": "application/wasm",
+    ".webm": "video/webm",
+    ".webp": "image/webp",
+    ".woff": "font/woff",
+    ".woff2": "font/woff2",
+    ".xml": "application/xml",
+};
+export function fromPath(path) {
+    const dotIndex = path.lastIndexOf(".");
+    const extension = dotIndex === -1 ? "" : path.slice(dotIndex).toLowerCase();
+    const mediaType = mediaTypes[extension] ?? "application/octet-stream";
+    return mediaType.startsWith("text/") ? `${mediaType}; charset=utf-8` : mediaType;
+}
+//# sourceMappingURL=_Mime.js.map

package/dist/_Mime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_Mime.js","sourceRoot":"","sources":["../src/_Mime.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAA2B;IACzC,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,WAAW;IACnB,OAAO,EAAE,WAAW;IACpB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,iBAAiB;IACxB,OAAO,EAAE,YAAY;IACrB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,kBAAkB;IAC3B,MAAM,EAAE,kBAAkB;IAC1B,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,WAAW;IACpB,QAAQ,EAAE,YAAY;IACtB,MAAM,EAAE,iBAAiB;CAC1B,CAAA;AAED,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACtC,MAAM,SAAS,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAA;IAC3E,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,0BAA0B,CAAA;IACrE,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAA;AAClF,CAAC"}

package/dist/_PathPattern.js

@@ -122,21 +122,21 @@ export function match(pattern, path) {
                 if (remaining.length === 0) {
                     return null;
                 }
-                params[name] = remaining.join("/");
+                params[name] = remaining.map(decodeURIComponent).join("/");
                 return params;
             }
             if (rest.endsWith("*")) {
                 const name = rest.slice(0, -1);
                 const remaining = pathSegments.slice(pathIndex);
                 if (remaining.length > 0) {
-                    params[name] = remaining.join("/");
+                    params[name] = remaining.map(decodeURIComponent).join("/");
                 }
                 return params;
             }
             if (rest.endsWith("?")) {
                 const name = rest.slice(0, -1);
                 if (pathIndex < pathSegments.length) {
-                    params[name] = pathSegments[pathIndex];
+                    params[name] = decodeURIComponent(pathSegments[pathIndex]);
                     pathIndex++;
                 }
                 patternIndex++;
@@ -145,7 +145,7 @@ export function match(pattern, path) {
             if (pathIndex >= pathSegments.length) {
                 return null;
             }
-            params[rest] = pathSegments[pathIndex];
+            params[rest] = decodeURIComponent(pathSegments[pathIndex]);
             pathIndex++;
             patternIndex++;
             continue;