tungsten 0.3.1 → 0.3.3

package/dist/Servers/hono/ProdServerHono.js

@@ -1,11 +1,9 @@
-// import type { AddressInfo } from 'net'
-// //import express from 'express'
-// import { Hono } from 'hono'
-// import { serve } from '@hono/node-server'
-// import { Server } from 'http'
+// Status/known gaps: see ./README.md
+// import { Context, Hono } from 'hono'
+// import { serve, type ServerType } from '@hono/node-server'
+// import { serveStatic } from '@hono/node-server/serve-static'
 // import { join } from 'path'
 // import { existsSync } from 'fs'
-// //import { SxyServer } from './SxyServer.js'
 // import type { FrameworkConfigComplete } from '../../FrameworkConfig.js'
 // import type { CompilationInfo } from '../../build/CompilationInfo.js'
 // import type { ApiRoutes } from '../../api/ApiRoutes.js'
@@ -17,7 +15,6 @@
 // import { Framework } from '../../Framework.js'
 // import { TungstenError } from '../../TungstenError.js'
 // import { makeInstanceConfigFromFrameworkConfig } from '../../makeInstanceConfigFromFrameworkConfig.js'
-// //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
 // import { standardizeWebPath } from '../../standardizeWebPath.js'
 // import { throwError } from '../../throwError.js'
 // import { AnyComponentType } from '../../AnyComponentType.js'
@@ -27,11 +24,8 @@
 // import { globalDataFunc } from '../../routing/registerGlobalData.js'
 // import { ServerDataLoading } from '../../Store/ServerDataLoading.js'
 // import { ServerMiddleware } from '../ServerMiddleware.js'
-// import { TungstenServer } from '../TungstenServer.jsx'
 // import { portError } from '../portError.js'
 // import { initStores } from '../initStores.js'
-// import { RoutingRedirect } from '../../routing/RoutingRedirect.js'
-// import { RedirectComponent } from 'tungsten/components/RedirectComponent.js'
 // import { TungstenServerHono } from './TungstenServerHono.jsx'
 export {};
 // function debug(...texts: any[]) { // eslint-disable-line @typescript-eslint/no-unused-vars
@@ -43,15 +37,11 @@ export {};
 //     compilationInfo: CompilationInfo
 //     appRoutes: AppRoutes
 //     RootComponentOrNull: AnyComponentType | null
-//     // projectDir: string
-//     // prodBuildLocation: string
-//     // bundleLocation: string
-//     //port: number
 //     location: string | null = null
-//     app: express.Application
+//     app: Hono
 //     apiRoutesPromise?: Promise<ApiRoutes>
 //     apiRoutes?: ApiRoutes
-//     server?: Server
+//     server?: ServerType
 //     constructor(
 //         framework: Framework,
 //         config: FrameworkConfigComplete,
@@ -66,40 +56,29 @@ export {};
 //         this.compilationInfo = compilationInfo
 //         this.appRoutes = appRoutes
 //         this.RootComponentOrNull = RootComponentOrNull
-//         // if (tungstenPrivateEnv.TUNGSTEN_SERVER_PORT === -999) {
-//         //     throwError('ProdServer', 'TUNGSTEN_SERVER_PORT environment variable has not been set')
-//         // }
-//         // !! I wrote this line while drunk. Please check this over. I think its wrong
-//         //const _port = Number((typeof tungstenPrivateEnv !== 'undefined')
-//         //    ? tungstenPrivateEnv.TUNGSTEN_SERVER_PORT
-//         //    : process.env.TUNGSTEN_SERVER_PORT)
-//         // seems like all we need is:
-//         this.app = express()
+//         this.app = new Hono()
 //         if (tungstenPrivateEnv.DEBUG === true) {
 //             let reqId = 0
-//             this.app.use((req, res, next) => {
+//             this.app.use(async (c, next) => {
 //                 reqId++
-//                 cliDebug(`Received request [${reqId}] for ${req.url}`)
-//                 next()   
+//                 cliDebug(`Received request [${reqId}] for ${c.req.url}`)
+//                 await next()
 //             })
 //         }
 //         const requestLog = (tungstenPrivateEnv.DEBUG === true)
 //         const originMismatchWarning = (this.config.suppressOriginMismatchWarning !== true)
 //         if (requestLog || originMismatchWarning) {
