@typed/router 0.32.0 → 1.0.0-beta.0

package/dist/Route.js

@@ -0,0 +1,151 @@
+/* eslint-disable no-restricted-syntax */
+import * as Effect from "effect/Effect";
+import { pipeArguments } from "effect/Pipeable";
+import { singleton } from "effect/Record";
+import * as Schema from "effect/Schema";
+import * as Parser from "effect/SchemaParser";
+import * as Transformation from "effect/SchemaTransformation";
+import * as AST from "./AST.js";
+import * as Path from "./Path.js";
+export function make(ast) {
+    const getParts = once(() => getPathAst(ast));
+    const path = once(() => Path.join(getParts()));
+    const paramsSchema = once(() => getParamsSchema(ast));
+    const pathSchema = once(() => getPathSchema(ast));
+    const querySchema = once(() => getQuerySchema(ast));
+    return {
+        ast,
+        get path() {
+            return path();
+        },
+        get paramsSchema() {
+            return paramsSchema();
+        },
+        get pathSchema() {
+            return pathSchema();
+        },
+        get querySchema() {
+            return querySchema();
+        },
+        pipe() {
+            return pipeArguments(this, arguments);
+        },
+    };
+}
+function once(fn) {
+    let memoized = [];
+    return () => {
+        if (memoized.length === 1) {
+            return memoized[0];
+        }
+        const result = fn();
+        memoized = [result];
+        return result;
+    };
+}
+function getPathAst(ast) {
+    switch (ast.type) {
+        case "path":
+            return [ast.path];
+        case "transform":
+            return getPathAst(ast.from);
+        case "join": {
+            const result = [];
+            for (let i = 0; i < ast.parts.length; i++) {
+                if (i > 0) {
+                    result.push(AST.slash());
+                }
+                result.push(...getPathAst(ast.parts[i]));
+            }
+            return result;
+        }
+    }
+}
+function getParamsSchema(ast) {
+    switch (ast.type) {
+        case "path": {
+            const { paramsSchema } = Path.getSchemas(getPathAst(ast));
+            return paramsSchema;
+        }
+        case "transform": {
+            const { paramsSchema } = Path.getSchemas(getPathAst(ast.from));
+            return paramsSchema.pipe(Schema.decodeTo(ast.to, ast.transformation));
+        }
+        case "join": {
+            const parts = ast.parts.map((part) => Path.getSchemaFields(getPathAst(part)));
+            const requiredFields = [];
+            const optionalFields = [];
+            const queryParams = [];
+            for (const part of parts) {
+                requiredFields.push(...part.requiredFields);
+                optionalFields.push(...part.optionalFields);
+                queryParams.push(...part.queryParams);
+            }
+            const pathFields = Object.fromEntries(requiredFields);
+            const queryFields = Object.fromEntries(queryParams.map(([name, { optionalFields, requiredFields }]) => [
+                name,
+                Schema.StructWithRest(Schema.Struct(Object.fromEntries(requiredFields)), optionalFields.map(([key, value]) => Schema.Record(key, value))),
+            ]));
+            const paramsSchema = Schema.StructWithRest(Schema.Struct({ ...pathFields, ...queryFields }), optionalFields.map(([key, value]) => Schema.Record(key, value)));
+            return paramsSchema;
+        }
+    }
+}
+function getPathSchema(ast) {
+    if (ast.type !== "join")
+        return Path.getSchemas(getPathAst(ast)).pathSchema;
+    const parts = ast.parts.map((part) => Path.getSchemaFields(getPathAst(part)));
+    const requiredFields = [];
+    const optionalFields = [];
+    for (const part of parts) {
+        requiredFields.push(...part.requiredFields);
+        optionalFields.push(...part.optionalFields);
+    }
+    const pathFields = Object.fromEntries(requiredFields);
+    return Schema.StructWithRest(Schema.Struct(pathFields), optionalFields.map(([key, value]) => Schema.Record(key, value)));
+}
+function getQuerySchema(ast) {
+    if (ast.type !== "join")
+        return Path.getSchemas(getPathAst(ast)).querySchema;
+    const parts = ast.parts.map((part) => Path.getSchemaFields(getPathAst(part)));
+    const queryParams = [];
+    for (const part of parts) {
+        queryParams.push(...part.queryParams);
+    }
+    const queryFields = Object.fromEntries(queryParams.map(([name, { optionalFields, requiredFields }]) => [
+        name,
+        Schema.StructWithRest(Schema.Struct(Object.fromEntries(requiredFields)), optionalFields.map(([key, value]) => Schema.Record(key, value))),
+    ]));
+    return Schema.Struct(queryFields);
+}
+export const Parse = (path) => {
+    const asts = Path.parse(path);
+    if (asts.length === 0)
+        return Slash;
+    if (asts.length === 1)
+        return make(AST.path(asts[0]));
+    return Join(...asts.map((ast) => make(AST.path(ast))));
+};
+export const Slash = make(AST.path(AST.literal("")));
+export const Wildcard = make(AST.path(AST.wildcard()));
+export const Param = (paramName) => make(AST.path(AST.parameter(paramName)));
+export const ParamWithSchema = (paramName, schema) => {
+    const decode = Parser.decodeEffect(schema);
+    const encode = Parser.encodeEffect(schema);
+    return make(AST.transform(AST.path(AST.parameter(paramName)), Schema.Struct(singleton(paramName, schema.Type)), Transformation.transformOrFail({
+        decode: (input) => Effect.map(decode(input[paramName]), (decoded) => singleton(paramName, decoded)),
+        encode: (output) => Effect.map(encode(output[paramName]), (encoded) => singleton(paramName, encoded)),
+    })));
+};
+export const Number = (paramName) => ParamWithSchema(paramName, Schema.NumberFromString);
+export const Int = (paramName) => ParamWithSchema(paramName, Schema.NumberFromString.pipe(Schema.decodeTo(Schema.Int)));
+const removeSlash = (ast) => {
+    if (ast.type === "path" && ast.path.type === "slash")
+        return [];
+    return [ast];
+};
+export const Join = (...routes) => make(AST.join(routes.flatMap((route) => {
+    if (Array.isArray(route))
+        return route.flatMap(removeSlash);
+    return removeSlash(route.ast);
+})));

