tungsten 0.6.2 → 0.7.0

package/dist/routing/AppRoutes.d.ts

@@ -1,4 +1,6 @@
-import type { Routes } from './Routes.js';
-import type { RoutesFunction } from './RoutesFunction.js';
-export type AppRoutes = Routes | RoutesFunction;
+import type { RoutesFunctionGeneric } from './registrationTypes.js';
+import type { RoutesWithSettings } from './Routes.js';
+import type { BrandedRoutesFunction } from './RoutesFunction.js';
+import type { RoutesArray } from './routesArray.js';
+export type AppRoutes<G extends object = object> = RoutesWithSettings<G> | RoutesArray<G> | BrandedRoutesFunction<G> | RoutesFunctionGeneric<G, any, any, RoutesWithSettings<G> | RoutesArray<G>>;
 //# sourceMappingURL=AppRoutes.d.ts.map

package/dist/routing/AppRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppRoutes.d.ts","sourceRoot":"","sources":["../../src/routing/AppRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGzD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,cAAc,CAAA"}
+{"version":3,"file":"AppRoutes.d.ts","sourceRoot":"","sources":["../../src/routing/AppRoutes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IACzC,kBAAkB,CAAC,CAAC,CAAC,GACrB,WAAW,CAAC,CAAC,CAAC,GACd,qBAAqB,CAAC,CAAC,CAAC,GACxB,qBAAqB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA"}

package/dist/routing/MatchedRouteInfo.d.ts

@@ -0,0 +1,11 @@
+import type { ContentNode } from '../ContentNode.js';
+import type { RoutingRedirect } from './RoutingRedirect.js';
+import type { RouteKey } from './RouteTypes.js';
+import type { RouteContentFunction } from './RouteContentFunction.js';
+export type MatchedRouteInfo = {
+    key: RouteKey | null;
+    params: Record<string, string>;
+    content: ContentNode | RouteContentFunction<any, any>;
+    data?: unknown | RoutingRedirect;
+};
+//# sourceMappingURL=MatchedRouteInfo.d.ts.map

package/dist/routing/MatchedRouteInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/routing/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAGrE,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAK9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACrD,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}

package/dist/routing/RouteContentFunction.d.ts

@@ -1,6 +1,5 @@
 import type { ContentNode } from '../ContentNode.js';
 import type { MatchedRouteProps } from './MatchedRoute.js';
-import type { GlobalData } from './registerGlobalData.js';
-export type RouteContentFunction<RouteParams extends object = object, RouteData = unknown> = (routeData: RouteData, routeParams: RouteParams, props: MatchedRouteProps, globalData: GlobalData, location: string) => ContentNode;
+export type RouteContentFunction<RouteParams extends object = object, RouteData = unknown, G extends object = object, ND = {}> = (routeData: RouteData, routeParams: RouteParams, props: MatchedRouteProps, globalData: G, location: string) => ContentNode;
 export declare function ContentIsRouteContentFunction(content: ContentNode | RouteContentFunction): content is RouteContentFunction;
 //# sourceMappingURL=RouteContentFunction.d.ts.map

