tungsten 0.5.1 → 0.5.2

package/dist/requests/fetch/patch.js

@@ -1,19 +1,17 @@
 import { TungstenError } from '../../TungstenError.js';
 import { _fetchPromise } from './_fetchPromise.js';
+import { mergeFetchInit } from './mergeFetchInit.js';
 const method = 'PATCH';
 export async function patch(url, data, extras) {
   const _fetch = await _fetchPromise;
-  const response = await _fetch(url, {
+  const response = await _fetch(url, mergeFetchInit({
     method,
     headers: {
       'Content-Type': 'application/json',
       'Accept': 'application/json'
     },
-    // cors?
-    // credentials?
-    body: JSON.stringify(data),
-    ...extras
-  });
+    body: JSON.stringify(data)
+  }, extras));
   if (response.status !== 200) throw new TungstenError(`${method} request to ${url} returned an invalid status: ${response.status}`);
   const jsonData = await response.json();
   return jsonData;

package/dist/requests/fetch/post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../src/requests/fetch/post.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,0CAoB1E"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../src/requests/fetch/post.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAMnD,wBAAsB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,0CAiB1E"}

package/dist/requests/fetch/post.js

@@ -1,19 +1,17 @@
 import { TungstenError } from '../../TungstenError.js';
 import { _fetchPromise } from './_fetchPromise.js';