-//             this.app.use((req, res, next) => {
-//                 const target = req.protocol + '://' + String(req.header('host')) + req.url
-//                 const origin = req.header('origin')
-//                 // request log
+//             this.app.use(async (c, next) => {
+//                 const urlObj = new URL(c.req.url)
+//                 const target = urlObj.origin + c.req.url
+//                 const origin = c.req.header('origin')
 //                 if (requestLog) {
 //                     let message = 'Received request at ' + target
 //                     if (origin !== undefined) {
-//                         message += ' from ' + String(req.header('origin'))
-//                         // should we use referrer as a backup option?
-//                         // not sure what that is
+//                         message += ' from ' + String(c.req.header('origin'))
 //                     }
 //                     cliOut(message)
 //                 }
-//                 // origin-target mismatch warning
 //                 if (originMismatchWarning) {
 //                     if (origin !== undefined && origin === this.location && origin !== target) {
 //                         cliWarn(
@@ -110,131 +89,70 @@ export {};
 //                         )
 //                     }
 //                 }
-//                 next()
+//                 await next()
 //             })
 //         }
+//         // serverMiddleware isn't ported to Hono yet - it's a list of Express RequestHandlers,
+//         // which Hono's middleware signature can't run directly.
 //         if (serverMiddleware) {
-//             const { path, middlewares } = serverMiddleware
-//             this.app.use(path, middlewares)
+//             cliWarn('ProdServerHono: serverMiddleware is not yet supported on the Hono server')
 //         }
-//         //this.app.set('etag', false)
 //         if (this.compilationInfo.bundleLocation === undefined) {
-//             throwError('ProdServer', 'compilationInfo.bundleLocation is unset/undefined')
+//             throwError('ProdServerHono', 'compilationInfo.bundleLocation is unset/undefined')
 //         }
-//         this.app.use('/bundle', express.static(this.compilationInfo.bundleLocation))
+//         this.app.use('/bundle/*', serveStatic({ root: this.compilationInfo.bundleLocation }))
 //         const publicLocation = join(this.compilationInfo.location, publicFolder)
-//         //console.log('publicLocation', publicLocation, existsSync(publicLocation))
-//         if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)) // files from public folder
-//         //console.log("serving static files with etag")
-//         this.app.use(express.static(join(this.compilationInfo.location, staticFolder)))
+//         if (existsSync(publicLocation)) this.app.use(serveStatic({ root: publicLocation })) // files from public folder
+//         this.app.use(serveStatic({ root: join(this.compilationInfo.location, staticFolder) }))
 //         if (this.config.assetsDir !== undefined) {
-//             this.app.use('/assets', express.static(join(this.compilationInfo.location, assetsFolder)))
+//             this.app.use('/assets/*', serveStatic({ root: join(this.compilationInfo.location, assetsFolder) }))
 //         }
-//         this.app.use(express.static(this.compilationInfo.location))
+//         this.app.use(serveStatic({ root: this.compilationInfo.location }))
 //         if (typeof config.apiRoutes === 'string' && config.apiRoutes !== '') {
 //             const apiPath = standardizeWebPath(this.config.apiPath)
 //             cliOut(`API listening at ${apiPath}`)
-//             this.app.use(apiPath, express.json())
 //             this.app.use(apiPath, this.handleRequestApi)
 //         }
 //         this.app.use(this.handleRequest)
 //     }
-//     // private addServerMiddleware = (serverMiddleware: ServerMiddlewareInfo): void => {
-//     //     const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware
-//     //     const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile)
-//     //     const middlewareModule = await import(fullFilePath)
-//     //     if ( ! (middlewareExportName in middlewareModule) ) {
-//     //         throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile} when trying to load server middleware`)
-//     //     }
-//     //     const middleware = middlewareModule[middlewareExportName] as RequestHandler[]
-//     //     console.log('prod middleware', middleware)
-//     //     const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath
-//     //     console.log('path', `|${path}|`)
-//     //     console.log('this.app', this.app)
-//     //     this.app.use('/api', (req, res, next) => {
-//     //         console.log('request to api 1')
-//     //         next()   
-//     //     })
-//     //     this.app.use(path, (req, res, next) => {
-//     //         console.log('request to api')
-//     //         next()   
-//     //     })
-//     //     this.app.use(path, middleware)
-//     //     cliOut(`Server Middleware added to server at ${path}`)
-//     // }
-//     private handleRequestApi = async (
-//         req: express.Request, res: express.Response, next: express.NextFunction
-//     ): Promise<void> => {
+//     private handleRequestApi = async (c: Context): Promise<Response> => { // eslint-disable-line @typescript-eslint/no-unused-vars
 //         //this.apiRoutes = await this.apiRoutesPromise
 //         throw new TungstenError(`handleRequestApi incomplete in dev server - add to get the API in the build step`)