package/dist/routing/RouteContentFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteContentFunction.d.ts","sourceRoot":"","sources":["../../src/routing/RouteContentFunction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAOzD,MAAM,MAAM,oBAAoB,CAAC,WAAW,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,GAAG,OAAO,IAAI,CACzF,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,KACjH,WAAW,CAAA;AAEhB,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,WAAW,GAAG,oBAAoB,GAC5C,OAAO,IAAI,oBAAoB,CAEjC"}
+{"version":3,"file":"RouteContentFunction.d.ts","sourceRoot":"","sources":["../../src/routing/RouteContentFunction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAQ1D,MAAM,MAAM,oBAAoB,CAC5B,WAAW,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,GAAG,EAAE,IAC5F,CACA,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,KACxG,WAAW,CAAA;AAEhB,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,WAAW,GAAG,oBAAoB,GAC5C,OAAO,IAAI,oBAAoB,CAEjC"}

package/dist/routing/RouteDataFunction.type.d.ts

@@ -1,6 +1,8 @@
 import type { RoutingRedirect } from './RoutingRedirect.js';
 import type { WebRedirect } from './WebRedirect.js';
-export type RouteDataFunction<Params extends object, DataType> = (params: Params, location: string, query: {
+import type { Context } from '../context/registerContext.js';
+import type { NetworkedData } from './routingRegistry.js';
+export type RouteDataFunction<Params extends object, DataType, C = Context, ND = NetworkedData> = (params: Params, location: string, query: {
     [key: string]: string;
-}) => Promise<DataType | RoutingRedirect | WebRedirect>;
+}, context: C, networkedData: ND) => Promise<DataType | RoutingRedirect | WebRedirect>;
 //# sourceMappingURL=RouteDataFunction.type.d.ts.map

package/dist/routing/RouteDataFunction.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteDataFunction.type.d.ts","sourceRoot":"","sources":["../../src/routing/RouteDataFunction.type.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,MAAM,iBAAiB,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,IACvD,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,KAClE,OAAO,CAAC,QAAQ,GAAG,eAAe,GAAG,WAAW,CAAC,CAAA"}
+{"version":3,"file":"RouteDataFunction.type.d.ts","sourceRoot":"","sources":["../../src/routing/RouteDataFunction.type.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAKzD,MAAM,MAAM,iBAAiB,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,EAAE,EAAE,GAAG,aAAa,IACxF,CACE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAClE,OAAO,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,KAE9B,OAAO,CAAC,QAAQ,GAAG,eAAe,GAAG,WAAW,CAAC,CAAA"}

package/dist/routing/RoutePaths.d.ts

@@ -0,0 +1,12 @@
+import type { PipelineApp } from '../pipeline/pipelineDefinition.js';
+import type { Path } from './RouteTypes.js';
+import type { KeyedRoutes } from './routesArray.js';
+type NumericParamType = 'digits' | 'uint' | 'unsigned-integer' | 'int' | 'integer' | 'sint' | 'signed-integer' | 'int-ge1' | '1+' | 'num' | 'number';
+type NameChar = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | Uppercase<'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z'> | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | '_';
+type AfterName<S extends string> = S extends `${infer C}${infer R}` ? C extends NameChar ? AfterName<R> : S : S;
+type ParamTemplate<After extends string> = After extends `<${infer T}>${infer Tail}` ? `${T extends NumericParamType ? number : string}${PathTemplate<Tail>}` : After extends `(${string})${infer Tail}` ? `${string}${PathTemplate<Tail>}` : `${string}${PathTemplate<After>}`;
+export type PathTemplate<S extends string> = S extends `${infer Head}:${infer Rest}` ? `${Head}${ParamTemplate<AfterName<Rest>>}` : S;
+type RoutesTable<R> = R extends PipelineApp<infer F> ? RoutesTable<F> : KeyedRoutes<R extends (...args: never[]) => infer T ? T : R>;
+export type RoutePaths<R> = RoutesTable<R> extends infer T ? T extends unknown ? Extract<PathTemplate<Extract<keyof T, Path>>, Path> : never : never;
+export {};
+//# sourceMappingURL=RoutePaths.d.ts.map

package/dist/routing/RoutePaths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RoutePaths.d.ts","sourceRoot":"","sources":["../../src/routing/RoutePaths.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,KAAK,gBAAgB,GAAG,QAAQ,GAAG,MAAM,GAAG,kBAAkB,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,gBAAgB,GACxG,SAAS,GAAG,IAAI,GAAG,KAAK,GAAG,QAAQ,CAAA;AAEzC,KAAK,QAAQ,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GACvG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GACvG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GACzG,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;AAGlF,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAE/G,KAAK,aAAa,CAAC,KAAK,SAAS,MAAM,IACjC,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,MAAM,IAAI,EAAE,GACrC,GAAG,CAAC,SAAS,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,GACtE,KAAK,SAAS,IAAI,MAAM,IAAI,MAAM,IAAI,EAAE,GACpC,GAAG,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,GAChC,GAAG,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,EAAE,CAAA;AAG/C,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,IACnC,CAAC,SAAS,GAAG,MAAM,IAAI,IAAI,MAAM,IAAI,EAAE,GAAG,GAAG,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAE9F,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC9C,WAAW,CAAC,CAAC,CAAC,GACd,WAAW,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AAIlE,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GACpD,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,KAAK,GAC/E,KAAK,CAAA"}

package/dist/routing/RoutePaths.js

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

package/dist/routing/RouteTypes.d.ts

@@ -1,13 +1,15 @@
 import type { RouteDataFunction } from './RouteDataFunction.type.js';
 import type { ContentNode } from '../ContentNode.js';
 import type { RouteContentFunction } from './RouteContentFunction.js';
-export type Endpoint<Params extends object, DataType> = {
+import type { RouteCacheControl } from '../cacheControl.js';
+export type Endpoint<Params extends object, DataType, G extends object = object> = {
     data?: RouteDataFunction<Params, DataType>;
-    content: ContentNode | RouteContentFunction<Params, DataType>;
+    content: ContentNode | RouteContentFunction<Params, DataType, G>;
+    cacheControl?: RouteCacheControl;
 };
 export type Method = 'GET' | 'QUERY' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
-export type Route = Endpoint<object, unknown> & {
-    [K in Method]?: Endpoint<object, unknown>;
+export type Route = Endpoint<object, unknown, object> & {
+    [K in Method]?: Endpoint<object, unknown, object>;
 };
 export type Path = `/${string}`;
 export type SpecialRoute = 'default' | '404' | 'error';

package/dist/routing/RouteTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteTypes.d.ts","sourceRoot":"","sources":["../../src/routing/RouteTypes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAGrE,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,IAAI;IACpD,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC1C,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAChE,CAAA;AAGD,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAA;AAE1E,MAAM,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;KAC3C,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC5C,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,IAAI,MAAM,EAAE,CAAA;AAC/B,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAA;AACtD,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,YAAY,CAAA;AAE1C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,IAAI,CAE3D;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,IAAI,IAAI,CAE3D"}
+{"version":3,"file":"RouteTypes.d.ts","sourceRoot":"","sources":["../../src/routing/RouteTypes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG3D,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IAC/E,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC1C,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAA;IAEhE,YAAY,CAAC,EAAE,iBAAiB,CAAA;CACnC,CAAA;AAGD,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAA;AAE1E,MAAM,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG;KACnD,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;CACpD,CAAA;AAED,MAAM,MAAM,IAAI,GAAG,IAAI,MAAM,EAAE,CAAA;AAC/B,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAA;AACtD,MAAM,MAAM,QAAQ,GAAG,IAAI,GAAG,YAAY,CAAA;AAE1C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,IAAI,CAE3D;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,IAAI,IAAI,CAE3D"}

package/dist/routing/Routes.d.ts

@@ -1,26 +1,32 @@
 import type { Path, Endpoint } from './RouteTypes.js';
 import type { ErrorRouteType } from './ErrorRouteType.js';
+import type { $cacheControl, RouteCacheControl } from '../cacheControl.js';
+import type { Serializable } from './Serializable.js';
 export type MinimumRoutes = {
-    default: Endpoint<any, any>;
+    default: Endpoint<any, any, any>;
 } | {
-    '404': Endpoint<any, any>;
+    '404': Endpoint<any, any, any>;
 };
-export type Routes = {
-    [key in Path]: Endpoint<any, any>;
+export type RoutesSettings = {
+    [$cacheControl]?: RouteCacheControl;
+};
+export type Routes<G extends object = object> = {
+    [key in Path]: Endpoint<any, any, G>;
 } & {
-    'error'?: ErrorRouteType;
+    error?: ErrorRouteType;
 } & ({
-    'default': Endpoint<any, any>;
+    default: Endpoint<any, any, G>;
 } | {
-    '404': Endpoint<any, any>;
+    404: Endpoint<any, any, G>;
 });
-export type CustomRoutes<Route extends Endpoint<any, any>> = {
+export type RoutesWithSettings<G extends object = object> = Routes<G> & RoutesSettings;
+export type CustomRoutes<Route extends Endpoint<any, any, G>, G extends object & Serializable<G> = object> = {
     [key in Path]: Route;
 } & {
     error: ErrorRouteType;
 } & ({
-    'default': Route;
+    default: Route;
 } | {
-    '404': Route;
-});
+    404: Route;
+}) & RoutesSettings;
 //# sourceMappingURL=Routes.d.ts.map

package/dist/routing/Routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Routes.d.ts","sourceRoot":"","sources":["../../src/routing/Routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGzD,MAAM,MAAM,aAAa,GACnB;IAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,GAC/B;IAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,CAAA;AAEnC,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CAAE,GACxD;IAAE,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,GAC5B,CACE;IAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,GAC/B;IAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,CAClC,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,KAAK,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI;KAAG,GAAG,IAAI,IAAI,GAAG,KAAK;CAAE,GACnF;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,GACzB,CACE;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GAClB;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CACrB,CAAA"}
+{"version":3,"file":"Routes.d.ts","sourceRoot":"","sources":["../../src/routing/Routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAGrD,MAAM,MAAM,aAAa,GACnB;IAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,GACpC;IAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,CAAA;AAGxC,MAAM,MAAM,cAAc,GAAG;IAEzB,CAAC,aAAa,CAAC,CAAC,EAAE,iBAAiB,CAAA;CACtC,CAAA;AAGD,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IACtC;KAAG,GAAG,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;CAAE,GACxC;IAAE,KAAK,CAAC,EAAE,cAAc,CAAA;CAAE,GAC1B,CACE;IAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;CAAE,GAChC;IAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;CAAE,CACnC,CAAA;AAEL,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAG,MAAM,CAAC,CAAC,CAAC,GAAG,cAAc,CAAA;AAErF,MAAM,MAAM,YAAY,CACpB,KAAK,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EACnC,CAAC,SAAS,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAEzC;KAAG,GAAG,IAAI,IAAI,GAAG,KAAK;CAAE,GACxB;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,GACzB,CACE;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,GAChB;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,CACnB,GACC,cAAc,CAAA"}

package/dist/routing/RoutesFunction.d.ts

@@ -1,4 +1,13 @@
 import type { ReqRes } from '../ReqRes.js';
-import type { Routes } from './Routes.js';
-export type RoutesFunction = (reqRes: ReqRes | null) => Routes;
+import type { RoutesWithSettings } from './Routes.js';
+import type { RoutesArray } from './routesArray.js';
+import type { Context } from '../context/registerContext.js';
+import type { BrandedContext, BrandedNetworkedData } from '../Brands.js';
+import type { NetworkedData } from './routingRegistry.js';
+export type RoutesFunction<G extends object = object> = {
+    routes(reqRes: ReqRes | null, context: Context, networkedData: NetworkedData): RoutesWithSettings<G>;
+}['routes'];
+export type BrandedRoutesFunction<G extends object = object> = {
+    routes(reqRes: ReqRes | null, context: BrandedContext, networkedData: BrandedNetworkedData): RoutesWithSettings<G> | RoutesArray<G>;
+}['routes'];
 //# sourceMappingURL=RoutesFunction.d.ts.map

package/dist/routing/RoutesFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoutesFunction.d.ts","sourceRoot":"","sources":["../../src/routing/RoutesFunction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGzC,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAAA"}
+{"version":3,"file":"RoutesFunction.d.ts","sourceRoot":"","sources":["../../src/routing/RoutesFunction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAMzD,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IACpD,MAAM,CACF,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,GAC7B,kBAAkB,CAAC,CAAC,CAAC,CAAA;CAC3B,CAAC,QAAQ,CAAC,CAAA;AAEX,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;IAC3D,MAAM,CACF,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,oBAAoB,GACpC,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;CAC5C,CAAC,QAAQ,CAAC,CAAA"}

package/dist/routing/Serializable.d.ts

@@ -0,0 +1,5 @@
+import type { JsonValue } from 'sxy-types';
+export type Serializable<S> = {
+    [K in keyof S]: K extends symbol ? never : JsonValue;
+};
+//# sourceMappingURL=Serializable.d.ts.map

package/dist/routing/Serializable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Serializable.d.ts","sourceRoot":"","sources":["../../src/routing/Serializable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAM1C,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,KAAK,GAAG,SAAS;CAAE,CAAA"}

package/dist/routing/Serializable.js

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

package/dist/routing/builder.d.ts

@@ -0,0 +1,99 @@
+import type { Expand } from '../../types/helpers.js';
+import type { ContentNode } from '../ContentNode.js';
+import type { RouteContentFunction } from './RouteContentFunction.js';
+import type { Endpoint, Path, RouteKey } from './RouteTypes.js';
+import type { RouteDataFunction } from './RouteDataFunction.type.js';
+import type { ParamsFromPath } from './ParamsFromPath.js';
+import type { TungstenErrorInfo } from './TungstenErrorInfo.js';
+export type FluentRoute = {
+    path: RouteKey;
+    content: ContentNode | RouteContentFunction<any, any>;
+};
+export type NormalFluentRoute = {
+    path: Path;
+    content: ContentNode | RouteContentFunction<any, any>;
+};
+export type FluentDefaultRoute = {
+    path: 'default';
+    content: ContentNode;
+};
+export type Fluent404Route = {
+    path: '404';
+    code: 404;
+    content: ContentNode;
+};
+export type FluentErrorRoute = {
+    path: 'error';
+    content: RouteContentFunction<object, TungstenErrorInfo>;
+};
+export type FluentRoutesToRoutes<T extends readonly FluentRoute[]> = {
+    [E in T[number] as E['path'] & string]: E;
+} & {};
+export declare function routes<const T extends readonly FluentRoute[]>(...frs: T): FluentRoutesToRoutes<T>;
+export declare function routesWith<Rule extends object>(): <const T extends readonly (FluentRoute & Rule)[]>(...frs: T) => FluentRoutesToRoutes<T>;
+type FrameworkRouteFields = Omit<Endpoint<any, any>, 'data' | 'content'>;
+type Meta = Record<string, unknown> & FrameworkRouteFields;
+declare const $invalidKeyError: unique symbol;
+type MustNotIncludePathDataContent<T extends Record<string, unknown>> = 'path' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'path\'';
+} : 'data' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'data\'';
+} : 'content' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'content\'';
+} : T;
+export declare function chainedRoute<P extends RouteKey, M extends Meta = {}>(path: P, meta?: M & MustNotIncludePathDataContent<M>): {
+    meta<M2 extends Meta>(meta: M2 & MustNotIncludePathDataContent<M2>): {
+        data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+            content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+                path: P;
+            } & Omit<M, keyof M2> & M2 & {
+                data: RouteDataFunction<ParamsFromPath<P>, D>;
+                content: NoInfer<C>;
+            }>;
+        };
+        content<const C extends ContentNode>(content: C): Expand<{
+            path: P;
+        } & Omit<M, keyof M2> & M2 & {
+            content: C;
+        }>;
+    };
+    data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+        content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+            path: P;
+        } & M & {
+            data: RouteDataFunction<ParamsFromPath<P>, D>;
+            content: NoInfer<C>;
+        }>;
+    };
+    content<const C extends ContentNode>(content: C): Expand<{
+        path: P;
+    } & M & {
+        content: C;
+    }>;
+};
+export declare function route<P extends RouteKey, D, M extends Meta = {}>(// eslint-disable-line @typescript-eslint/no-empty-object-type
+r: {
+    path: P;
+    data: RouteDataFunction<ParamsFromPath<P>, D>;
+    content: RouteContentFunction<ParamsFromPath<P>, D>;
+} & M): Expand<{
+    path: P;
+} & M & {
+    data: RouteDataFunction<ParamsFromPath<P>, D>;
+    content: RouteContentFunction<ParamsFromPath<P>, D>;
+}>;
+export declare function route<P extends RouteKey, const C extends ContentNode, M extends Meta = {}>(// eslint-disable-line @typescript-eslint/no-empty-object-type
+r: {
+    path: P;
+    data?: never;
+    content: C;
+} & M): Expand<{
+    path: P;
+} & M & {
+    content: C;
+}>;
+export declare function defaultRoute(r: FluentDefaultRoute): FluentDefaultRoute;
+export declare function _404Route(r: FluentErrorRoute): FluentErrorRoute;
+export declare function errorRoute(r: FluentErrorRoute): FluentErrorRoute;
+export {};
+//# sourceMappingURL=builder.d.ts.map

