tungsten 0.6.3 → 0.7.1

package/dist/getUserConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserConfig.d.ts","sourceRoot":"","sources":["../src/getUserConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAU7F,wBAAsB,aAAa,CAC/B,SAAS,GAAE,wBAAwB,GAAG,IAAW,EACjD,MAAM,GAAE,QAAQ,GAAG,OAAiB,GACrC,OAAO,CAAC,uBAAuB,CAAC,CA4BlC"}
+{"version":3,"file":"getUserConfig.d.ts","sourceRoot":"","sources":["../src/getUserConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAU7F,wBAAsB,aAAa,CAC/B,SAAS,GAAE,wBAAwB,GAAG,IAAW,EACjD,MAAM,GAAE,QAAQ,GAAG,OAAiB,GACrC,OAAO,CAAC,uBAAuB,CAAC,CA2BlC"}

package/dist/hmr/applyHmrModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyHmrModule.d.ts","sourceRoot":"","sources":["../../src/hmr/applyHmrModule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,MAAM,MAAM,oBAAoB,GACxB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAsB3C,wBAAsB,cAAc,CAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GACtD,OAAO,CAAC,oBAAoB,CAAC,CAkD/B"}
+{"version":3,"file":"applyHmrModule.d.ts","sourceRoot":"","sources":["../../src/hmr/applyHmrModule.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,MAAM,MAAM,oBAAoB,GACxB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAsB3C,wBAAsB,cAAc,CAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GACtD,OAAO,CAAC,oBAAoB,CAAC,CAkD/B"}

package/dist/hmr/componentIdentity.js

@@ -1,7 +1,7 @@
 import { AnyComponentIsFunctionComponentStandIn } from '../AnyComponent.js';
 import { AnyComponentTypeIsClassComponentType } from '../AnyComponentType.js';
 export function componentTypeIdentityKey(Type) {
-  return Type.tagName || Type.name || Type.displayName || '--unnamed--';
+  return Type.tagName || Type.name || Type.displayName || '--unnamed--'; // eslint-disable-line @typescript-eslint/strict-boolean-expressions
 }
 export function componentTypeKind(Type) {
   return AnyComponentTypeIsClassComponentType(Type) ? 'class' : 'function';

package/dist/hooks/getCurrentComponent.d.ts

@@ -1,4 +1,4 @@
-import type { FunctionComponentStandInAny } from 'tungsten/FunctionComponentStandIn.js';
+import type { FunctionComponentStandInAny } from '../FunctionComponentStandIn.js';
 import type { FunctionElement } from '../FunctionComponentStandIn.js';
 declare global {
     let __tungsten_current_function_component_stand_in: FunctionComponentStandInAny;

package/dist/hooks/getCurrentComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCurrentComponent.d.ts","sourceRoot":"","sources":["../../src/hooks/getCurrentComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAA;AAEvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAMrE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,8CAA8C,EAAE,2BAA2B,CAAA;CAClF;AAED,wBAAgB,mBAAmB,IAAI,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAc/D"}
+{"version":3,"file":"getCurrentComponent.d.ts","sourceRoot":"","sources":["../../src/hooks/getCurrentComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAMrE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,8CAA8C,EAAE,2BAA2B,CAAA;CAClF;AAED,wBAAgB,mBAAmB,IAAI,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAc/D"}

package/dist/hydrate/hydrate.d.ts

@@ -1,5 +1,8 @@
 import type { InstanceConfig } from '../Instance/InstanceConfig.js';
 import type { AppRoutes } from '../routing/AppRoutes.js';
+import type { Routes } from '../routing/Routes.js';
+import type { MatchedRouteInfo } from '../routing/MatchedRouteInfo.js';
+import type { NetworkMatchedRouteInfo } from './hydrateGlobalData.js';
 import { DomPointer } from '../DomPointer.js';
 import { type TungstenBaseComponentType } from '../Components.jsx';
 import { Instance } from '../Instance/Instance.js';
@@ -11,6 +14,7 @@ export type HydrateMeta = {
     selectValue: unknown;
 };
 export declare function makeDefaultHydrateMeta(): HydrateMeta;
-export declare function hydrate(appRoutes: AppRoutes, RootComponent: TungstenBaseComponentType | null, instanceConfig: InstanceConfig): Promise<void>;
+export declare function hydrate(appRoutes: AppRoutes<any>, RootComponent: TungstenBaseComponentType | null, instanceConfig: InstanceConfig, fileVersions?: Record<string, string>): Promise<void>;
+export declare function hydrationRouting(matchedRouteInfo: NetworkMatchedRouteInfo, routes: Routes<any>): MatchedRouteInfo;
 export declare function hydrateRootComponent<ComponentType extends TungstenBaseComponentType<any, any>>(instance: Instance, RootComponent: ComponentType, domPointer: DomPointer, meta: HydrateMeta, props?: InstanceType<ComponentType>['props'], routeParams?: Record<string, string>, routeData?: unknown): Promise<InstanceType<ComponentType>>;
 //# sourceMappingURL=hydrate.d.ts.map

package/dist/hydrate/hydrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAoCxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAO7C,OAAO,EAGH,KAAK,yBAAyB,EAEjC,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAmBlD,OAAO,EAC4B,KAAK,uBAAuB,EAC9D,MAAM,oCAAoC,CAAA;AAS3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBA4DjC;AAyBD,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAM,EAChD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}
+{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAuBrE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAO7C,OAAO,EACH,KAAK,yBAAyB,EAEjC,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAuBlD,OAAO,EACH,KAAK,uBAAuB,EAE/B,MAAM,oCAAoC,CAAA;AAc3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,EAC9B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,iBAuFxC;AAED,wBAAgB,gBAAgB,CAC5B,gBAAgB,EAAE,uBAAuB,EAEzC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,GACpB,gBAAgB,CAiBlB;AAED,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAM,EAChD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}

package/dist/hydrate/hydrate.js

@@ -1,4 +1,4 @@
-import { initStores } from 'tungsten/Servers/initStores.js';
+import { initStores } from '../Servers/initStores.js';
 import { applyUpdate, integrateElementUpdateVdom } from '../update/integrateUpdateVdom.js';
 //import type { RouteType } from '../routing/RouteType.js'
 import { $number, $string, makeRenderedContentNodeNonRendered, makeRenderedContentNodeClassComponent, makeRenderedContentNodeFunctionComponent } from '../RenderedContentNode.js';
@@ -29,12 +29,19 @@ import { MatchedRoute } from '../routing/MatchedRoute.js';
 import { isDev } from '../isDev.js';
 import { isProd } from '../isProd.js';
 import { urlToLocation } from '../routing/routeUrl.js';
+import { toRoutes } from '../routing/routesArray.js';
 import { warn } from '../appOutput.js';
 import { reconcileHydratedAttributes } from './reconcileHydratedAttributes.js';
 import { markOptionSelected } from '../markOptionSelected.js';
+import { JSONstringify } from '../json.js';
 import { renderHydrationMismatchBanner } from './renderHydrationMismatchBanner.js';
 import { setCurrentInstance } from '../hmr/instanceRegistry.js';
+import { createContext } from '../context/registerContext.js';
 import { renderDocInitErrorBanner } from '../docInit.js';
+import { globalDataFunc } from '../routing/registerGlobalData.js';
+import { createNetworkedData } from '../routing/routingRegistry.js';
+import { routing } from "../Servers/routing.js";
+import { stubRouting } from './stubRouting.js';
 // side-effect only: pulls applyHmrModule.js (and its clean, non-dynamic-import dependencies)
 // into the framework's traced dependency graph so it gets copied to .packages/ and is servable
 // to the browser. It is invoked from a raw, untraced inline script (processHead.ts) instead of
@@ -54,22 +61,44 @@ export function makeDefaultHydrateMeta() {
     selectValue: undefined
   };
 }
-export async function hydrate(appRoutes, RootComponent, instanceConfig) {
+export async function hydrate(appRoutes, RootComponent, instanceConfig, fileVersions) {
   debug('hydrate start');
   // first, before any component is built: a DocInit that threw in the head is on screen whatever
   // happens next (a read of its value throws below). Rendered again at the end, for the count.
   if (isDev) renderDocInitErrorBanner();
   //console.log('hydration global data ', __tungsten_global_data__)
-  const location = urlToLocation(window.location, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
-  const routes = typeof appRoutes === 'function' ? appRoutes(null) : appRoutes;
-  const matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
-  const globalData = __tungsten_global_data__;
+  let location = urlToLocation(window.location, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
+  // one for the page: navigation keeps this instance, and so this context
+  const context = createContext('client', null);
+  const stub = instanceConfig.serverSideRouting === false;
+  // carried over from the server's render, not rebuilt: the client has no request to build from.
+  // A stub page carries none, so the client makes its own
+  const networkedData = stub ? createNetworkedData(null, context) : __tungsten_networked_data__;
+  const routes = toRoutes(typeof appRoutes === 'function' ? appRoutes(null, context, networkedData) : appRoutes, isDev);
+  let matchedRouteInfo;
+  let globalData;
+  if (stub) {
+    // as a client navigation fetches: the global data beside routing
+    const [fetched, routed] = await Promise.all([globalDataFunc.value?.(null, context, networkedData) ?? {}, stubRouting(location, to => routing(to, routes, context, networkedData), instanceConfig)]);
+    if (routed === null) return;
+    ({
+      location,
+      matchedRouteInfo
+    } = routed);
+    globalData = fetched;
+  } else {
+    matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
+    globalData = __tungsten_global_data__;
+  }
   const {
     internalStore,
     stores,
     storeSubscriptions
-  } = initStores(location, null, globalData, matchedRouteInfo);
+  } = initStores(location, null, globalData, matchedRouteInfo, null, context, networkedData);
   const instance = new Instance(location, instanceConfig, null, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+  instance.fileVersions = fileVersions;
+  instance.context = context;
+  instance.networkedData = networkedData;
   if (isDev) setCurrentInstance(instance);
   //const routes = instance.getRoutes()
   // we know which route was matched
@@ -77,7 +106,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   //     instance.routerData = __tungsten_router_data__
   // }
   // save the route data
-  if (typeof __tungsten_route_data__ !== 'undefined') {
+  if (!stub && typeof __tungsten_route_data__ !== 'undefined') {
     instance.routeData = __tungsten_route_data__;
   }
   const domPointer = new DomPointer(document, 1);
@@ -102,7 +131,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   //// Can we pause any further update until hydration completes, to retain coherency?
   //// Or should we set a value on each component that is hydrating to guarantee correctness? seems better
 }
-function hydrationRouting(matchedRouteInfo,
+export function hydrationRouting(matchedRouteInfo,
 //location: string,
 routes) {
   const {
@@ -180,7 +209,8 @@ function handleRootTitle(rootElement) {
     } else if (rootElement instanceof TungstenSignalsComponent) {
       rootElement.__instance.setDefaultTitle(rootElement.title(rootElement.props, rootElement.signals).toString());
     } else {
-      rootElement.__instance.setDefaultTitle(rootElement.title(rootElement.props, undefined).toString());
+      const title = rootElement.title(rootElement.props, undefined); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+      rootElement.__instance.setDefaultTitle(title.toString());
     }
   } else {
     rootElement.__instance.setDefaultTitle(rootElement.title.toString());
@@ -505,7 +535,7 @@ parentElement, domPointer, instance, meta) {
     //     node[$props].ref.current = domNode
     // }
     debug('hydarating atts');
-    hydrateAttributes(node, domNode, meta);
+    hydrateAttributes(node, domNode, meta, instance);
     //!!! node.domElement = domNode
     // look up any refs
     //const props = node[$props]
@@ -519,12 +549,14 @@ parentElement, domPointer, instance, meta) {
     const outerSelectValue = meta.selectValue;
     if (node[$type] === 'select') meta.selectValue = node[$props].value;
     let renderedChildren = $contentNull;
-    if (node[$type] === 'body' && instance.config.csr) {
-      // CSR: body shipped empty on purpose, nothing to hydrate against - create fresh.
+    // CSR: body shipped empty on purpose, nothing to hydrate against - create fresh. A stub
+    // page (serverSideRouting false) ships the head without the app's children too
+    const fresh = node[$type] === 'body' && instance.config.csr || node[$type] === 'head' && instance.config.serverSideRouting === false;
+    if (fresh) {
       if (parentElement === null) {
-        throwError('hydrateNodeSingle', 'CSR hydration reached <body> with no owning component');
+        throwError('hydrateNodeSingle', `CSR hydration reached <${node[$type]}> with no owning component`);
       }
-      const childDomPointer = new DomPointer(domNode);
+      const childDomPointer = new DomPointer(domNode, node[$type] === 'head' ? appHeadChildrenStart(domNode) : 0);
       renderedChildren = await applyUpdate({
         tungstenElement: parentElement,
         instance,
@@ -558,7 +590,7 @@ parentElement, domPointer, instance, meta) {
   }
   // confirm that this code is not reached
   const n = node; // eslint-disable-line @typescript-eslint/no-unused-vars
-  throwError('hydrateNodeSingle', `should never occur ${JSON.stringify(node)}`);
+  throwError('hydrateNodeSingle', `should never occur ${JSONstringify(node)}`);
   // TS shouldn't require this, because this code will never run, but it is bitching without it
   //return makeRenderedContentNodeNonRendered()
 }
@@ -580,7 +612,7 @@ async function hydrateNodeComponent(node, parentElement, domPointer, instance, m
 }
 // export type HTMLBindableElement = HTMLButtonElement | HTMLDataElement | HTMLInputElement | HTMLLIElement
 // | HTMLMeterElement | HTMLOptionElement | HTMLParamElement | HTMLProgressElement | HTMLSelectElement | HTMLTextAreaElement
-function hydrateAttributes(node, domNode, meta) {
+function hydrateAttributes(node, domNode, meta, instance) {
   // handle bind attributes and merge together event handlers
   processAttributes(node);
   // The two prop rewrites the server does before it writes any markup (processRenderingNodeHtml).
@@ -614,9 +646,9 @@ function hydrateAttributes(node, domNode, meta) {
         ...mismatch
       });
       if (isDev) {
-        warn(`hydration mismatch on <${node[$type]}>:` + ` ${mismatch.name} rendered as ${JSON.stringify(mismatch.expected)}` + ` but the server sent ${JSON.stringify(mismatch.actual)}.` + ` The rendered value has been applied.`);
+        warn(`hydration mismatch on <${node[$type]}>:` + ` ${mismatch.name} rendered as ${JSONstringify(mismatch.expected)}` + ` but the server sent ${JSONstringify(mismatch.actual)}.` + ` The rendered value has been applied.`);
       }
-    });
+    }, instance);
   }
   debug('--\nhydrateAttributes', domNode);
   for (const key in node[$props]) {
@@ -641,13 +673,13 @@ function hydrateAttributes(node, domNode, meta) {
       const eventName = 'input';
       if (node[$type] in bindableHtmlElementsString) {
         debug('binding');
-        const [bindObject, bindKey] = node[$props][key];
+        const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
         domNode.value = bindObject[bindKey] ?? ''; // nullish coalesce to avoid putting undef/null into elements
         let handler;
-        if ('filter' in node[$props]) {
-          const filterFunc = node[$props].filter;
+        if ('convert' in node[$props]) {
+          const convertFunc = node[$props].convert;
           handler = async event => {
-            bindObject[bindKey] = await filterFunc(event.target.value, event);
+            bindObject[bindKey] = await convertFunc(event.target.value, event);
           };
         } else {
           handler = event => {
@@ -659,13 +691,13 @@ function hydrateAttributes(node, domNode, meta) {
         domNode[htmlEventHandlerKey(eventName)] = handler;
       } else if (node[$type] in bindableHtmlElementsNumber) {
         debug('binding');
-        const [bindObject, bindKey] = node[$props][key];
+        const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
         domNode.value = bindObject[bindKey] ?? ''; // nullish coalesce to avoid putting undef/null into elements
         let handler;
-        if ('filter' in node[$props]) {
-          const filterFunc = node[$props].filter;
+        if ('convert' in node[$props]) {
+          const convertFunc = node[$props].convert;
           handler = async event => {
-            bindObject[bindKey] = await filterFunc(event.target.value, event);
+            bindObject[bindKey] = await convertFunc(event.target.value, event);
           };
         } else {
           handler = event => {
@@ -683,10 +715,10 @@ function hydrateAttributes(node, domNode, meta) {
       domNode.checked = bindObject[bindKey];
       const eventName = 'input';
       //let handler
-      // if ('filterChecked' in node[$props]) {
-      //     const filterFunc = node[$props].filterChecked as FilterCheckedFunc<any, any>
+      // if ('convertChecked' in node[$props]) {
+      //     const convertFunc = node[$props].convertChecked as ConvertCheckedFunc<any, any>
       //     handler = async (event: Event) => {
-      //         bindObject[bindKey] = await filterFunc((event.target as HTMLCheckedBindableElement).checked, event)
+      //         bindObject[bindKey] = await convertFunc((event.target as HTMLCheckedBindableElement).checked, event)
       //     }
       // } else {
       const handler = event => {
@@ -705,11 +737,11 @@ function hydrateAttributes(node, domNode, meta) {
       domNode.checked = node[$props].value === bindObject[bindKey];
       const eventName = 'change';
       //let handler
-      // if ('filter' in node[$props]) {
-      //     const filterFunc = node[$props].filter as FilterCheckedFunc<any, any> // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+      // if ('convert' in node[$props]) {
+      //     const convertFunc = node[$props].convert as ConvertCheckedFunc<any, any> // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       //     handler = async (event: HTMLElementEventMap['change']) => {
       //         console.log('radio changed handler')
-      //         bindObject[bindKey] = await filterFunc((event.target as HTMLCheckedBindableElement).checked, event) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+      //         bindObject[bindKey] = await convertFunc((event.target as HTMLCheckedBindableElement).checked, event) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       //     }
       // } else {
       const handler = event => {
@@ -729,9 +761,9 @@ function hydrateAttributes(node, domNode, meta) {
 //
 // This process some details related to binding.
 // Bind (value) is using onInput
-// if an onInput handler exists, we combine the two, running the binding and filtering before the onInput
+// if an onInput handler exists, we combine the two, running the binding and conversion before the onInput
 // Bind (checked) is using onChange
-// if an onChange handler exists, we combine the two, running the binding and filtering before the onChange
+// if an onChange handler exists, we combine the two, running the binding and conversion before the onChange
 // If we were to have 2 separate bindings using the same event, the system should work to marge all event handlers together
 // the execution order of the bind events would probably match the order of the props
 function processAttributes(node) {
@@ -744,13 +776,14 @@ function processAttributes(node) {
       const eventName = 'onInput';
       if (node[$type] in bindableHtmlElementsString) {
         debug('binding');
-        const [bindObject, bindKey] = props[key];
-        props.value = bindObject[bindKey] ?? ''; // nullish coalesce to avoid putting undef/null into elements
+        const [bindObject, bindKey] = props[key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        // nullish coalesce to avoid putting undef/null into elements
+        props.value = bindObject[bindKey] ?? ''; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
         let handler;
-        if ('filter' in props) {
-          const filterFunc = props.filter;
+        if ('convert' in props) {
+          const convertFunc = props.convert;
           handler = async event => {
-            bindObject[bindKey] = await filterFunc(event.target.value, event);
+            bindObject[bindKey] = await convertFunc(event.target.value, event);
           };
         } else {
           handler = event => {
@@ -770,13 +803,14 @@ function processAttributes(node) {
         //domNode[htmlEventHandlerKey(eventName)] = handler
       } else if (node[$type] in bindableHtmlElementsNumber) {
         debug('binding');
-        const [bindObject, bindKey] = node[$props][key];
-        props.value = bindObject[bindKey] ?? ''; // nullish coalesce to avoid putting undef/null into elements
+        const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        // nullish coalesce to avoid putting undef/null into elements
+        props.value = bindObject[bindKey] ?? ''; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
         let handler;
-        if ('filter' in node[$props]) {
-          const filterFunc = node[$props].filter;
+        if ('convert' in node[$props]) {
+          const convertFunc = node[$props].convert;
           handler = async event => {
-            bindObject[bindKey] = await filterFunc(event.target.value, event);
+            bindObject[bindKey] = await convertFunc(event.target.value, event);
           };
         } else {
           handler = event => {
@@ -796,18 +830,18 @@ function processAttributes(node) {
         //domNode[htmlEventHandlerKey(eventName)] = handler
       }
       delete props.bind;
-      delete props.filter;
+      delete props.convert;
     } else if (key === 'bindChecked' && ContentNodeElementIsHtml(node)) {
       // not checking that el is bindable, don't think its necessary
       debug('binding checked');
       const eventName = 'onChange';
-      const [bindObject, bindKey] = props[key];
+      const [bindObject, bindKey] = props[key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       props.checked = checkedValueToBoolean(bindObject[bindKey]);
       let handler;
-      if ('filterChecked' in props) {
-        const filterFunc = props.filterChecked;
+      if ('convertChecked' in props) {
+        const convertFunc = props.convertChecked;
         handler = async event => {
-          bindObject[bindKey] = await filterFunc(event.target.checked, event);
+          bindObject[bindKey] = await convertFunc(event.target.checked, event);
         };
       } else {
         handler = event => {
@@ -828,12 +862,12 @@ function processAttributes(node) {
       // //domNode.addEventListener(eventName, handler)
       // domNode[htmlEventHandlerKey(eventName)] = handler
       delete props.bindChecked;
-      delete props.filterChecked;
+      delete props.convertChecked;
     } else if (key === 'bindRadio' && ContentNodeElementIsHtml(node)) {
       // not checking that el is bindable, don't think its necessary
       debug('binding radio');
       const eventName = 'onChange';
-      const [bindObject, bindKey] = props[key];
+      const [bindObject, bindKey] = props[key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       props.checked = bindObject[bindKey] === node[$props].value;
       const handler = event => {
         //console.log('bound radio changed 2')

package/dist/hydrate/hydrateGlobalData.d.ts

@@ -1,8 +1,9 @@
-import type { GlobalData } from '../routing/registerGlobalData.js';
-import type { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
+import type { MatchedRouteInfo } from '../routing/MatchedRouteInfo.js';
+import type { BrandedGlobalData, BrandedNetworkedData } from '../Brands.js';
 export type NetworkMatchedRouteInfo = Omit<MatchedRouteInfo, 'content'>;
 declare global {
-    let __tungsten_global_data__: GlobalData;
+    let __tungsten_global_data__: BrandedGlobalData;
+    let __tungsten_networked_data__: BrandedNetworkedData;
     let __tungsten_matched_route_info__: NetworkMatchedRouteInfo;
     let __tungsten_route_data__: unknown;
 }

package/dist/hydrate/hydrateGlobalData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrateGlobalData.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrateGlobalData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAGtE,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;AAEvE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,wBAAwB,EAAE,UAAU,CAAA;IACxC,IAAI,+BAA+B,EAAE,uBAAuB,CAAA;IAE5D,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACvC"}
+{"version":3,"file":"hydrateGlobalData.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrateGlobalData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAG3E,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;AAEvE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,wBAAwB,EAAE,iBAAiB,CAAA;IAE/C,IAAI,2BAA2B,EAAE,oBAAoB,CAAA;IACrD,IAAI,+BAA+B,EAAE,uBAAuB,CAAA;IAE5D,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACvC"}

package/dist/hydrate/reconcileHydratedAttributes.d.ts

@@ -1,4 +1,5 @@
 import type { ContentNodeHtml } from '../ContentNode.js';
+import { type VersionSource } from '../fileVersions.js';
 export type AttributeMismatch = {
     name: string;
     /** The value the client rendered, or null when it renders no such attribute. */
@@ -20,5 +21,5 @@ export type AttributeMismatch = {
  * `processProps()`, the same function that produced the markup being compared
  * against, so a matching element costs one attribute read each and no writes.
  */
-export declare function reconcileHydratedAttributes(node: ContentNodeHtml, domNode: HTMLElement, onMismatch?: (mismatch: AttributeMismatch) => void): void;
+export declare function reconcileHydratedAttributes(node: ContentNodeHtml, domNode: HTMLElement, onMismatch?: (mismatch: AttributeMismatch) => void, versions?: VersionSource): void;
 //# sourceMappingURL=reconcileHydratedAttributes.d.ts.map

package/dist/hydrate/reconcileHydratedAttributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reconcileHydratedAttributes.d.ts","sourceRoot":"","sources":["../../src/hydrate/reconcileHydratedAttributes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAMxD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,gFAAgF;IAChF,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB,CAAA;AA6BD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACvC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,GACnD,IAAI,CAuCN"}
+{"version":3,"file":"reconcileHydratedAttributes.d.ts","sourceRoot":"","sources":["../../src/hydrate/reconcileHydratedAttributes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGxD,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAI1E,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,gFAAgF;IAChF,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,2EAA2E;IAC3E,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB,CAAA;AA6BD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACvC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,EAClD,QAAQ,CAAC,EAAE,aAAa,GACzB,IAAI,CAuCN"}

package/dist/hydrate/reconcileHydratedAttributes.js

@@ -1,5 +1,6 @@
 import { $props } from '../contentNodeSymbols.js';
 import { processProps } from '../render/processProps.js';
+import { versionAttributes } from '../fileVersions.js';
 import { booleanAttributeValue } from '../booleanAttributeValue.js';
 /**
  * The attribute value a render produces for a prop, or null for "no attribute".
@@ -39,7 +40,7 @@ function setAttribute(domNode, name, value) {
  * `processProps()`, the same function that produced the markup being compared
  * against, so a matching element costs one attribute read each and no writes.
  */
-export function reconcileHydratedAttributes(node, domNode, onMismatch) {
+export function reconcileHydratedAttributes(node, domNode, onMismatch, versions) {
   // A copy: processProps() rewrites what it is given, and these props stay in
   // the content tree for the next update to diff against. children is pulled out
   // first, same as the server renderer (renderingTreeToHtml.ts) and the client
@@ -50,9 +51,9 @@ export function reconcileHydratedAttributes(node, domNode, onMismatch) {
     children: _children,
     ...restProps
   } = node[$props];
-  const expected = processProps({
+  const expected = versionAttributes(processProps({
     ...restProps
-  });
+  }), versions);
   const handled = new Set();
   for (const name in expected) {
     handled.add(name.toLowerCase());

package/dist/hydrate/renderHydrationMismatchBanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderHydrationMismatchBanner.d.ts","sourceRoot":"","sources":["../../src/hydrate/renderHydrationMismatchBanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAIzE,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAK7E,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAE9E,eAAO,MAAM,yBAAyB,kCAAkC,CAAA;AAIxE,wBAAgB,6BAA6B,CACzC,UAAU,EAAE,SAAS,uBAAuB,EAAE,EAC9C,GAAG,GAAE,QAAmB,GACzB,IAAI,CAUN"}
+{"version":3,"file":"renderHydrationMismatchBanner.d.ts","sourceRoot":"","sources":["../../src/hydrate/renderHydrationMismatchBanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAKzE,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAK7E,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAE9E,eAAO,MAAM,yBAAyB,kCAAkC,CAAA;AAIxE,wBAAgB,6BAA6B,CACzC,UAAU,EAAE,SAAS,uBAAuB,EAAE,EAC9C,GAAG,GAAE,QAAmB,GACzB,IAAI,CAUN"}

package/dist/hydrate/renderHydrationMismatchBanner.js

@@ -1,4 +1,5 @@
 import { renderDevBanner } from '../devBanner.js';
+import { JSONstringify } from '../json.js';
 // The report as an attribute on <html>: a machine-readable hook (tests, tooling, app styling)
 // that no Tungsten bookkeeping ever touches - updateAttributes diffs against its own record of
 // what it last set, never the DOM's live attribute list, so this is never visited or removed.
@@ -10,7 +11,7 @@ export const hydrationMismatchBannerId = 'tungsten-hydration-mismatches';
 export function renderHydrationMismatchBanner(mismatches, doc = document) {
   if (mismatches.length === 0) return;
   const heading = `Tungsten: ${mismatches.length} hydration mismatch${mismatches.length === 1 ? '' : 'es'} (dev only)`;
-  const lines = mismatches.map(mismatch => `<${mismatch.tagName}> ${mismatch.name}: ` + `rendered ${JSON.stringify(mismatch.expected)}, server sent ${JSON.stringify(mismatch.actual)}`);
+  const lines = mismatches.map(mismatch => `<${mismatch.tagName}> ${mismatch.name}: ` + `rendered ${JSONstringify(mismatch.expected)}, server sent ${JSONstringify(mismatch.actual)}`);
   const report = [heading, ...lines].join('\n');
   doc.documentElement.setAttribute(hydrationMismatchAttribute, report);
   renderDevBanner(hydrationMismatchBannerId, report, doc);

package/dist/hydrate/stubRouting.d.ts

@@ -0,0 +1,8 @@
+import type { InstanceConfig } from '../Instance/InstanceConfig.js';
+import type { MatchedRouteInfo } from '../routing/MatchedRouteInfo.js';
+export type StubRouted = {
+    location: string;
+    matchedRouteInfo: MatchedRouteInfo;
+};
+export declare function stubRouting(location: string, route: (location: string) => Promise<MatchedRouteInfo>, instanceConfig: InstanceConfig): Promise<StubRouted | null>;
+//# sourceMappingURL=stubRouting.d.ts.map

package/dist/hydrate/stubRouting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stubRouting.d.ts","sourceRoot":"","sources":["../../src/hydrate/stubRouting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAOtE,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,CAAA;AAKjF,wBAAsB,WAAW,CAC7B,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,EACxE,cAAc,EAAE,cAAc,GAC/B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAgB5B"}

package/dist/hydrate/stubRouting.js

@@ -0,0 +1,25 @@
+import { isProd } from '../isProd.js';
+import { redirectOf } from '../routing/redirectOf.js';
+import { routeKeyToUrl } from '../routing/routeUrl.js';
+import { TungstenError } from '../TungstenError.js';
+// config.serverSideRouting false: the page's first routing is the client's, with its route data. A
+// redirect to a route routes again, the address bar replaced, before anything is built; one to a
+// URL leaves the page, and gives null
+export async function stubRouting(location, route, instanceConfig) {
+  for (let hops = 0; hops <= 10; hops++) {
+    const matchedRouteInfo = await route(location);
+    const redirection = redirectOf(matchedRouteInfo);
+    if (redirection === undefined) return {
+      location,
+      matchedRouteInfo
+    };
+    if ('url' in redirection) {
+      window.location.replace(redirection.url);
+      return null;
+    }
+    location = redirection.route;
+    const url = routeKeyToUrl(redirection.route, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
+    window.history.replaceState(null, '', url);
+  }
+  throw new TungstenError(`Routing '${location}' redirected more than 10 times`);
+}

package/dist/importDevModuleWithRetry.d.ts

@@ -1,3 +1,4 @@
+import { type ModuleNamespace } from './importModule.js';
 export declare function isTransientDevModuleError(e: unknown): boolean;
-export declare function importDevModuleWithRetry(url: string, attempts?: number, delayMs?: number): Promise<any>;
+export declare function importDevModuleWithRetry(url: string, attempts?: number, delayMs?: number): Promise<ModuleNamespace>;
 //# sourceMappingURL=importDevModuleWithRetry.d.ts.map

package/dist/importDevModuleWithRetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importDevModuleWithRetry.d.ts","sourceRoot":"","sources":["../src/importDevModuleWithRetry.ts"],"names":[],"mappings":"AAuBA,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAU7D;AAMD,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,MAAM,EACX,QAAQ,SAAK,EACb,OAAO,SAAM,GACd,OAAO,CAAC,GAAG,CAAC,CAUd"}
+{"version":3,"file":"importDevModuleWithRetry.d.ts","sourceRoot":"","sources":["../src/importDevModuleWithRetry.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAMtE,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAU7D;AAMD,wBAAsB,wBAAwB,CAC1C,GAAG,EAAE,MAAM,EACX,QAAQ,SAAK,EACb,OAAO,SAAM,GACd,OAAO,CAAC,eAAe,CAAC,CAU1B"}

package/dist/importDevModuleWithRetry.js

@@ -16,6 +16,7 @@
 // than tuned to a happy-path guess. There's no precise "compile cycle
 // finished" signal plumbed through to here to await instead; this is a
 // bounded heuristic, not a proper synchronization fix.
+import { importModule } from './importModule.js';
 // Exported so other dev-only tools (the error page's auto-retry script - see
 // devErrorPageAutoRetry.ts) can recognize the same transient shape without
 // duplicating the heuristic.
@@ -37,7 +38,7 @@ export async function importDevModuleWithRetry(url, attempts = 30, delayMs = 250
   for (let attempt = 0;; attempt++) {
     try {
       const attemptUrl = attempt === 0 ? url : `${url}${url.includes('?') ? '&' : '?'}retryAttempt=${attempt}`;
-      return await import(attemptUrl);
+      return await importModule(attemptUrl);
     } catch (e) {
       if (attempt >= attempts - 1 || !isTransientDevModuleError(e)) throw e;
       await delay(delayMs);

package/dist/importModule.d.ts

@@ -0,0 +1,3 @@
+export type ModuleNamespace = Record<string, unknown>;
+export declare function importModule(specifier: string): Promise<ModuleNamespace>;
+//# sourceMappingURL=importModule.d.ts.map

package/dist/importModule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"importModule.d.ts","sourceRoot":"","sources":["../src/importModule.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAGrD,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAE9E"}

package/dist/importModule.js

@@ -0,0 +1,4 @@
+// specifier must be absolute - a relative one would resolve against this file
+export async function importModule(specifier) {
+  return await import(specifier); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- a module namespace is an object
+}

package/dist/index.js

@@ -3,4 +3,5 @@
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="../types/index.d.ts" preserve="true" />
 export * from './indexInner.js';
-export * as default from './indexInner.js'; // I can't remember why I did this
+export * as default from './indexInner.js'; // I think linking to indexInner may have been related to
+// offering a synchronous export for CJS