-//         // const requestPath = standardizeWebPath(req.baseUrl + req.path)
-//         // for (const [path, route] of Object.entries(this.apiRoutes)) {
-//         //     //console.log(path, 'vs', requestPath)
-//         //     //console.log('path', path, standardizeWebPath(path))
-//         //     if (standardizeWebPath(path) === requestPath) {
-//         //         //console.log('API route matched', path)
-//         //         return route.endpoint(req, res)
-//         //     }
-//         // }
-//         // // else
-//         // res.sendStatus(404)
 //     }
-//     handleRequest = async (req: express.Request, res: express.Response): Promise<void> => {
-//         if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico|txt)$/.test(req.url)) {
+//     handleRequest = async (c: Context): Promise<Response> => {
+//         const { req } = c
+//         if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico|txt)$/.test(req.path)) {
 //             cliLog(`Requested asset file ${req.url} was not found`)
-//             res.status(404).end()
-//             return
+//             return c.notFound()
 //         }
 //         try {
 //             const location = req.url
 //             const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config)
 //             if (this.framework.frameworkModules === undefined) {
-//                 throwError('ProdServer.handleRequest()',
+//                 throwError('ProdServerHono.handleRequest()',
 //                     'framework.frameworkModules is undefined'
 //                 )
 //             }
 //             if (this.framework.clientImportAliases === undefined) {
-//                 throwError('ProdServer.handleRequest()',
+//                 throwError('ProdServerHono.handleRequest()',
 //                     'framework.clientImportAliases is undefined'
 //                 )
 //             }
-//             // const appRoutes: AppRoutes = await getRoutes(this.compilationInfo, this.config)
-//             // let RootComponentClass: AnyComponentType
-//             // if (this.config.useRootComponent) {
-//             //     const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent)
-//             //     RootComponentClass = await getComponent(rootComponentFileFull, this.config.rootComponent)
-//             // } else {
-//             //     throwError('DevServer', 'useRootComponent = false not implemented yet')
-//             // }
 //             const { compilationInfo, config, appRoutes, RootComponentOrNull } = this
-//             const reqRes: ReqRes = { req, res }
-//             //const routes = instance.getRoutes()
+//             // ReqRes is Express-shaped ({req, res}) and Hono's Context isn't - this cast is a
+//             // type-only bridge so the (Express-only) Instance/initStores/routing plumbing below
+//             // still compiles. Not behaviorally correct; fine since this prod server isn't wired
+//             // up anywhere live.
+//             // eslint-disable-next-line no-type-assertion/no-type-assertion -- see comment above
+//             const reqRes = c as unknown as ReqRes
 //             const serverDataLoading: ServerDataLoading = { value: false }
 //             const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
 //             const [globalData, matchedRouteInfo] = await Promise.all([
 //                 (globalDataFunc.value !== undefined) ? globalDataFunc.value(reqRes) : {},
 //                 routing(location, routes, serverDataLoading)
 //             ])