package/dist/routing/builder.d.ts.map

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

package/dist/routing/builder.js

@@ -0,0 +1,213 @@
+import { TungstenError } from '../TungstenError.js';
+export function routes(...frs) {
+  const routes = frs.reduce((prev, route) => {
+    if (route.path !== '/' && route.path.endsWith('/')) {
+      throw new TungstenError(`Invalid path ${route.path} - trailing slashes are not allowed`);
+    }
+    if (route.path in prev) {
+      throw new TungstenError(`Duplicate path ${route.path}`);
+    }
+    prev[route.path] = route;
+    return prev;
+  }, {/*default: { path: 'default', content: null }*/});
+  return routes; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+}
+export function routesWith() {
+  return function routes(...frs) {
+    const routes = frs.reduce((prev, route) => {
+      if (route.path !== '/' && route.path.endsWith('/')) {
+        throw new TungstenError(`Invalid path ${route.path} - trailing slashes are not allowed`);
+      }
+      if (route.path in prev) {
+        throw new TungstenError(`Duplicate path ${route.path}`);
+      }
+      prev[route.path] = route;
+      return prev;
+    }, {/*default: { path: 'default', content: null }*/});
+    return routes; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  };
+}
+// export function routeLegacy<P extends RouteKey>(path: P) {
+//     const r: { path: P } = { path }
+//     return {
+//         meta<M extends Record<string, unknown>>(meta: M & MustNotIncludePathDataContent<M>) {
+//             if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`)
+//             if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`)
+//             if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`)
+//             //Object.assign(r, meta)
+//             const rm = {
+//                 path: r.path,
+//                 ...(meta as M)
+//             }
+//             return {
+//                 data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>) {
+//                     const rmd = {
+//                         ...rm,
+//                         data: dataFunc
+//                     }
+//                     return {
+//                         content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C)
+//                             : Expand<{ path: P } & M & { data: RouteDataFunction<ParamsFromPath<P>, D>, content: C }> {
+//                             return {
+//                                 ...rmd,
+//                                 content
+//                             }
+//                         }
+//                     }
+//                 },
+//                 content<const C extends ContentNode>(content: C): Expand<{ path: P } & M & { content: C }> {
+//                     return {
+//                         ...rm,
+//                         content
+//                     }
+//                 }
+//             }
+//         },
+//         data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>) {
+//             // const rd = r as { // eslint-disable-line no-type-assertion/no-type-assertion
+//             //     path: P
+//             //     data: RouteDataFunction<Params<P>, D>
+//             // }
+//             // rd.data = dataFunc
+//             const rd = {
+//                 path: r.path,
+//                 data: dataFunc
+//             }
+//             return {
+//                 content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C)
+//                     : Expand<{ path: P } & { data: RouteDataFunction<ParamsFromPath<P>, D>, content: C }> {
+//                     return {
+//                         ...rd,
+//                         content
+//                     }
+//                 }
+//             }
+//         },
+//         // does not accept a function by choice - but could be relaxed
+//         content<const C extends ContentNode>(content: C): Expand<{ path: P } & { content: C }> {
+//             return {
+//                 path: r.path,
+//                 content
+//             }
+//         }
+//     }
+// }
+export function chainedRoute(path, meta) {
+  const r = {
+    path
+  }; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  if (meta) {
+    if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`);
+    if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`);
+    if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`);
+    Object.assign(r, meta);
+  }
+  return {
+    meta(meta) {
+      if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`);
+      if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`);
+      if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`);
+      //Object.assign(r, meta)
+      const rm = {
+        ...r,
+        ...meta
+      }; // with generics TS will use an intersection not an overriding merge here.
+      // We use Omit manually to model the spread
+      return {
+        data(dataFunc) {
+          // const rmd = r as { path: P } & M & { // eslint-disable-line no-type-assertion/no-type-assertion
+          //     data: RouteDataFunction<Params<P>, D>
+          // }
+          // rmd.data = dataFunc
+          const rmd = {
+            ...rm,
+            data: dataFunc
+          };
+          return {
+            content(content) {
+              return {
+                ...rmd,
+                content
+              };
+            }
+          };
+        },
+        content(content) {
+          return {
+            ...rm,
+            content
+          };
+        }
+      };
+    },
+    data(dataFunc) {
+      // const rd = r as { // eslint-disable-line no-type-assertion/no-type-assertion
+      //     path: P
+      //     data: RouteDataFunction<ParamsFromPath<P>, D>
+      // }
+      // rd.data = dataFunc
+      const rd = {
+        ...r,
+        data: dataFunc
+      };
+      return {
+        // NoInfer: C comes from the argument alone. Inferred from an expected result (the
+        // FluentRoute of routes' parameter) it would type the function's data as any
+        content(content) {
+          return {
+            ...rd,
+            content
+          };
+        }
+      };
+    },
+    // does not accept a function by choice - but could be relaxed
+    content(content) {
+      // const rc = r as { path: P, content: C } // eslint-disable-line no-type-assertion/no-type-assertion
+      // rc.content = content
+      // return rc
+      return {
+        ...r,
+        content
+      };
+    }
+  };
+}
+export function route(r) {
+  return r;
+}
+/// TODO
+export function defaultRoute(r) {
+  return r;
+}
+export function _404Route(r) {
+  return r;
+}
+export function errorRoute(r) {
+  return r;
+}
+// function data<D>(dataFunc: () => Promise<D>) {
+//     const r: Partial<RouteType<any, any>> = {
+//         data: dataFunc
+//     }
+//     return {
+//         content(content: ContentNode) {
+//             r.content = content
+//             return {
+//                 meta(meta: object) {
+//                 }
+//             }
+//         }
+//         meta
+//     }
+// }
+// export const fluentRoutes = {
+//     '/': {
+//         name: 'Browse',
+//         content: <Browse />,
+//     },
+//     '404': {
+//         hidden: true,
+//         content: <NotFound />,
+//     },
+// } as const satisfies Routes

