effect-start 0.19.0 → 0.20.1

package/README.md

@@ -21,8 +21,8 @@ import {
 
 export default Start.layer(
   FileRouter.layer({
-    load: () => import("./routes/manifest.ts"),
-    path: import.meta.resolve("./routes/manifest.ts"),
+    load: () => import("./routes/routes.gen.ts"),
+    path: import.meta.resolve("./routes/routes.gen.ts"),
   }),
 )
 
@@ -46,7 +46,7 @@ src/routes
 │   ├── layer.tsx
 │   └── route.tsx
 ├── layer.tsx
-├── manifest.ts
+├── routes.gen.ts
 └── route.tsx
 ```
 

package/dist/Development.d.ts

@@ -1,10 +1,10 @@
+import * as FileSystem from "@effect/platform/FileSystem";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as PubSub from "effect/PubSub";
 import * as Stream from "effect/Stream";
-import * as Error from "./node/PlatformError.ts";
-import * as FileSystem from "@effect/platform/FileSystem";
+import * as PlatformError from "./PlatformError.ts";
 export type DevelopmentEvent = FileSystem.WatchEvent | {
     readonly _tag: "Reload";
 };
@@ -22,7 +22,7 @@ export declare const watchSource: (opts?: {
     path?: string;
     recursive?: boolean;
     filter?: (event: FileSystem.WatchEvent) => boolean;
-}) => Stream.Stream<FileSystem.WatchEvent, Error.PlatformError, FileSystem.FileSystem>;
+}) => Stream.Stream<FileSystem.WatchEvent, PlatformError.PlatformError, FileSystem.FileSystem>;
 export declare const watch: (opts?: {
     path?: string;
     recursive?: boolean;

package/dist/Development.js

@@ -1,3 +1,4 @@
+import * as FileSystem from "@effect/platform/FileSystem";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
@@ -6,7 +7,6 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as PubSub from "effect/PubSub";
 import * as Stream from "effect/Stream";
-import * as FileSystem from "@effect/platform/FileSystem";
 const devState = GlobalValue.globalValue(Symbol.for("effect-start/Development"), () => ({
     count: 0,
     pubsub: null,
@@ -35,7 +35,8 @@ export const watchSource = (opts) => {
         strategy: "enforce",
     }));
 };
-export const watch = (opts) => Effect.gen(function* () {
+export const watch = (opts) => Effect
+    .gen(function* () {
     devState.count++;
     if (devState.count === 1) {
         const pubsub = yield* PubSub.unbounded();

package/dist/Effectify.d.ts

@@ -0,0 +1,212 @@
+import * as Effect from "effect/Effect";
+interface Callback<E, A> {
+    (err: E, a?: A): void;
+}
+type ArgsWithCallback<Args extends Array<any>, E, A> = [
+    ...args: Args,
+    cb: Callback<E, A>
+];
+type WithoutNull<A> = unknown extends A ? void : Exclude<A, null | undefined>;
+type Effectify<T, E> = T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+    (...args: ArgsWithCallback<infer Args6, infer _E6, infer A6>): infer _R6;
+    (...args: ArgsWithCallback<infer Args7, infer _E7, infer A7>): infer _R7;
+    (...args: ArgsWithCallback<infer Args8, infer _E8, infer A8>): infer _R8;
+    (...args: ArgsWithCallback<infer Args9, infer _E9, infer A9>): infer _R9;
+    (...args: ArgsWithCallback<infer Args10, infer _E10, infer A10>): infer _R10;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+    (...args: Args6): Effect.Effect<WithoutNull<A6>, E>;
+    (...args: Args7): Effect.Effect<WithoutNull<A7>, E>;
+    (...args: Args8): Effect.Effect<WithoutNull<A8>, E>;
+    (...args: Args9): Effect.Effect<WithoutNull<A9>, E>;
+    (...args: Args10): Effect.Effect<WithoutNull<A10>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+    (...args: ArgsWithCallback<infer Args6, infer _E6, infer A6>): infer _R6;
+    (...args: ArgsWithCallback<infer Args7, infer _E7, infer A7>): infer _R7;
+    (...args: ArgsWithCallback<infer Args8, infer _E8, infer A8>): infer _R8;
+    (...args: ArgsWithCallback<infer Args9, infer _E9, infer A9>): infer _R9;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+    (...args: Args6): Effect.Effect<WithoutNull<A6>, E>;
+    (...args: Args7): Effect.Effect<WithoutNull<A7>, E>;
+    (...args: Args8): Effect.Effect<WithoutNull<A8>, E>;
+    (...args: Args9): Effect.Effect<WithoutNull<A9>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+    (...args: ArgsWithCallback<infer Args6, infer _E6, infer A6>): infer _R6;
+    (...args: ArgsWithCallback<infer Args7, infer _E7, infer A7>): infer _R7;
+    (...args: ArgsWithCallback<infer Args8, infer _E8, infer A8>): infer _R8;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+    (...args: Args6): Effect.Effect<WithoutNull<A6>, E>;
+    (...args: Args7): Effect.Effect<WithoutNull<A7>, E>;
+    (...args: Args8): Effect.Effect<WithoutNull<A8>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+    (...args: ArgsWithCallback<infer Args6, infer _E6, infer A6>): infer _R6;
+    (...args: ArgsWithCallback<infer Args7, infer _E7, infer A7>): infer _R7;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+    (...args: Args6): Effect.Effect<WithoutNull<A6>, E>;
+    (...args: Args7): Effect.Effect<WithoutNull<A7>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+    (...args: ArgsWithCallback<infer Args6, infer _E6, infer A6>): infer _R6;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+    (...args: Args6): Effect.Effect<WithoutNull<A6>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+    (...args: ArgsWithCallback<infer Args5, infer _E5, infer A5>): infer _R5;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+    (...args: Args5): Effect.Effect<WithoutNull<A5>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+    (...args: ArgsWithCallback<infer Args4, infer _E4, infer A4>): infer _R4;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+    (...args: Args4): Effect.Effect<WithoutNull<A4>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+    (...args: ArgsWithCallback<infer Args3, infer _E3, infer A3>): infer _R3;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+    (...args: Args3): Effect.Effect<WithoutNull<A3>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+    (...args: ArgsWithCallback<infer Args2, infer _E2, infer A2>): infer _R2;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+    (...args: Args2): Effect.Effect<WithoutNull<A2>, E>;
+} : T extends {
+    (...args: ArgsWithCallback<infer Args1, infer _E1, infer A1>): infer _R1;
+} ? {
+    (...args: Args1): Effect.Effect<WithoutNull<A1>, E>;
+} : never;
+type EffectifyError<T> = T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+    (...args: ArgsWithCallback<infer _Args6, infer E6, infer _A6>): infer _R6;
+    (...args: ArgsWithCallback<infer _Args7, infer E7, infer _A7>): infer _R7;
+    (...args: ArgsWithCallback<infer _Args8, infer E8, infer _A8>): infer _R8;
+    (...args: ArgsWithCallback<infer _Args9, infer E9, infer _A9>): infer _R9;
+    (...args: ArgsWithCallback<infer _Args10, infer E10, infer _A10>): infer _R10;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5 | E6 | E7 | E8 | E9 | E10> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+    (...args: ArgsWithCallback<infer _Args6, infer E6, infer _A6>): infer _R6;
+    (...args: ArgsWithCallback<infer _Args7, infer E7, infer _A7>): infer _R7;
+    (...args: ArgsWithCallback<infer _Args8, infer E8, infer _A8>): infer _R8;
+    (...args: ArgsWithCallback<infer _Args9, infer E9, infer _A9>): infer _R9;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5 | E6 | E7 | E8 | E9> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+    (...args: ArgsWithCallback<infer _Args6, infer E6, infer _A6>): infer _R6;
+    (...args: ArgsWithCallback<infer _Args7, infer E7, infer _A7>): infer _R7;
+    (...args: ArgsWithCallback<infer _Args8, infer E8, infer _A8>): infer _R8;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5 | E6 | E7 | E8> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+    (...args: ArgsWithCallback<infer _Args6, infer E6, infer _A6>): infer _R6;
+    (...args: ArgsWithCallback<infer _Args7, infer E7, infer _A7>): infer _R7;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5 | E6 | E7> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+    (...args: ArgsWithCallback<infer _Args6, infer E6, infer _A6>): infer _R6;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5 | E6> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+    (...args: ArgsWithCallback<infer _Args5, infer E5, infer _A5>): infer _R5;
+} ? NonNullable<E1 | E2 | E3 | E4 | E5> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+    (...args: ArgsWithCallback<infer _Args4, infer E4, infer _A4>): infer _R4;
+} ? NonNullable<E1 | E2 | E3 | E4> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+    (...args: ArgsWithCallback<infer _Args3, infer E3, infer _A3>): infer _R3;
+} ? NonNullable<E1 | E2 | E3> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+    (...args: ArgsWithCallback<infer _Args2, infer E2, infer _A2>): infer _R2;
+} ? NonNullable<E1 | E2> : T extends {
+    (...args: ArgsWithCallback<infer _Args1, infer E1, infer _A1>): infer _R1;
+} ? NonNullable<E1> : never;
+export declare const effectify: {
+    <F extends (...args: Array<any>) => any>(fn: F): Effectify<F, EffectifyError<F>>;
+    <F extends (...args: Array<any>) => any, E>(fn: F, onError: (error: EffectifyError<F>, args: Parameters<F>) => E): Effectify<F, E>;
+    <F extends (...args: Array<any>) => any, E, E2>(fn: F, onError: (error: EffectifyError<F>, args: Parameters<F>) => E, onSyncError: (error: unknown, args: Parameters<F>) => E2): Effectify<F, E | E2>;
+};
+export {};

package/dist/Effectify.js

@@ -0,0 +1,19 @@
+/*
+ * Adapted from @effect/platform
+ */
+import * as Effect from "effect/Effect";
+export const effectify = ((fn, onError, onSyncError) => (...args) => Effect.async((resume) => {
+    try {
+        fn(...args, (err, result) => {
+            if (err) {
+                resume(Effect.fail(onError ? onError(err, args) : err));
+            }
+            else {
+                resume(Effect.succeed(result));
+            }
+        });
+    }
+    catch (err) {
+        resume(onSyncError ? Effect.fail(onSyncError(err, args)) : Effect.die(err));
+    }
+}));

package/dist/FilePathPattern.d.ts

@@ -0,0 +1,29 @@
+import * as Either from "effect/Either";
+import type * as PathPattern from "./PathPattern.ts";
+export type FilePathPattern = string;
+export type Segment = {
+    _tag: "GroupSegment";
+    name: string;
+} | {
+    _tag: "RestSegment";
+    name: string;
+} | {
+    _tag: "ParamSegment";
+    name: string;
+} | {
+    _tag: "LiteralSegment";
+    value: string;
+} | {
+    _tag: "InvalidSegment";
+    value: string;
+};
+export declare function segments(pattern: string): Segment[];
+export type ValidationError = {
+    _tag: "FilePathPatternError";
+    pattern: string;
+    message: string;
+};
+export type ValidationResult = Either.Either<Segment[], ValidationError>;
+export declare function validate(pattern: string): ValidationResult;
+export declare function format(segs: Segment[]): `/${string}`;
+export declare function toPathPattern(pattern: string): Either.Either<PathPattern.PathPattern, ValidationError>;

package/dist/FilePathPattern.js

@@ -0,0 +1,86 @@
+import * as Either from "effect/Either";
+export function segments(pattern) {
+    const parts = pattern.split("/").filter(Boolean);
+    const result = [];
+    for (const part of parts) {
+        if (/^\(\w+\)$/.test(part)) {
+            result.push({ _tag: "GroupSegment", name: part.slice(1, -1) });
+        }
+        else if (part.startsWith("[[") && part.endsWith("]]")) {
+            result.push({ _tag: "RestSegment", name: part.slice(2, -2) });
+        }
+        else if (part.startsWith("[") && part.endsWith("]")) {
+            result.push({ _tag: "ParamSegment", name: part.slice(1, -1) });
+        }
+        else if (/^[\p{L}\p{N}._~-]+$/u.test(part)) {
+            result.push({ _tag: "LiteralSegment", value: part });
+        }
+        else {
+            result.push({ _tag: "InvalidSegment", value: part });
+        }
+    }
+    return result;
+}
+export function validate(pattern) {
+    const segs = segments(pattern);
+    const invalid = segs.find((s) => s._tag === "InvalidSegment");
+    if (invalid) {
+        return Either.left({
+            _tag: "FilePathPatternError",
+            pattern,
+            message: `Invalid segment: "${invalid.value}"`,
+        });
+    }
+    const restIndex = segs.findIndex((s) => s._tag === "RestSegment");
+    if (restIndex !== -1 && restIndex !== segs.length - 1) {
+        return Either.left({
+            _tag: "FilePathPatternError",
+            pattern,
+            message: "Rest segment must be the last segment",
+        });
+    }
+    return Either.right(segs);
+}
+export function format(segs) {
+    const parts = segs.map((seg) => {
+        switch (seg._tag) {
+            case "GroupSegment":
+                return `(${seg.name})`;
+            case "RestSegment":
+                return `[[${seg.name}]]`;
+            case "ParamSegment":
+                return `[${seg.name}]`;
+            case "LiteralSegment":
+                return seg.value;
+            case "InvalidSegment":
+                return seg.value;
+        }
+    });
+    const joined = parts.join("/");
+    return (joined ? `/${joined}` : "/");
+}
+export function toPathPattern(pattern) {
+    const result = validate(pattern);
+    if (Either.isLeft(result)) {
+        return Either.left(result.left);
+    }
+    const segs = result.right;
+    const pathParts = [];
+    for (const seg of segs) {
+        switch (seg._tag) {
+            case "GroupSegment":
+                continue;
+            case "RestSegment":
+                pathParts.push(`:${seg.name}*`);
+                break;
+            case "ParamSegment":
+                pathParts.push(`:${seg.name}`);
+                break;
+            case "LiteralSegment":
+                pathParts.push(seg.value);
+                break;
+        }
+    }
+    const joined = pathParts.join("/");
+    return Either.right((joined ? `/${joined}` : "/"));
+}

package/dist/FileRouter.d.ts

@@ -1,61 +1,59 @@
-import type { PlatformError } from "@effect/platform/Error";
 import * as FileSystem from "@effect/platform/FileSystem";
-import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as FileRouterPattern from "./FileRouterPattern.ts";
+import * as FilePathPattern from "./FilePathPattern.ts";
+import type * as PathPattern from "./PathPattern.ts";
+import type * as PlatformError from "./PlatformError.ts";
+import * as Route from "./Route.ts";
+import * as RouteTree from "./RouteTree.ts";
+declare const FileRouterError_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 & {
+    readonly _tag: "FileRouterError";
+} & Readonly<A>;
+export declare class FileRouterError extends FileRouterError_base<{
+    reason: "Import" | "Conflict" | "FileSystem";
+    cause?: unknown;
+    path?: string;
+}> {
+}
 export type RouteModule = {
-    default: RouteSet.RouteSet.Default;
-};
-export type LazyRoute = {
-    path: `/${string}`;
-    load: () => Promise<RouteModule>;
-    layers?: ReadonlyArray<() => Promise<unknown>>;
+    default: Route.RouteSet.Any;
 };
-type Manifest = {
-    routes: readonly LazyRoute[];
+export type LazyRouteModule = () => Promise<RouteModule>;
+export type FileRoutes = {
+    [path: PathPattern.PathPattern]: [
+        LazyRouteModule,
+        ...LazyRouteModule[]
+    ];
 };
-declare const FileRouter_base: Context.TagClass<FileRouter, "effect-start/FileRouter", Manifest>;
-export declare class FileRouter extends FileRouter_base {
-}
-export type GroupSegment<Name extends string = string> = FileRouterPattern.GroupSegment<Name>;
-export type Segment = FileRouterPattern.Segment;
-export type RouteHandle = {
+export type Segment = FilePathPattern.Segment;
+export type FileRoute = {
     handle: "route" | "layer";
-    modulePath: string;
+    modulePath: `/${string}`;
     routePath: `/${string}`;
     segments: Segment[];
 };
 /**
- * Routes are sorted by depth, layers are first,
- * rest parameters are put at the end for each segment.
+ * Routes sorted by depth, with rest parameters at the end.
  * - layer.tsx
  * - users/route.tsx
  * - users/[userId]/route.tsx
- * - [[...rest]]/route.tsx
+ * - [[rest]]/route.tsx
  */
-export type OrderedRouteHandles = RouteHandle[];
-export declare const parse: typeof FileRouterPattern.parse;
-export declare const formatSegment: typeof FileRouterPattern.formatSegment;
-export declare const format: typeof FileRouterPattern.format;
-export declare function parseRoute(path: string): RouteHandle;
+export type OrderedFileRoutes = FileRoute[];
+export declare function parseRoute(path: string): FileRoute | null;
 /**
- * Generates a manifest file that references all routes.
+ * Generates a tree file that references all routes.
  */
+export declare function layer(load: () => Promise<{
+    default: FileRoutes;
+}>): Layer.Layer<Route.Routes, FileRouterError, FileSystem.FileSystem>;
 export declare function layer(options: {
-    load: () => Promise<Manifest>;
+    load: () => Promise<{
+        default: FileRoutes;
+    }>;
     path: string;
-}): Layer.Layer<FileRouter, PlatformError, FileSystem.FileSystem>;
-export declare function fromManifest(manifest: Manifest): Effect.Effect<Router.Router.Any>;
-export declare function walkRoutesDirectory(dir: string): Effect.Effect<OrderedRouteHandles, PlatformError, FileSystem.FileSystem>;
-/**
- * Given a list of paths, return a list of route handles.
- */
-export declare function getRouteHandlesFromPaths(paths: string[]): OrderedRouteHandles;
-type RouteTree = {
-    path: `/${string}`;
-    handles: RouteHandle[];
-    children?: RouteTree[];
-};
-export declare function treeFromRouteHandles(handles: RouteHandle[]): RouteTree;
+}): Layer.Layer<Route.Routes, FileRouterError, FileSystem.FileSystem>;
+export declare function fromFileRoutes(fileRoutes: FileRoutes): Effect.Effect<RouteTree.RouteTree>;
+export declare function walkRoutesDirectory(dir: string): Effect.Effect<OrderedFileRoutes, PlatformError.PlatformError | FileRouterError, FileSystem.FileSystem>;
+export declare function getFileRoutes(paths: string[]): Effect.Effect<OrderedFileRoutes, FileRouterError>;
 export {};