-//             //instance.matchedRouteInfo = 
-//             //cliTodo('Can we move redirect handling to base class?')
-//             // // 2025-03-14 copied this code here from Dev server,
-//             // // because it looked like it was missing
-//             // if (matchedRouteInfo.data instanceof RoutingRedirect) {
-//             //     const redirect = matchedRouteInfo.data
-//             //     res.redirect(redirect.code, redirect.to)
-//             //     return
-//             // }
-//             // // handle redirect components
-//             // if (
-//             //     matchedRouteInfo.content instanceof RedirectComponent
-//             //     //&& matchedRouteInfo.content.__tungstenComponentType === 'redirect'
-//             // ) {
-//             //     const { code = 302, to } = matchedRouteInfo.content.props
-//             //     res.redirect(code, to)
-//             //     return
-//             // }
-//             const redirected = this.handleRedirects(res, matchedRouteInfo)
-//             if (redirected) return // end early
+//             const redirected = this.handleRedirects(c, matchedRouteInfo)
+//             if (redirected !== false) return redirected // end early
 //             const { internalStore, stores, storeSubscriptions }
 //                 = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading)
 //             const instance = new Instance(
@@ -252,22 +170,16 @@ export {};
 //                 let { content } = matchedRouteInfo
 //                 if (typeof content === 'function') {
 //                     content = content(data, params, {} /* props */, globalData, location)
-//                     //throwError('DevServer', 'route content is a function')
 //                 }
 //                 html = await renderContentToHtml(
 //                     this.compilationInfo, this.framework.clientImportAliases,
 //                     content, instance, config, this.config.siteBasePath
 //                 )
 //             }
-//             //debug('html', html)
-//             res.setHeader('Content-Type', 'text/html')
-//             res.status((instance.matchedRouteInfo.key === '404') ? 404 : 200)
-//             res.send(html)
+//             return c.html(html, (instance.matchedRouteInfo.key === '404') ? 404 : 200)
 //         } catch(e) {
 //             cliLog('handleRequest() error', e)
-//             res.setHeader('Content-Type', 'text/html')
-//             res.status(500)
-//             res.send(this.errorPage())
+//             return c.html(this.errorPage(), 500)
 //         }
 //     }
 //     errorPage = () => {
@@ -280,27 +192,23 @@ export {};
 //   </body>
 // </html>`
 //     }
-//     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
-//     //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
-//     // }
 //     // I don't think we ever override the port, not sure why
 //     start(portOverride?: number | null, mute = false): Promise<string> {
 //         return new Promise( (resolve) => {
-//             const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http'
-//             const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost'
+//             const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http'
+//             const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost'
 //             let port: number | null
 //             if (portOverride !== undefined) {
 //                 port = portOverride
 //             } else {
 //                 const _port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000
-//                 if (isNaN(_port) || _port === 0) throwError('ProdServer', portError(_port))
+//                 if (isNaN(_port) || _port === 0) throwError('ProdServerHono', portError(_port))
 //                 port = _port
 //             }
-//             //const port = (portOverride !== undefined) ? portOverride : port
-//             // eslint-disable-next-line no-console
-//             this.server = this.app.listen(port, () => {
-//                 const serverAddress = this.server!.address() as AddressInfo // eslint-disable-line @typescript-eslint/no-non-null-assertion, no-type-assertion/no-type-assertion
-//                 this.location = `${proto}://${host}:${serverAddress.port}`
+//             if (port === null) throwError('ProdServerHono', portError(NaN))
+//             if (isNaN(port) || port === 0) throwError('ProdServerHono', portError(port))
+//             this.server = serve({ fetch: this.app.fetch, port }, info => {
+//                 this.location = `${proto}://${host}:${info.port}`
 //                 if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${this.location}`)
 //                 resolve(this.location)
 //             })
@@ -309,5 +217,4 @@ export {};
 //     stop() {
 //         if (this.server !== undefined) this.server.close()
 //     }
-//     //treeToHtml = treeToHtml
 // }

package/dist/Servers/hono/TungstenServerHono.d.ts

@@ -1,6 +1,6 @@
 import type { MatchedRouteInfo } from '../MatchedRouteInfo.js';
 import { Context } from 'hono';
 export declare class TungstenServerHono {
-    protected handleRedirects(c: Context, matchedRouteInfo: MatchedRouteInfo): boolean;
+    protected handleRedirects(c: Context, matchedRouteInfo: MatchedRouteInfo): Response | false;
 }
 //# sourceMappingURL=TungstenServerHono.d.ts.map