package/dist/Router.d.ts

@@ -0,0 +1,9 @@
+import * as Layer from "effect/Layer";
+import { type InitialMemoryOptions, type MemoryOptions } from "@typed/navigation/memory";
+import type { Navigation } from "@typed/navigation/Navigation";
+import { CurrentRoute } from "./CurrentRoute.js";
+export type Router = CurrentRoute | Navigation;
+export declare const BrowserRouter: (window?: Window) => Layer.Layer<Router>;
+export declare const ServerRouter: (options: MemoryOptions | InitialMemoryOptions) => Layer.Layer<Router>;
+export declare const TestRouter: (options: (MemoryOptions | InitialMemoryOptions) & {}) => Layer.Layer<Router>;
+//# sourceMappingURL=Router.d.ts.map

package/dist/Router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../src/Router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG,YAAY,GAAG,UAAU,CAAC;AAE/C,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAI/D,CAAC;AAEJ,eAAO,MAAM,YAAY,GAAI,SAAS,aAAa,GAAG,oBAAoB,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAI5F,CAAC;AAEJ,eAAO,MAAM,UAAU,GAAI,SAAS,CAAC,aAAa,GAAG,oBAAoB,CAAC,GAAG,EAAE,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAIjG,CAAC"}

package/dist/Router.js

@@ -0,0 +1,8 @@
+import * as Layer from "effect/Layer";
+import { fromWindow } from "@typed/navigation/fromWindow";
+import { initialMemory, memory, } from "@typed/navigation/memory";
+import { CurrentRoute } from "./CurrentRoute.js";
+import { Ids } from "@typed/id";
+export const BrowserRouter = (window) => CurrentRoute.Default.pipe(Layer.provideMerge(fromWindow(window)), Layer.provideMerge(Ids.Default));
+export const ServerRouter = (options) => CurrentRoute.Default.pipe(Layer.provideMerge("url" in options ? initialMemory(options) : memory(options)), Layer.provideMerge(Ids.Default));
+export const TestRouter = (options) => CurrentRoute.Default.pipe(Layer.provideMerge("url" in options ? initialMemory(options) : memory(options)), Layer.provideMerge(Ids.Test()));

package/dist/Uri.d.ts