+import { mergeFetchInit } from './mergeFetchInit.js';
 const method = 'POST';
 export async function post(url, data, extras) {
   const _fetch = await _fetchPromise;
-  const response = await _fetch(url, {
+  const response = await _fetch(url, mergeFetchInit({
     method,
     headers: {
       'Content-Type': 'application/json',
       'Accept': 'application/json'
     },
-    // cors?
-    // credentials?
-    body: JSON.stringify(data),
-    ...extras
-  });
+    body: JSON.stringify(data)
+  }, extras));
   if (response.status !== 200) throw new TungstenError(`${method} request to ${url} returned an invalid status: ${response.status}`);
   const jsonData = await response.json();
   return jsonData;

package/dist/requests/fetch/put.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"put.d.ts","sourceRoot":"","sources":["../../../src/requests/fetch/put.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,wBAAsB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,0CAoBzE"}
+{"version":3,"file":"put.d.ts","sourceRoot":"","sources":["../../../src/requests/fetch/put.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAKnD,wBAAsB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,0CAiBzE"}

package/dist/requests/fetch/put.js

@@ -1,19 +1,17 @@
 import { TungstenError } from '../../TungstenError.js';
 import { _fetchPromise } from './_fetchPromise.js';
+import { mergeFetchInit } from './mergeFetchInit.js';
 const method = 'PUT';
 export async function put(url, data, extras) {
   const _fetch = await _fetchPromise;
-  const response = await _fetch(url, {
+  const response = await _fetch(url, mergeFetchInit({
     method,
     headers: {
       'Content-Type': 'application/json',
       'Accept': 'application/json'
     },
-    // cors?
-    // credentials?
-    body: JSON.stringify(data),
-    ...extras
-  });
+    body: JSON.stringify(data)
+  }, extras));
   if (response.status !== 200) throw new TungstenError(`${method} request to ${url} returned an invalid status: ${response.status}`);
   const jsonData = await response.json();
   return jsonData;

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

@@ -1 +1 @@
-{"version":3,"file":"ParamsFromPath.d.ts","sourceRoot":"","sources":["../../src/routing/ParamsFromPath.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,KAAK,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GACrF,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,CAAC;AACpF,KAAK,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;AACxC,KAAK,KAAK,GAAG,UAAU,GAAG,UAAU,CAAC;AAErC,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,MAAM,IAAI,CAAC,GACtE,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,GAAG;KAAG,CAAC,IAAI,GAAG,GAAG,MAAM;CAAE,CAAC,CAAC;AAE/C,MAAM,MAAM,cAAc,CACtB,CAAC,SAAS,MAAM,EAChB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,EAC5C,IAAI,SAAS,MAAM,GAAG,EAAE,EACxB,OAAO,SAAS,OAAO,GAAG,KAAK,IAC/B,CAAC,SAAS,GAAG,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,GACrC,KAAK,SAAS,GAAG,GACb,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GACtD,OAAO,SAAS,IAAI,GAChB,KAAK,SAAS,KAAK,GACf,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,KAAK,EAAE,EAAE,IAAI,CAAC,GACvD,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,GAC3D,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,GACrD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ParamsFromPath.d.ts","sourceRoot":"","sources":["../../src/routing/ParamsFromPath.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,KAAK,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GACrF,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,CAAA;AACnF,KAAK,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AACvC,KAAK,KAAK,GAAG,UAAU,GAAG,UAAU,CAAA;AAEpC,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,MAAM,IAAI,CAAC,GACtE,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,GAAG;KAAG,CAAC,IAAI,GAAG,GAAG,MAAM;CAAE,CAAC,CAAA;AAE9C,MAAM,MAAM,cAAc,CACtB,CAAC,SAAS,MAAM,EAChB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,EAC5C,IAAI,SAAS,MAAM,GAAG,EAAE,EACxB,OAAO,SAAS,OAAO,GAAG,KAAK,IAC/B,CAAC,SAAS,GAAG,MAAM,KAAK,GAAG,MAAM,IAAI,EAAE,GACrC,KAAK,SAAS,GAAG,GACb,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GACtD,OAAO,SAAS,IAAI,GAChB,KAAK,SAAS,KAAK,GACf,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,KAAK,EAAE,EAAE,IAAI,CAAC,GACvD,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,GAC3D,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,GACrD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA"}

package/dist/routing/RouteType.d.ts

@@ -1,9 +1,2 @@
-import type { RouteDataFunction } from './RouteDataFunction.type.js';
-import type { ContentNode } from '../ContentNode.js';
-import type { RouteContentFunction } from './RouteContentFunction.js';
-export type RouteType<Params extends object, DataType> = {
-    data?: RouteDataFunction<Params, DataType>;
-    content: ContentNode | RouteContentFunction<Params, DataType>;
-};
-export type Route<Params extends object, DataType> = RouteType<Params, DataType>;
+export {};
 //# sourceMappingURL=RouteType.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RouteType.d.ts","sourceRoot":"","sources":["../../src/routing/RouteType.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;AAErE,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,IAAI;IACrD,IAAI,CAAC,EAAE,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC1C,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"RouteType.d.ts","sourceRoot":"","sources":["../../src/routing/RouteType.ts"],"names":[],"mappings":""}

package/dist/routing/RouteTypes.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"RouteTypes.d.ts","sourceRoot":"","sources":["../../src/routing/RouteTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,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,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,QAAQ,CAExF;AACD,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,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,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;AAErE,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,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,QAAQ,CAExF;AACD,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,21 +1,20 @@
-import type { Path } from './RouteTypes.js';
-import type { RouteType } from './RouteType.js';
+import type { Path, Endpoint } from './RouteTypes.js';
 import type { ErrorRouteType } from './ErrorRouteType.js';
 export type MinimumRoutes = {
-    default: RouteType<any, any>;
+    default: Endpoint<any, any>;
 } | {
-    '404': RouteType<any, any>;
+    '404': Endpoint<any, any>;
 };
 export type Routes = {
-    [key in Path]: RouteType<any, any>;
+    [key in Path]: Endpoint<any, any>;
 } & {
     'error'?: ErrorRouteType;
 } & ({
-    'default': RouteType<any, any>;
+    'default': Endpoint<any, any>;
 } | {
-    '404': RouteType<any, any>;
+    '404': Endpoint<any, any>;
 });
-export type CustomRoutes<Route extends RouteType<any, any>> = {
+export type CustomRoutes<Route extends Endpoint<any, any>> = {
     [key in Path]: Route;
 } & {
     error: ErrorRouteType;

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,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,MAAM,MAAM,aAAa,GACnB;IAAE,OAAO,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,GAChC;IAAE,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,CAAA;AAEpC,MAAM,MAAM,MAAM,GAAG;KAAG,GAAG,IAAI,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;CAAE,GACzD;IAAE,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,GAC5B,CACE;IAAE,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,GAChC;IAAE,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;CAAE,CACnC,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,KAAK,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI;KAAG,GAAG,IAAI,IAAI,GAAG,KAAK;CAAE,GACpF;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;AAEzD,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"}

package/dist/routing/__fluentRouteBuilder.d.ts

@@ -0,0 +1,80 @@
+import { ContentNode, ParamsFromPath, RouteContentFunction, RouteDataFunction, RouteKey } from 'tungsten';
+import { Expand } from 'tungsten/types/helpers.js';
+type FR = {
+    path: RouteKey;
+    content: ContentNode | RouteContentFunction<any, any>;
+};
+export type FluentRoutesToRoutes<T extends readonly FR[]> = {
+    [E in T[number] as E['path'] & string]: E;
+} & {};
+export declare function fluentRoutes<const T extends readonly FR[]>(frs: T): FluentRoutesToRoutes<T>;
+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 routeLegacy<P extends RouteKey>(path: P): {
+    meta<M extends Record<string, unknown>>(meta: M & MustNotIncludePathDataContent<M>): {
+        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: C;
+            }>;
+        };
+        content<const C extends ContentNode>(content: C): Expand<{
+            path: P;
+        } & M & {
+            content: C;
+        }>;
+    };
+    data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+        content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+            path: P;
+        } & {
+            data: RouteDataFunction<ParamsFromPath<P>, D>;
+            content: C;
+        }>;
+    };
+    content<const C extends ContentNode>(content: C): Expand<{
+        path: P;
+    } & {
+        content: C;
+    }>;
+};
+export declare function route<P extends RouteKey, M extends Record<string, unknown> = {}>(path: P, meta?: M & MustNotIncludePathDataContent<M>): {
+    meta<M2 extends Record<string, unknown>>(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: 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: C;
+        }>;
+    };
+    content<const C extends ContentNode>(content: C): Expand<{
+        path: P;
+    } & M & {
+        content: C;
+    }>;
+};
+export {};
+//# sourceMappingURL=__fluentRouteBuilder.d.ts.map

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

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

package/dist/routing/__fluentRouteBuilder.js

@@ -0,0 +1,183 @@
+import { TungstenError } from 'tungsten';
+export function fluentRoutes(frs) {
+  const routes = frs.reduce((prev, route) => {
+    if (route.path !== '/' && route.path.endsWith('/')) {
+      throw new Error(`Invalid path ${route.path} - trailing slashes are not allowed`);
+    }
+    if (route.path in prev) {
+      throw new Error(`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(path) {
+  const r = {
+    path
+  };
+  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 = {
+        path: r.path,
+        ...meta
+      };
+      return {
+        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<Params<P>, D>
+      // }
+      // rd.data = dataFunc
+      const rd = {
+        path: r.path,
+        data: dataFunc
+      };
+      return {
+        content(content) {
+          return {
+            ...rd,
+            content
+          };
+        }
+      };
+    },
+    // does not accept a function by choice - but could be relaxed
+    content(content) {
+      return {
+        path: r.path,
+        content
+      };
+    }
+  };
+}
+export function route(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 hte 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 {
+        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
+      };
+    }
+  };
+}
+// 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/__fluentRoutes.d.ts

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

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

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

package/dist/routing/__fluentRoutes.js

@@ -0,0 +1,59 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { fluentRoutes, route, routeLegacy } from "./__fluentRouteBuilder.js";
+import { jsx as _jsx } from "tungsten/jsx-runtime";
+function Browse() {
+  return null;
+}
+function HandlerRepro() {
+  return null;
+}
+function NotFound() {
+  return null;
+}
+// const r = fluentRoutes([
+//     route('/')
+//         .meta({ name: 'Browse' })
+//         .content(<Browse />),
+//     route('404').content(<NotFound />),
+//     route('/data')
+//         .data(() => Promise.resolve(5))
+//         .content((d) => <span>{d}</span>)
+// ])
+const r = fluentRoutes([route('/').meta({
+  name: 'Browse'
+}).content(_jsx(Browse, {})), routeLegacy('/repro').meta({
+  name: 'Handler repro',
+  hidden: true
+}).content(_jsx(HandlerRepro, {})), routeLegacy('404').meta({
+  hidden: true
+}).content(_jsx(NotFound, {}))]);
+const rrrr1 = route('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {}));
+const rrrr2 = routeLegacy('/repro').meta({
+  name: 'Handler repro',
+  hidden: true
+}).data(() => Promise.resolve(5)).content(_jsx(HandlerRepro, {}));
+const r2 = fluentRoutes([route('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {})), route('/repro', {
+  name: 'Handler repro',
+  hidden: true
+}).content(_jsx(HandlerRepro, {})), route('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

package/dist/staticGen/staticGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBA+MnD"}
+{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAgBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBA+MnD"}

package/dist/testing/host.d.ts.map

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

package/dist/testing/host.js

@@ -4,7 +4,7 @@ const isPromise = value => value instanceof Promise || typeof value === 'object'
 // The same list at runtime. Underscore-prefixed members are excluded by rule
 // (the framework's naming scheme), so only the plain-named ones are listed, and
 // frameworkMembersAreComplete below fails to compile if one is ever missed.
-const frameworkMemberNames = ['props', 'routeParams', 'routeData', 'parentComponent', 'childComponents', 'globalData', 'state', 'storeData', 'style', 'title', 'content', 'render', 'init', 'clientInit', 'serverInit', 'componentDidMount', 'componentDidHydrate', 'componentDidUpdate', 'componentDidRender', 'componentWillUnmount', 'componentDidUnmount', 'shouldStoreComponentUpdate', 'setState', 'triggerUpdate', 'delayed', 'pickProps', 'pickState', 'using', 'reactive'];
+const frameworkMemberNames = ['props', 'routeParams', 'routeData', 'parentComponent', 'childComponents', 'globalData', 'state', 'storeData', 'style', 'title', 'content', 'render', 'init', 'clientInit', 'serverInit', 'componentDidMount', 'componentDidHydrate', 'componentDidUpdate', 'componentDidRender', 'componentWillUnmount', 'componentDidUnmount', 'shouldStoreComponentUpdate', 'setState', 'triggerUpdate', 'pickProps', 'pickState', 'using', 'reactive', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval'];
 const frameworkMembers = new Set(frameworkMemberNames);
 /**
  * Constructs a component outside of any app and drives it the way the framework
@@ -91,7 +91,6 @@ ComponentType, ...args) {
     if (contentFunction === undefined) {
       throw new Error(`host(): ${ComponentType.name} has no content or render function.`);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the base declares the stateful (props, state) shape for both
     const call = contentFunction;
     const result = simple ? call(component.props) : call(component.props, stateful.state);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- ContentOf recovers the concrete component's own return type

package/dist/testing/hydrateTestApp.js

@@ -109,8 +109,8 @@ class HydrateTestAppImplementation {
  */
 export async function hydrateTestApp(RootComponent, ...args) {
   await waitForEnvIfLoading();
-  const options = args[0]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-  const suppliedDocument = options?.document ?? globalThis.document; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  const options = args[0];
+  const suppliedDocument = options?.document ?? globalThis.document;
   if (suppliedDocument === undefined) {
     // eslint-disable-line @typescript-eslint/no-unnecessary-condition
     throw new Error('hydrateTestApp() requires options.document when no global document is available.');
@@ -134,7 +134,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
   const clientProps = options?.props ?? {}; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   const serverProps = options?.serverProps ?? clientProps;
   const location = options?.location ?? '/';
-  const globalData = options?.globalData ?? {}; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  const globalData = options?.globalData ?? {};
   const matchedRouteInfo = {
     key: null,
     params: options?.routeParams ?? {},
@@ -167,9 +167,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
       stores,
       storeSubscriptions
     } = initStores(location, null, globalData, matchedRouteInfo);
-    const ssrInstance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes,
-    // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-    internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, {
+    const ssrInstance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, {
       document,
       window: document.defaultView,
       scheduler: ssrScheduler,
@@ -213,9 +211,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
     scheduler,
     navigation: false
   };
-  const instance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes,
-  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-  internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, runtimeContext);
+  const instance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, runtimeContext);
   try {
     for (const override of options?.stores ?? []) {
       const store = override.registration.getStore(instance.stores);

package/dist/update/guardedUpdate.d.ts

@@ -0,0 +1,9 @@
+import type { UpdateResult } from './UpdateResult.js';
+export type UpdateGuardHost = {
+    __unmountStarted: boolean;
+    __currentUpdate?: Promise<UpdateResult>;
+    __nextUpdate?: Promise<UpdateResult>;
+    __cancelledUpdateResult: () => UpdateResult;
+};
+export declare function guardedUpdate(host: UpdateGuardHost, run: () => Promise<UpdateResult>): Promise<UpdateResult>;
+//# sourceMappingURL=guardedUpdate.d.ts.map

package/dist/update/guardedUpdate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"guardedUpdate.d.ts","sourceRoot":"","sources":["../../src/update/guardedUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,MAAM,eAAe,GAAG;IAC1B,gBAAgB,EAAE,OAAO,CAAA;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IACvC,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IACpC,uBAAuB,EAAE,MAAM,YAAY,CAAA;CAC9C,CAAA;AAKD,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAiB5G"}

package/dist/update/guardedUpdate.js

@@ -0,0 +1,20 @@
+// One update per component at a time. A request while one is in flight gets a single rerun
+// after it, shared by every such request: writes landing mid-update coalesce, and no update
+// reconciles against a tree the in-flight one is about to replace (overlappingUpdate test).
+export function guardedUpdate(host, run) {
+  const current = host.__currentUpdate;
+  if (current !== undefined) {
+    host.__nextUpdate ??= current.then(rerun, rerun);
+    return host.__nextUpdate;
+  }
+  const update = run().finally(() => {
+    if (host.__currentUpdate === update) delete host.__currentUpdate;
+  });
+  host.__currentUpdate = update;
+  return update;
+  function rerun() {
+    delete host.__nextUpdate;
+    if (host.__unmountStarted) return host.__cancelledUpdateResult();
+    return guardedUpdate(host, run);
+  }
+}