package/dist/Servers/hono/TungstenServerHono.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAQ,OAAO,EAAE,MAAM,MAAM,CAAA;AAuBpC,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CA6C/F"}
+{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAU9B,qBAAa,kBAAkB;IAI3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,QAAQ,GAAG,KAAK;CAoCxG"}

package/dist/Servers/hono/TungstenServerHono.js

@@ -1,51 +1,34 @@
-//import type { Response as ExpressResponse } from 'express'
-import { Hono } from 'hono';
 import { ContentNodeIsClassComponent } from "../../ContentNode.js";
 import { RoutingRedirect } from "../../routing/RoutingRedirect.js";
 import { cliTodo } from "../../cliOutput.js";
 import { RouteRedirectComponent } from "../../components/RouteRedirectComponent.js";
+import { WebRedirectComponent } from "../../components/WebRedirectComponent.js";
 import { $props, $type } from "../../contentNodeSymbols.js";
 import { WebRedirect } from "../../routing/WebRedirect.js";
-import { throwError } from "../../throwError.js";
-const app = new Hono();
-app.get(async c => {
-  const id = c.req.param('id');
-  c.res;
-  // ...
-});
-function debug(...texts) {
-  // console.log(...texts)
-}
 export class TungstenServerHono {
+  // Hono's c.redirect() builds a Response but doesn't send it - unlike Express's res.redirect()
+  // (which sends immediately), the caller here must return the Response itself for Hono to
+  // actually deliver it. Returns false when there's no redirect to make.
   handleRedirects(c /* any */, matchedRouteInfo) {
     // handle any redirect issued during routing
     if (matchedRouteInfo.data instanceof RoutingRedirect) {
       const redirect = matchedRouteInfo.data;
-      c.redirect(redirect.to, redirect.code);
-      return true;
+      return c.redirect(redirect.to, redirect.code);
     } else if (matchedRouteInfo.data instanceof WebRedirect) {
       const redirect = matchedRouteInfo.data;
-      c.redirect(redirect.to, redirect.code);
-      return true;
+      return c.redirect(redirect.to, redirect.code);
     }
-    // console.log('content', matchedRouteInfo.content)
-    // console.log('is func', typeof matchedRouteInfo.content !== 'function')
-    // console.log('ContentNodeIsClassComponent', ContentNodeIsClassComponent(matchedRouteInfo.content as any))
-    // console.log('instanceof', (matchedRouteInfo as any).content[$type] instanceof RedirectComponent)
-    // console.log('prototype instanceof', (matchedRouteInfo as any).content[$type].prototype instanceof RedirectComponent)
-    // console.log('__tungstenRedirect', (matchedRouteInfo as any).content[$type].__tungstenRedirect)
-    // console.log('$type', (matchedRouteInfo as any).content[$type])
-    //console.log('content[$type]', matchedRouteInfo.content[$type])
-    //console.log('instanceof', matchedRouteInfo.content instanceof RedirectComponent)
     if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
       if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
         cliTodo('consider type of RedirectComponent props');
         const code = matchedRouteInfo.content[$props].code || 302;
         const to = matchedRouteInfo.content[$props].to;
-        c.redirect(to, code);
-        return true;
-      } else {
-        throwError('TungstenServerHono', 'Need to check for WebRedirectComponent here');
+        return c.redirect(to, code);
+      } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        return c.redirect(to, code);
       }
     }
     return false;

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

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAGjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA0D9B"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAIjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA+D9B"}

package/dist/Servers/routing.js