@@ -0,0 +1,115 @@
+import type { Arg0, Call1W, Identity, Pipe, TypeLambda, TypeLambda1 } from "hkt-core";
+/**
+ * @since 1.0.0
+ */
+export type ParseUri<Input extends string, BaseUri extends string = never> = Pipe<Input, ParseUriLambda, [
+    BaseUri
+] extends [never] ? Identity : ApplyBaseUriLambda<ParseUri<BaseUri>>> extends infer R ? Uri<GetUriKey<R, "protocol">, GetUriKey<R, "username">, GetUriKey<R, "password">, GetUriKey<R, "hostname">, GetUriKey<R, "port">, GetUriKey<R, "pathname">, GetUriKey<R, "query">, GetUriKey<R, "hash">> : never;
+/**
+ * @since 1.0.0
+ */
+export interface Uri<Protocol extends string = string, Username extends string = "", Password extends string = "", Hostname extends string = string, Port extends number | "" = "", Pathname extends string = "/", Query extends string = "", Hash extends string = ""> {
+    readonly protocol: Protocol;
+    readonly username: Username;
+    readonly password: Password;
+    readonly hostname: Hostname;
+    readonly port: Port;
+    readonly pathname: Pathname;
+    readonly query: Query;
+    readonly hash: Hash;
+}
+/**
+ * @since 1.0.0
+ */
+export declare namespace Uri {
+    type Any = Uri<string, string, string, string, number | "", string, string, string>;
+}
+/**
+ * @since 1.0.0
+ */
+export type FormatUri<Uri extends Uri.Any, BaseUri extends string = never> = Call1W<FormatUrlLambda, [
+    BaseUri
+] extends [never] ? Uri : Call1W<ApplyBaseUriLambda<ParseUri<BaseUri>>, Uri>>;
+interface FormatUrlLambda extends TypeLambda1 {
+    readonly return: Arg0<this> extends infer Uri extends Uri.Any ? StringJoin<[
+        FormatProtocol<Uri["protocol"]>,
+        FormatAuthentication<Uri["username"], Uri["password"]>,
+        FormatHostname<Uri["hostname"]>,
+        FormatPort<Uri["port"]>,
+        FormatPathname<Uri["pathname"]>,
+        FormatQuery<Uri["query"]>,
+        FormatHash<Uri["hash"]>
+    ]> : never;
+}
+type IfNotEmpty<T, Then> = IsEmpty<T> extends 1 ? "" : Then;
+type FormatProtocol<Protocol extends string> = IfNotEmpty<Protocol, EnsureEndsWithDoubleSlash<EnsureEndsWithColon<Protocol>>>;
+type EnsureEndsWithColon<T extends string> = `${T extends `${infer Rest}:` ? Rest : T}:`;
+type EnsureEndsWithDoubleSlash<T extends string> = T extends `${infer Rest}//` ? Rest : T extends `${infer Rest}/` ? `${Rest}//` : `${T}//`;
+type FormatAuthentication<Username extends string, Password extends string> = {
+    0: `${Username}:${Password}@`;
+    1: "";
+}[IsEmpty<Username> & IsEmpty<Password>];
+type FormatHostname<Hostname extends string> = IfNotEmpty<Hostname, Hostname>;
+type FormatPort<Port extends number | ""> = IfNotEmpty<Port, EnsureStartsWithColon<`${Port}`>>;
+type EnsureStartsWithColon<T extends string> = T extends `:${infer _}` ? T : `:${T}`;
+type FormatPathname<Pathname extends string> = IfNotEmpty<Pathname, EnsureStartsWithSlash<`${Pathname}`>>;
+type EnsureStartsWithSlash<T extends string> = T extends `/${infer _}` ? T : `/${T}`;
+type FormatQuery<Query extends string> = IfNotEmpty<Query, EnsureStartsWithQuestionMark<`${Query}`>>;
+type EnsureStartsWithQuestionMark<T extends string> = T extends `?${infer _}` ? T : `?${T}`;
+type FormatHash<Hash extends string> = IfNotEmpty<Hash, EnsureStartsWithHash<`${Hash}`>>;
+type EnsureStartsWithHash<T extends string> = T extends `#${infer _}` ? T : `#${T}`;
+type IsEmpty<T> = [T] extends [""] ? 1 : [T] extends [never] ? 1 : 0;
+type GetUriKey<UriLike, Key extends keyof Uri> = Key extends keyof UriLike ? UriLike[Key] extends Uri.Any[Key] ? UriLike[Key] : Uri[Key] : Uri[Key];
+interface ParseUriLambda extends TypeLambda<[uri: string], Uri> {
+    return: Arg0<this> extends infer R ? Pipe<[
+        {},
+        R
+    ], UriParserReducerLambda<ParseHashLambda>, UriParserReducerLambda<ParseQueryLambda>, UriParserReducerLambda<ParseProtocolLambda>, UriParserReducerLambda<ParseAuthenticationLambda>, UriParserReducerLambda<ParsePathnamePortPathnameLambda>> extends readonly [infer Result, infer Remaining extends string] ? Remaining extends "" ? Result : `Failed to parse URI: ${Arg0<this>}` : never : never;
+}
+interface UriParserReducerLambda<F extends TypeLambda> extends TypeLambda {
+    return: Arg0<this> extends readonly [infer State, infer Input extends string] ? Pipe<Input, F> extends readonly [infer NextState, infer Remaining extends string] ? [NextState & State, Remaining] : never : never;
+}
+interface ParseProtocolLambda extends TypeLambda {
+    readonly return: Arg0<this> extends `${infer Protocol}//${infer Rest}` ? [{
+        readonly protocol: Protocol;
+    }, Rest] : [unknown, Arg0<this>];
+}
+interface ParseHashLambda extends TypeLambda {
+    readonly return: Arg0<this> extends `${infer Rest}#${infer Hash}` ? [{
+        readonly hash: Hash;
+    }, Rest] : [unknown, Arg0<this>];
+}
+interface ParseQueryLambda extends TypeLambda {
+    readonly return: Arg0<this> extends `${infer Rest}?${infer Query}` ? [{
+        readonly query: Query;
+    }, Rest] : [unknown, Arg0<this>];
+}
+interface ParseAuthenticationLambda extends TypeLambda {
+    readonly return: Arg0<this> extends `${infer Username}:${infer Password}@${infer Rest}` ? [{
+        readonly username: Username;
+        readonly password: Password;
+    }, Rest] : [unknown, Arg0<this>];
+}
+interface ParsePathnamePortPathnameLambda extends TypeLambda {
+    readonly return: Arg0<this> extends `${infer Hostname}:${infer Port extends number}/${infer Pathname}` ? [{
+        readonly hostname: Hostname;
+        readonly port: Port;
+        readonly pathname: Pathname;
+    }, ""] : Arg0<this> extends `${infer Hostname}:${infer Port extends number}` ? [{
+        readonly hostname: Hostname;
+        readonly port: Port;
+    }, ""] : Arg0<this> extends `${infer Hostname}/${infer Pathname}` ? "" extends Hostname ? [{
+        readonly pathname: Pathname;
+    }, ""] : [{
+        readonly hostname: Hostname;
+        readonly pathname: Pathname;
+    }, ""] : Arg0<this> extends `${infer Hostname}` ? [{
+        readonly hostname: Hostname;
+    }, ""] : [unknown, Arg0<this>];
+}
+interface ApplyBaseUriLambda<BaseUri extends Uri.Any> extends TypeLambda1<Uri.Any, Uri.Any> {
+    readonly return: Arg0<this> extends infer R extends Uri.Any ? Uri<GetUriKey<BaseUri, "protocol">, GetUriKey<BaseUri, "username">, GetUriKey<BaseUri, "password">, GetUriKey<BaseUri, "hostname">, GetUriKey<BaseUri, "port">, GetUriKey<R, "pathname">, GetUriKey<R, "query">, GetUriKey<R, "hash">> : never;
+}
+type StringJoin<Input extends ReadonlyArray<string>, R extends string = ""> = Input extends readonly [infer A extends string, ...infer Rest extends ReadonlyArray<string>] ? StringJoin<Rest, `${R}${A}`> : R;
+export {};
+//# sourceMappingURL=Uri.d.ts.map