package/dist/routing/builder.trial.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=builder.trial.d.ts.map

package/dist/routing/builder.trial.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builder.trial.d.ts","sourceRoot":"","sources":["../../src/routing/builder.trial.tsx"],"names":[],"mappings":""}

package/dist/routing/builder.trial.js

@@ -0,0 +1,85 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { routes, chainedRoute, route } from './builder.js';
+import { jsx as _jsx } from "tungsten/jsx-runtime";
+function Browse() {
+  return null;
+}
+function HandlerRepro() {
+  return null;
+}
+function NotFound() {
+  return null;
+}
+const getLead = async data => ({
+  id: data.id,
+  name: 'bob'
+});
+function Dashboard(props) {
+  return null;
+}
+chainedRoute('/test/leads/:id<1+>').meta({
+  name: 'Lead'
+}).data(({
+  id
+}) => getLead({
+  id: Number(id)
+})).content(data => _jsx(Dashboard, {
+  id: data.id
+}));
+routes(chainedRoute('/test/leads/:id<1+>').meta({
+  name: 'Lead'
+}).data(({
+  id
+}) => getLead({
+  id: Number(id)
+})).content(data => _jsx(Dashboard, {
+  id: data.id
+})));
+route({
+  path: '/test/leads/:id<1+>',
+  name: 'Lead',
+  data: ({
+    id
+  }) => getLead({
+    id: Number(id)
+  }),
+  content: data => _jsx(Dashboard, {
+    id: data.id
+  })
+});
+const r = routes(chainedRoute('/').meta({
+  name: 'Browse'
+}).content(_jsx(Browse, {})));
+const rrrr1 = chainedRoute('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {}));
+// const rrrr2 = routeLegacy('/repro')
+//     .meta({
+//         name: 'Handler repro',
+//         hidden: true
+//     } as const)
+//     .data(() => Promise.resolve(5))
+//     .content(<HandlerRepro />)
+const r2 = routes(chainedRoute('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {})), chainedRoute('/repro', {
+  name: 'Handler repro',
+  hidden: true
+}).content(_jsx(HandlerRepro, {})), chainedRoute('404', {
+  hidden: true
+}).content(_jsx(NotFound, {})));
+// export const routes = {
+//     '/': {
+//         name: 'Browse',
+//         content: <Browse />,
+//     },
+//     '/repro': {
+//         name: 'Handler repro',
+//         hidden: true,
+//         content: <HandlerRepro />,
+//     },
+//     '404': {
+//         hidden: true,
+//         content: <NotFound />,
+//     },
+// } as const satisfies Routes