@@ -1,5 +1,6 @@
 import { Default404 } from "../routing/Default404.js";
 import { matchPath } from "../routing/matchPath.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 import { jsx as _jsx } from "tungsten/jsxRuntime.js";
 export async function routing(location, routes, serverDataLoading = null) {
   let defaultRoute, _404Route, errorRoute;
@@ -25,7 +26,7 @@ export async function routing(location, routes, serverDataLoading = null) {
     if (match !== null) {
       const params = match.params;
       let data = undefined;
-      if (route.data) {
+      if ('data' in route) {
         if (serverDataLoading) serverDataLoading.value = true;
         data = await route.data(params, location, match.query);
         if (serverDataLoading) serverDataLoading.value = false;
@@ -50,11 +51,14 @@ export async function routing(location, routes, serverDataLoading = null) {
     params: {},
     content: _404Route.content
   };
-  if (errorRoute) return {
-    key: 'error',
-    params: {},
-    content: errorRoute.content
-  };
+  if (errorRoute) {
+    return {
+      key: 'error',
+      params: {},
+      content: errorRoute.content,
+      data: makeTungstenErrorInfo(new Error(`No route matched '${location}'`))
+    };
+  }
   return {
     key: null,
     params: {},

package/dist/Servers/tungstenCorePrivateEnvSchema.d.ts

@@ -1,9 +1,6 @@
 import { z } from 'zod';
 export declare const tungstenCorePrivateEnvSchema: z.ZodObject<{
     TUNGSTEN_SERVER_PORT: z.ZodOptional<z.ZodNumber>;
-    FRONTEND_PROTO: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"http">, z.ZodLiteral<"https">]>>;
-    FRONTEND_HOST: z.ZodOptional<z.ZodString>;
-    FRONTEND_PORT: z.ZodOptional<z.ZodNumber>;
     DEBUG: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$loose>;
 export type TungstenCorePrivateEnv = typeof tungstenCorePrivateEnvSchema._output;

package/dist/Servers/tungstenCorePrivateEnvSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tungstenCorePrivateEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePrivateEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAkBvB,eAAO,MAAM,4BAA4B;;;;;;iBASvC,CAAA;AAGF,MAAM,MAAM,sBAAsB,GAAG,OAAO,4BAA4B,CAAC,OAAO,CAAA"}
+{"version":3,"file":"tungstenCorePrivateEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePrivateEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAkBvB,eAAO,MAAM,4BAA4B;;;iBASvC,CAAA;AAGF,MAAM,MAAM,sBAAsB,GAAG,OAAO,4BAA4B,CAAC,OAAO,CAAA"}

package/dist/Servers/tungstenCorePrivateEnvSchema.js

@@ -14,9 +14,9 @@ const protoSchema = z.union([z.literal('http'), z.literal('https')]);
 const portSchema = z.number().gt(0);
 export const tungstenCorePrivateEnvSchema = z.looseObject({
   TUNGSTEN_SERVER_PORT: z.optional(portSchema),
-  FRONTEND_PROTO: z.optional(protoSchema),
-  FRONTEND_HOST: z.optional(z.string()),
-  FRONTEND_PORT: z.optional(portSchema),
+  // FRONTEND_PROTO: z.optional(protoSchema),
+  // FRONTEND_HOST: z.optional(z.string()),
+  // FRONTEND_PORT: z.optional(portSchema),
   DEBUG: z.optional(z.boolean())
   // SUPPRESS: z.optional(z.object({
   //     ORIGIN_MISMATCH_WARNING: z.optional(z.boolean())

package/dist/Servers/tungstenCorePublicEnvSchema.d.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+export declare const tungstenCorePublicEnvSchema: z.ZodObject<{
+    FRONTEND_PROTO: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"http">, z.ZodLiteral<"https">]>>;
+    FRONTEND_HOST: z.ZodOptional<z.ZodString>;
+    FRONTEND_PORT: z.ZodOptional<z.ZodNumber>;
+}, z.core.$loose>;
+export type TungstenCorePublicEnv = typeof tungstenCorePublicEnvSchema._output;
+//# sourceMappingURL=tungstenCorePublicEnvSchema.d.ts.map

package/dist/Servers/tungstenCorePublicEnvSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tungstenCorePublicEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePublicEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAWvB,eAAO,MAAM,2BAA2B;;;;iBAItC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,2BAA2B,CAAC,OAAO,CAAA"}

package/dist/Servers/tungstenCorePublicEnvSchema.js

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+// FRONTEND_PROTO/FRONTEND_HOST/FRONTEND_PORT are tungsten's own fields (used to
+// report the dev/prod server's own location - see DevServer.ts/ProdServer.ts).
+// Optional here because most apps keep them in the private env instead - see
+// tungstenCorePrivateEnvSchema.ts, which declares the same three fields. An
+// app is free to declare either or both; the servers check private first,
+// then public.
+const protoSchema = z.union([z.literal('http'), z.literal('https')]);
+const portSchema = z.number().gt(0);
+export const tungstenCorePublicEnvSchema = z.looseObject({
+  FRONTEND_PROTO: z.optional(protoSchema),
+  FRONTEND_HOST: z.optional(z.string()),
+  FRONTEND_PORT: z.optional(portSchema)
+});

package/dist/Store/InternalStoreSchema.d.ts

@@ -1,7 +1,9 @@
 import type { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
+import type { PopMessage } from '../PopMessage.type.js';
 export declare class InternalStoreSchema {
     location: string;
     matchedRouteInfo: MatchedRouteInfo;
+    popMessages: PopMessage[];
     constructor(location: string, matchedRouteInfo: MatchedRouteInfo);
 }
 //# sourceMappingURL=InternalStoreSchema.d.ts.map

package/dist/Store/InternalStoreSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;gBACtB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE"}
+{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAEvD,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,WAAW,EAAE,UAAU,EAAE,CAAK;gBAClB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE"}

package/dist/Store/InternalStoreSchema.js

@@ -5,6 +5,7 @@ export class InternalStoreSchema {
   constructor(location, matchedRouteInfo) {
     _defineProperty(this, "location", void 0);
     _defineProperty(this, "matchedRouteInfo", void 0);
+    _defineProperty(this, "popMessages", []);
     this.location = location;
     this.matchedRouteInfo = matchedRouteInfo;
   }

package/dist/api/Request.d.ts

@@ -1,2 +1,2 @@
-export { Request } from 'express';
+export type { Request } from 'express';
 //# sourceMappingURL=Request.d.ts.map

package/dist/api/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../src/api/Request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../src/api/Request.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA"}

package/dist/api/Response.d.ts

@@ -1,2 +1,2 @@
-export { Response } from 'express';
+export type { Response } from 'express';
 //# sourceMappingURL=Response.d.ts.map

package/dist/api/Response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../src/api/Response.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../src/api/Response.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}

package/dist/api/getExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAOjC,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,IAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAuBpG"}
+{"version":3,"file":"getExport.d.ts","sourceRoot":"","sources":["../../src/api/getExport.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAQjC,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,IAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAuBpG"}

package/dist/api/getExport.js

@@ -2,6 +2,7 @@ import { basename } from 'path';
 import { fixExtension } from "../fixExtension.js";
 import { TungstenError } from "../TungstenError.js";
 import { iterationQueryString } from "../iterationQueryString.js";
+import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
 //let load //// !! future improvement
 let exportIteration = 0;
 export async function getExport(filePath, relFile, mode = 'prod') {
@@ -12,7 +13,7 @@ export async function getExport(filePath, relFile, mode = 'prod') {
   if (mode === 'dev') {
     //if ( ! load ) load = await createLoad(import.meta.url, sxyLoaderConfig) //// !! future improvement
     //const load = await createLoad(import.meta.url, sxyLoaderConfig)
-    module = await import(iterationQueryString(filePath, exportIteration++, 'api'));
+    module = await importDevModuleWithRetry(iterationQueryString(filePath, exportIteration++, 'api'));
   } else {
     module = await import(filePath); // import the module
   }

package/dist/babelPlugins/BabelAddDevCacheBust.d.ts

@@ -0,0 +1,11 @@
+import type { NodePath, BabelFile } from '@babel/core';
+import type { ImportDeclaration, ExportNamedDeclaration, ExportAllDeclaration } from '@babel/types';
+export declare function MakeBabelAddDevCacheBust(): () => {
+    pre(state: BabelFile): void;
+    visitor: {
+        ImportDeclaration(path: NodePath<ImportDeclaration>): void;
+        ExportNamedDeclaration(path: NodePath<ExportNamedDeclaration>): void;
+        ExportAllDeclaration(path: NodePath<ExportAllDeclaration>): void;
+    };
+};
+//# sourceMappingURL=BabelAddDevCacheBust.d.ts.map

package/dist/babelPlugins/BabelAddDevCacheBust.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BabelAddDevCacheBust.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelAddDevCacheBust.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAuBnG,wBAAgB,wBAAwB;eAIjB,SAAS;;gCAKQ,QAAQ,CAAC,iBAAiB,CAAC;qCAItB,QAAQ,CAAC,sBAAsB,CAAC;mCAIlC,QAAQ,CAAC,oBAAoB,CAAC;;EAOxE"}