package/dist/Uri.d.ts.map

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

package/dist/Uri.js

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

package/dist/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./CurrentRoute.js";
+export * from "./Matcher.js";
+export * from "./Route.js";
+export * from "./Router.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC"}

package/dist/index.js

@@ -0,0 +1,4 @@
+export * from "./CurrentRoute.js";
+export * from "./Matcher.js";
+export * from "./Route.js";
+export * from "./Router.js";

package/package.json

@@ -1,80 +1,35 @@
 {
   "name": "@typed/router",
-  "version": "0.32.0",
-  "description": "",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/tylors/typed.git"
+  "version": "1.0.0-beta.0",
+  "publishConfig": {
+    "access": "public"
   },
-  "sideEffects": [],
-  "author": "Typed contributors",
-  "homepage": "https://github.com/tylors/typed",
-  "dependencies": {
-    "@effect/schema": "^0.74.1",
-    "effect": "^3.8.4",
-    "@typed/context": "0.30.0",
-    "@typed/dom": "18.0.0",
-    "@typed/environment": "0.11.0",
-    "@typed/fx": "1.32.0",
-    "@typed/guard": "0.6.0",
-    "@typed/navigation": "0.18.0",
-    "@typed/path": "0.15.0",
-    "@typed/route": "9.0.0"
-  },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/dts/index.d.ts",
+  "type": "module",
   "exports": {
-    "./package.json": "./package.json",
     ".": {
-      "types": "./dist/dts/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
-    },
-    "./CurrentRoute": {
-      "types": "./dist/dts/CurrentRoute.d.ts",
-      "import": "./dist/esm/CurrentRoute.js",
-      "default": "./dist/cjs/CurrentRoute.js"
-    },
-    "./MatchInput": {
-      "types": "./dist/dts/MatchInput.d.ts",
-      "import": "./dist/esm/MatchInput.js",
-      "default": "./dist/cjs/MatchInput.js"
-    },
-    "./Matcher": {
-      "types": "./dist/dts/Matcher.d.ts",
-      "import": "./dist/esm/Matcher.js",
-      "default": "./dist/cjs/Matcher.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     },
-    "./RouteGuard": {
-      "types": "./dist/dts/RouteGuard.d.ts",
-      "import": "./dist/esm/RouteGuard.js",
-      "default": "./dist/cjs/RouteGuard.js"
-    },
-    "./RouteMatch": {
-      "types": "./dist/dts/RouteMatch.d.ts",
-      "import": "./dist/esm/RouteMatch.js",
-      "default": "./dist/cjs/RouteMatch.js"
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js"
     }
   },
-  "typesVersions": {
-    "*": {
-      "CurrentRoute": [
-        "./dist/dts/CurrentRoute.d.ts"
-      ],
-      "MatchInput": [
-        "./dist/dts/MatchInput.d.ts"
-      ],
-      "Matcher": [
-        "./dist/dts/Matcher.d.ts"
-      ],
-      "RouteGuard": [
-        "./dist/dts/RouteGuard.d.ts"
-      ],
-      "RouteMatch": [
-        "./dist/dts/RouteMatch.d.ts"
-      ]
-    }
+  "dependencies": {
+    "effect": "4.0.0-beta.4",
+    "find-my-way-ts": "0.1.6",
+    "hkt-core": "1.3.4",
+    "@typed/guard": "1.0.0-beta.0",
+    "@typed/fx": "2.0.0-beta.0",
+    "@typed/id": "1.0.0-beta.0",
+    "@typed/navigation": "1.0.0-beta.0"
+  },
+  "devDependencies": {
+    "typescript": "5.9.3",
+    "vitest": "4.0.18"
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "vitest run --passWithNoTests"
   }
 }

package/src/AST.ts

@@ -0,0 +1,166 @@
+import type { Cause } from "effect/Cause";
+import { succeedSome } from "effect/Effect";
+import type { Top } from "effect/Schema";
+import type { Transformation } from "effect/SchemaTransformation";
+import type { Fx } from "@typed/fx/Fx";
+import type { RefSubject } from "@typed/fx/RefSubject/RefSubject";
+import type { Guard } from "@typed/guard";
+import type { AnyLayer, Layout as LayoutType, MatchHandler } from "./Matcher.js";
+
+export type PathAst =
+  | PathAst.Literal
+  | PathAst.Parameter
+  | PathAst.Slash
+  | PathAst.Wildcard
+  | PathAst.QueryParams;
+
+export declare namespace PathAst {
+  export type Literal = {
+    type: "literal";
+    value: string;
+  };
+  export type Parameter = {
+    type: "parameter";
+    name: string;
+    optional?: boolean;
+    regex?: string;
+  };
+
+  export type Wildcard = {
+    type: "wildcard";
+  };
+
+  export type Slash = {
+    type: "slash";
+  };
+
+  export type QueryParams = {
+    type: "query-params";
+    value: ReadonlyArray<PathAst.QueryParam>;
+  };
+
+  export type QueryParam = {
+    type: "query-param";
+    name: string;
+    value: PathAst;
+  };
+}
+
+export const literal = (value: string): PathAst.Literal => ({ type: "literal", value });
+export const parameter = (name: string, optional?: boolean, regex?: string): PathAst.Parameter => ({
+  type: "parameter",
+  name,
+  ...(optional ? { optional } : {}),
+  ...(regex ? { regex } : {}),
+});
+export const wildcard = (): PathAst.Wildcard => ({ type: "wildcard" });
+export const slash = (): PathAst.Slash => ({ type: "slash" });
+export const queryParams = (value: ReadonlyArray<PathAst.QueryParam>): PathAst.QueryParams => ({
+  type: "query-params",
+  value,
+});
+export const queryParam = (name: string, value: PathAst): PathAst.QueryParam => ({
+  type: "query-param",
+  name,
+  value,
+});
+
+export type RouteAst = RouteAst.Path | RouteAst.Transform | RouteAst.Join;
+
+export declare namespace RouteAst {
+  export interface Path {
+    type: "path";
+    path: PathAst;
+  }
+
+  export interface Transform {
+    type: "transform";
+    from: RouteAst;
+    to: Top;
+    transformation: Transformation<any, any, any, any>;
+  }
+
+  export interface Join {
+    type: "join";
+    parts: ReadonlyArray<RouteAst>;
+  }
+}
+
+export const path = (path: PathAst): RouteAst.Path => ({ type: "path", path });
+export const transform = (
+  from: RouteAst,
+  to: Top,
+  transformation: Transformation<any, any, any, any>,
+): RouteAst.Transform => ({
+  type: "transform",
+  from,
+  to,
+  transformation,
+});
+export const join = (parts: ReadonlyArray<RouteAst>): RouteAst.Join => ({ type: "join", parts });
+
+export type MatchAst =
+  | MatchAst.Route
+  | MatchAst.Layer
+  | MatchAst.Layout
+  | MatchAst.Prefixed
+  | MatchAst.Catch;
+
+export declare namespace MatchAst {
+  export interface Route {
+    type: "route";
+    route: RouteAst;
+    guard: Guard<any, any, any, any>;
+    handler: MatchHandler<any, any, any, any>;
+  }
+
+  export interface Layer {
+    type: "layer";
+    matches: ReadonlyArray<MatchAst>;
+    deps: ReadonlyArray<AnyLayer>;
+  }
+
+  export interface Layout {
+    type: "layout";
+    matches: ReadonlyArray<MatchAst>;
+    layout: LayoutType<any, any, any, any, any, any, any>;
+  }
+
+  export interface Prefixed {
+    type: "prefixed";
+    matches: ReadonlyArray<MatchAst>;
+    prefix: RouteAst;
+  }
+
+  export interface Catch {
+    type: "catch";
+    matches: ReadonlyArray<MatchAst>;
+    f: (cause: RefSubject<Cause<any>>) => Fx<any, any, any>;
+  }
+}
+
+export const route = (
+  route: RouteAst,
+  handler: MatchHandler<any, any, any, any>,
+  guard: Guard<any, any, any, any> = succeedSome,
+): MatchAst.Route => ({ type: "route", route, guard, handler });
+
+export const layer = (
+  matches: ReadonlyArray<MatchAst>,
+  deps: ReadonlyArray<AnyLayer>,
+): MatchAst.Layer => ({ type: "layer", matches, deps });
+
+export const layout = (
+  matches: ReadonlyArray<MatchAst>,
+  layout: LayoutType<any, any, any, any, any, any, any>,
+): MatchAst.Layout => ({ type: "layout", matches, layout });
+
+export const prefixed = (
+  matches: ReadonlyArray<MatchAst>,
+  prefix: RouteAst,
+): MatchAst.Prefixed => ({ type: "prefixed", matches, prefix });
+
+export const catchCause = (
+  matches: ReadonlyArray<MatchAst>,
+  f: (cause: RefSubject<Cause<any>>) => Fx<any, any, any>,
+): MatchAst.Catch => ({ type: "catch", matches, f });