tungsten 0.3.2 → 0.3.4

package/dist/Framework.js

@@ -17,6 +17,9 @@ import { bundle } from "./build/bundle.js";
 import { TungstenError } from "./TungstenError.js";
 import { cliNews, cliOut } from "./cliOutput.js";
 import { staticGen } from "./staticGen/staticGen.js";
+import { combineComponentCss } from "./build/combineComponentCss.js";
+import { frameworkCssPath } from "./build/frameworkStylesheets.js";
+import { frameworkCssFile, frameworkCssFolder } from "./settings.js";
 import { throwError } from "./throwError.js";
 //import { devBundle } from './build/devBundle.jsx'
 import { existsSync, readFileSync, openSync, closeSync, writeFileSync, copyFileSync } from 'fs';
@@ -30,6 +33,8 @@ import { getUserConfig } from "./getUserConfig.js";
 import { getRoutes } from "./getRoutes.js";
 import { getComponent } from "./getComponent.js";
 import { tungstenCorePrivateEnvSchema } from "./Servers/tungstenCorePrivateEnvSchema.js";
+import { createTimeProfiler } from "./timeProfiler.js";
+import { tungstenCorePublicEnvSchema } from "./Servers/tungstenCorePublicEnvSchema.js";
 export class Framework {
   constructor() {
     _defineProperty(this, "config", void 0);
@@ -38,6 +43,10 @@ export class Framework {
     _defineProperty(this, "clientImportAliases", void 0);
     _defineProperty(this, "devServer", void 0);
     _defineProperty(this, "prodServer", void 0);
+    // Off by default (a no-op wrapper) - tungsten dev/build enable it via --profile. See
+    // timeProfiler.ts. Public so those commands can also profile their own top-level phases
+    // (createDevServer, devServer.start) with the same instance.
+    _defineProperty(this, "profiler", createTimeProfiler(false));
   }
   async init() {
     // const configOrUndefined = await this.getUserConfig()
@@ -45,48 +54,52 @@ export class Framework {
     //     throwError('Framework.init()', 'config is undefined')
     // }
     // return configOrUndefined
-    return this.getUserConfig();
+    return this.profiler.timeProfileAsync('init', () => this.getUserConfig());
   }
   async build(mode) {
-    if (mode === 'dev') {
-      const proms = [this.compileUserApp('dev'), this.copyFrameworkAssets('dev')];
-      await Promise.all(proms);
-      //await devBundle()
-      cliNews(`Build complete`);
-    } else {
-      const proms = [this.compileUserApp('prod'), this.copyFrameworkAssets('prod')];
-      await Promise.all(proms);
-      await this.bundle();
-      //cliNews(`Production build complete`) // we will do the announcing in cli/commands/build.ts
-    }
+    await this.profiler.timeProfileAsync(`build (${mode})`, async () => {
+      if (mode === 'dev') {
+        const proms = [this.profiler.timeProfileAsync('compile user app', () => this.compileUserApp('dev')), this.profiler.timeProfileAsync('copy framework assets', () => this.copyFrameworkAssets('dev'))];
+        await Promise.all(proms);
+        //await devBundle()
+        cliNews(`Build complete`);
+      } else {
+        const proms = [this.profiler.timeProfileAsync('compile user app', () => this.compileUserApp('prod')), this.profiler.timeProfileAsync('copy framework assets', () => this.copyFrameworkAssets('prod'))];
+        await Promise.all(proms);
+        await this.profiler.timeProfileAsync('bundle', () => this.bundle());
+        //cliNews(`Production build complete`) // we will do the announcing in cli/commands/build.ts
+      }
+    });
   }
   async clean(mode) {
-    const projectDir = process.cwd();
-    switch (mode) {
-      case 'prod':
-        {
-          await Promise.all([removeRecursive(join(projectDir, prodBuildFolder)), removeRecursive(join(projectDir, bundleFolder))]);
-          break;
-        }
-      case 'staticSite':
-        {
-          await removeRecursive(join(projectDir, staticSiteFolder));
-          break;
-        }
-      case 'dev':
-        {
-          await removeRecursive(join(projectDir, devBuildOuterFolder));
-          break;
-        }
-      default:
-        {
-          await removeRecursive(join(projectDir, buildFolder));
-          break;
-        }
-    }
+    await this.profiler.timeProfileAsync(`clean${mode !== undefined ? ` (${mode})` : ''}`, async () => {
+      const projectDir = process.cwd();
+      switch (mode) {
+        case 'prod':
+          {
+            await Promise.all([removeRecursive(join(projectDir, prodBuildFolder)), removeRecursive(join(projectDir, bundleFolder))]);
+            break;
+          }
+        case 'staticSite':
+          {
+            await removeRecursive(join(projectDir, staticSiteFolder));
+            break;
+          }
+        case 'dev':
+          {
+            await removeRecursive(join(projectDir, devBuildOuterFolder));
+            break;
+          }
+        default:
+          {
+            await removeRecursive(join(projectDir, buildFolder));
+            break;
+          }
+      }
+    });
   }
   async staticGen() {
-    await staticGen(this);
+    await this.profiler.timeProfileAsync('static gen', () => staticGen(this));
   }
   async getUserConfig() {
     return this.config = await getUserConfig();
@@ -104,7 +117,7 @@ export class Framework {
       throw new TungstenError(`SxyFramework.compileUserApp() error: config is undefined`);
     }
     const projectDir = process.cwd();
-    const compilationInfo = await compileUserApp(projectDir, this.config, mode);
+    const compilationInfo = await compileUserApp(projectDir, this.config, mode, this.profiler);
     this.compilationInfo = compilationInfo;
     return compilationInfo;
   }
@@ -123,28 +136,38 @@ export class Framework {
     const projectDir = process.cwd();
     if (this.config === undefined) throw new TungstenError(`SxyFramework.bundle() error, this.config is undefined`);
     await bundle(projectDir);
+    // rollup extracts the framework component css in its own process, so the manifest only
+    // exists once bundling has finished
+    if (this.compilationInfo !== undefined) {
+      const manifest = join(this.compilationInfo.buildLocation, frameworkCssFolder, frameworkCssFile);
+      if (existsSync(manifest)) {
+        this.compilationInfo.frameworkCss = `/${frameworkCssFolder}/${frameworkCssFile}`;
+        await combineComponentCss(this.compilationInfo.buildLocation, frameworkCssFolder, frameworkCssFile);
+      }
+    }
   }
   async createDevServer() {
-    cliOut(`Creating dev server`);
-    // TS define requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
-    global.tungstenPublicEnv = {};
-    // should we default the debug value? we'd have issues if they set DEBUG to undef
-    global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
-    //cliOut(`Try Load Env`)
-    //this.loadEnv()
-    if (this.config === undefined) throwError('Framework.createDevServer()', 'config is undefined');
-    if (this.compilationInfo === undefined) {
-      throwError('Framework.createDevServer()', 'compilationInfo is undefined');
-    }
-    const initialProcessEnv = {
-      ...process.env
-    };
-    //const load = await createLoad(import.meta.url, sxyLoaderConfig)
-    // !REVIEW! why do we need to load envs here?
-    //await loadEnvsDev(this.config, load, initialProcessEnv, false)
-    await loadEnvsDev(this.config, -1, initialProcessEnv, false);
-    this.devServer = new DevServer(this, this.config, this.compilationInfo);
-    return this.devServer;
+    return this.profiler.timeProfileAsync('create dev server', async () => {
+      cliOut(`Creating dev server`);
+      // TS define requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
+      global.tungstenPublicEnv = {};
+      // should we default the debug value? we'd have issues if they set DEBUG to undef
+      global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
+      //cliOut(`Try Load Env`)
+      //this.loadEnv()
+      if (this.config === undefined) throwError('Framework.createDevServer()', 'config is undefined');
+      if (this.compilationInfo === undefined) {
+        throwError('Framework.createDevServer()', 'compilationInfo is undefined');
+      }
+      const initialProcessEnv = {
+        ...process.env
+      };
+      //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+      // !REVIEW! why do we need to load envs here?
+      await loadEnvsDev(this.config, -1, initialProcessEnv, false);
+      this.devServer = new DevServer(this, this.config, this.compilationInfo);
+      return this.devServer;
+    });
   }
   async createEnvProd(config) {
     /* NEW ENV
@@ -165,12 +188,17 @@ export class Framework {
     // Load schemas
     const envSchemas = await getEnvSchemas(config);
     let someEnvLoaded = false; // eslint-disable-line no-type-assertion/no-type-assertion -- widening
+    // snapshot the real environment before any .env file is loaded, so those files can
+    // never overwrite it - see injectEnv()
+    const trueEnv = {
+      ...process.env
+    };
     //const envsLoadedMessages: string[] = []
     function loadEnv(fileName, filePath, prefix = '') {
       const env = dotenv.parse(readFileSync(filePath, 'utf-8'));
       someEnvLoaded = true;
       cliOut(`${fileName} loaded from ${filePath}`);
-      injectEnv(env, process.env, prefix);
+      injectEnv(env, process.env, prefix, trueEnv, config.suppressEnvOverwriteWarnings);
       //console.log('process.env after injecting ' + fileName, process.env)
     }
     const projectDir = process.cwd();
@@ -207,8 +235,8 @@ export class Framework {
       // we could toss the result of this parse and just use privateEnv
       // but this may lead to violation of the contract if tungstenCorePrivateEnvSchema
       // is set to alter data
-      const corePrivateEnv = tungstenCorePrivateEnvSchema.parse(privateEnv);
-      global.tungstenPrivateEnv = corePrivateEnv;
+      const withCorePrivateEnv = tungstenCorePrivateEnvSchema.parse(privateEnv);
+      global.tungstenPrivateEnv = withCorePrivateEnv;
       cliOut('tungsten private env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
     }
     if ('publicEnvSchema' in envSchemas) {
@@ -220,7 +248,9 @@ export class Framework {
       //     (key, value) => [key.slice('TUNGSTEN_PUBLIC_'.length), value]
       // )
       //console.log('env filtered for public env', filteredEnv)
-      global.tungstenPublicEnv = envSchemas.publicEnvSchema.parse(objectRemap(objectFilter(process.env, key => key.startsWith('TUNGSTEN_PUBLIC_')), (key, value) => [key.slice('TUNGSTEN_PUBLIC_'.length), value]));
+      const publicEnv = envSchemas.publicEnvSchema.parse(objectRemap(objectFilter(process.env, key => key.startsWith('TUNGSTEN_PUBLIC_')), (key, value) => [key.slice('TUNGSTEN_PUBLIC_'.length), value]));
+      const withCorePrivateEnv = tungstenCorePublicEnvSchema.parse(publicEnv);
+      global.tungstenPublicEnv = withCorePrivateEnv;
       // save to public env file
       const clientContents = readFileSync(join(projectDir, bundleFolder, 'client.js'), 'utf-8');
       const publicEnvContent = windowGlobalEnvStatement('tungstenPublicEnv', global.tungstenPublicEnv);
@@ -256,6 +286,9 @@ export class Framework {
       importAliases: {} // probably needs to be filled with some details
       //packages: []
     };
+    // `tungsten start` serves a build made by another process, so read it off disk
+    const servedFrameworkCss = frameworkCssPath(prodBuildLocation);
+    if (servedFrameworkCss !== undefined) this.compilationInfo.frameworkCss = servedFrameworkCss;
     let serverMiddleware = null;
     if (this.config.serverMiddleware) {
       const [middlewareFile, middlewareExportName, middlewarePath] = this.config.serverMiddleware;

package/dist/FrameworkConfig.d.ts

@@ -29,8 +29,10 @@ export type FrameworkConfigBase = {
     apiPath?: string;
     suppressNoHeadWarning?: boolean;
     suppressOriginMismatchWarning?: boolean;
+    suppressEnvOverwriteWarnings?: boolean;
     warnOnFrameworkChange?: boolean;
     hmr?: boolean | 'reload';
+    csr?: boolean;
 };
 export type FrameworkConfigWithRootComponent = FrameworkConfigBase & {
     useRootComponent?: true;
@@ -67,8 +69,10 @@ export type FrameworkConfigCompleteBase = {
     apiPath: string;
     suppressNoHeadWarning: boolean;
     suppressOriginMismatchWarning: boolean;
+    suppressEnvOverwriteWarnings: boolean;
     warnOnFrameworkChange: boolean;
     hmr: boolean | 'reload';
+    csr: boolean;
 };
 export type FrameworkConfigCompleteWithRootComponent = FrameworkConfigCompleteBase & {
     useRootComponent: true;

package/dist/FrameworkConfig.d.ts.map

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

package/dist/Instance/Instance.d.ts

@@ -1,4 +1,4 @@
-import type { InstanceConfig } from '../Instance/InstanceConfig.js';
+import type { InstanceConfig } from './InstanceConfig.js';
 import type { ReqRes } from '../ReqRes.js';
 import type { AppRoutes } from '../routing/AppRoutes.js';
 import type { GlobalData } from '../routing/registerGlobalData.js';

package/dist/Instance/Instance.d.ts.map

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

package/dist/Instance/Instance.js

@@ -14,6 +14,7 @@ import { isServer as processIsServer } from "../isServer.js";
 import { ContentNodeIsClassComponent } from "../ContentNode.js";
 import { $props, $type } from "../contentNodeSymbols.js";
 import { errorOut } from "../appOutput.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 export class Instance {
   constructor(_location, instanceConfig, reqRes, appRoutes, routes,
   //globalData: GlobalData,
@@ -57,7 +58,23 @@ export class Instance {
     _defineProperty(this, "goto", async routeKey => {
       // get route data
       this.navigating = true;
-      const matchedRouteInfo = await routing(routeKey, this.getRoutes());
+      let matchedRouteInfo;
+      try {
+        matchedRouteInfo = await routing(routeKey, this.getRoutes());
+      } catch (error) {
+        errorOut(`Tungsten client navigation to '${routeKey}' failed while loading route data:`, error);
+        const errorRoute = this.routes.error;
+        // Without an app-defined error route there's nothing better to show; at
+        // least this is now a logged, caught rejection rather than a silent
+        // unhandled one that left the previous page frozen with no feedback.
+        if (errorRoute === undefined) return;
+        matchedRouteInfo = {
+          key: 'error',
+          params: {},
+          content: errorRoute.content,
+          data: makeTungstenErrorInfo(error)
+        };
+      }
       //console.log('matchedRouteInfo', location, matchedRouteInfo)
       //console.log('matched route info', this.matchedRouteInfo)
       // data here is the result of the route data function

package/dist/Instance/InstanceConfig.d.ts

@@ -5,6 +5,7 @@ export type InstanceConfig = {
     clientSideNav: boolean;
     siteBasePath: SiteBasePath;
     staticSite: boolean;
+    csr: boolean;
     sourceDir?: string;
 };
 //# sourceMappingURL=InstanceConfig.d.ts.map

package/dist/Instance/InstanceConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InstanceConfig.d.ts","sourceRoot":"","sources":["../../src/Instance/InstanceConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAG1D,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA"}
+{"version":3,"file":"InstanceConfig.d.ts","sourceRoot":"","sources":["../../src/Instance/InstanceConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAG1D,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;IACnB,GAAG,EAAE,OAAO,CAAA;IACZ,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA"}

package/dist/PopMessage.type.d.ts

@@ -0,0 +1,6 @@
+export type PopMessage = {
+    id: number;
+    text: string;
+    leaving?: boolean;
+};
+//# sourceMappingURL=PopMessage.type.d.ts.map

package/dist/PopMessage.type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PopMessage.type.d.ts","sourceRoot":"","sources":["../src/PopMessage.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,UAAU,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IAEZ,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA"}

package/dist/PopMessage.type.js

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

package/dist/Servers/DevServer.d.ts

@@ -25,6 +25,7 @@ export declare class DevServer extends TungstenServer {
     serverIterationCount: number;
     private liveReloadClients;
     private unsubscribeReload;
+    private bootId;
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, initialProcessEnv?: Record<string, string>);
     private addServerMiddleware;
     private handleLiveReloadStream;
@@ -36,6 +37,7 @@ export declare class DevServer extends TungstenServer {
     private sourceFileToUrlPath;
     private handleRequestApi;
     private handleRequest;
+    private tryRenderErrorRoute;
     getGlobalData: (func: GlobalDataFunction, reqRes: ReqRes) => Promise<GlobalData>;
     errorLog: (error: unknown) => void;
     errorPage: (error: unknown, errorTrack: string[]) => string;

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

@@ -1 +1 @@
-{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAGlF,OAAO,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAW3C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAKrC,OAAO,EAAE,UAAU,EAAkB,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAoBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;gBAEjD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IA0HlD,OAAO,CAAC,mBAAmB,CAyE1B;IAKD,OAAO,CAAC,sBAAsB,CAO7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAO1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAwMpB;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAMH;CAGJ"}
+{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAA4D,MAAM,SAAS,CAAA;AAGlF,OAAO,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAW3C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAKrC,OAAO,EAAE,UAAU,EAAkB,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAqBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;IAIrD,OAAO,CAAC,MAAM,CAA2C;gBAErD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAiIlD,OAAO,CAAC,mBAAmB,CAyE1B;IAKD,OAAO,CAAC,sBAAsB,CAQ7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAO1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CA+NpB;IAaD,OAAO,CAAC,mBAAmB,CAsC1B;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAO1B;IACD,IAAI,aAMH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -6,7 +6,7 @@ import { join, relative } from 'path';
 import slash from 'slash';
 import "../moduleReloader.js"; // V important ES module cache control
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
-import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder } from "../settings.js";
+import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
 import { rootToHtmlDev as renderRootToHtmlDev } from "../render/rootToHtmlDev.js";
 import { Instance } from "../Instance/Instance.js";
 import { TungstenError } from "../TungstenError.js";
@@ -25,6 +25,7 @@ import { TungstenServer } from "./TungstenServer.js";
 import { portError } from "./portError.js";
 import { loadEnvsDev } from "./loadEnvsDev.js";
 import { initStores } from "./initStores.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 import { MatchedRoute } from "../routing/MatchedRoute.js";
 import { iterationQueryString } from "../iterationQueryString.js";
 import { onReloadEvent } from "../hmr/liveReloadHub.js";
@@ -54,6 +55,10 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "serverIterationCount", 0);
     _defineProperty(this, "liveReloadClients", new Set());
     _defineProperty(this, "unsubscribeReload", null);
+    // Sent as the first event on every live-reload connection (see handleLiveReloadStream), so
+    // the client can tell a fresh reconnect (server process restarted, e.g. by tungsten devmon)
+    // apart from its first-ever connection, and reload only in the former case.
+    _defineProperty(this, "bootId", `${Date.now()}-${Math.random()}`);
     _defineProperty(this, "addServerMiddleware", serverMiddleware => {
       //console.log('addServerMiddleware')
       const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
@@ -124,6 +129,9 @@ export class DevServer extends TungstenServer {
       res.setHeader('Cache-Control', 'no-cache');
       res.setHeader('Connection', 'keep-alive');
       res.flushHeaders();
+      res.write(`event: boot\ndata: ${JSON.stringify({
+        bootId: this.bootId
+      })}\n\n`);
       this.liveReloadClients.add(res);
       req.on('close', () => {
         this.liveReloadClients.delete(res);
@@ -193,7 +201,19 @@ export class DevServer extends TungstenServer {
         res.status(404).end();
         return;
       }
+      cliLog('handling ' + req.url);
       const errorTrack = [];
+      // Captured as soon as each resolves, independent of the promiseAllObj combinators
+      // below - those are all-or-nothing, so if routing/data-fetching/rendering fails
+      // afterwards, the destructured `routes`/`RootComponentClass` locals never get
+      // assigned even though resolving them didn't fail. The catch block below uses these
+      // to tell "app routes resolved fine, something later failed" apart from "routes
+      // themselves couldn't be resolved" - only the former can show the app's 'error' route.
+      let capturedRoutes;
+      let capturedRootComponentClass = null;
+      // Defaults to {} to match the "no global data function registered" branch below,
+      // which resolves synchronously to {} and is never itself a failure case.
+      let capturedGlobalData = {};
       try {
         const _firstRender = this.firstRender;
         this.firstRender = false;
@@ -216,7 +236,6 @@ export class DevServer extends TungstenServer {
         }
         globalDataFunc.value = undefined;
         //const load = await createLoad(import.meta.url, sxyLoaderConfig)
-        //await loadEnvsDev(this.config, load, this.initialProcessEnv, false)
         await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
         // we are delaying instance creation until after we load the app code, to lets things initialise?
         const reqRes = {
@@ -230,11 +249,15 @@ export class DevServer extends TungstenServer {
         //const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(
         const routingPromise = getRoutesDev(this.compilationInfo, this.config, iteration).then(async appRoutes => {
           const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+          capturedRoutes = routes;
           // load data, and do routing
           return promiseAllObj({
             appRoutes,
             routes,
-            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).catch(e => {
+            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).then(globalData => {
+              capturedGlobalData = globalData;
+              return globalData;
+            }).catch(e => {
               const msg = 'Error getting global data';
               cliError(msg);
               errorTrack.push(msg);
@@ -278,7 +301,10 @@ export class DevServer extends TungstenServer {
           } = await promiseAllObj({
             routing: routingPromise,
             //RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
-            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration)
+            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration).then(c => {
+              capturedRootComponentClass = c;
+              return c;
+            })
           })
           // .catch(e => {
           //     cliError('ROUTING AND ROOT ERR')
@@ -340,11 +366,60 @@ export class DevServer extends TungstenServer {
         res.send(html);
       } catch (e) {
         cliLog('error in TungstenServer handleRequest', e);
-        res.setHeader('Content-Type', 'text/html');
-        res.status(500);
         this.errorLog(e);
         cliLog('');
-        res.send(this.errorPage(e, errorTrack));
+        const errorRouteHtml = await this.tryRenderErrorRoute(req, res, capturedRoutes, capturedRootComponentClass, capturedGlobalData, e);
+        res.setHeader('Content-Type', 'text/html');
+        res.status(500);
+        res.send(errorRouteHtml ?? this.errorPage(e, errorTrack));
+      }
+    });
+    // Attempts to render the app's own 'error' route instead of the dev server's generic
+    // error dump, using whatever `routes`/`RootComponentClass`/`globalData` handleRequest
+    // above managed to capture before it failed. Global data and route data are independent
+    // tRPC calls (batched together, but batching doesn't couple their success/failure - see
+    // resolveResponse.ts in @trpc/server), so global data commonly did resolve even when
+    // route data or rendering is what actually failed; passing the real value through here
+    // (rather than defaulting to {}) lets the error route render with it, e.g. the real theme
+    // colour or username instead of framework defaults. Only succeeds when routes actually
+    // resolved (so `routes` is defined) and the app defines an 'error' route. Never throws -
+    // falls back to null (the caller's default error page) on any failure, since we're
+    // already handling one error and can't risk a second, unhandled one taking the dev
+    // server down.
+    _defineProperty(this, "tryRenderErrorRoute", async (req, res, routes, RootComponentClass, globalData, error) => {
+      try {
+        if (routes === undefined) return null;
+        const errorRouteDef = routes.error;
+        if (errorRouteDef === undefined) return null;
+        if (this.framework.clientImportAliases === undefined) {
+          throwError('DevServer.tryRenderErrorRoute()', 'framework.clientImportAliases is undefined');
+        }
+        const reqRes = {
+          req,
+          res
+        };
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
+        const matchedRouteInfo = {
+          key: 'error',
+          params: {},
+          content: errorRouteDef.content,
+          data: makeTungstenErrorInfo(error)
+        };
+        const serverDataLoading = {
+          value: false
+        };
+        const {
+          internalStore,
+          stores,
+          storeSubscriptions
+        } = initStores(req.url, reqRes, globalData, matchedRouteInfo, serverDataLoading);
+        const instance = new Instance(req.url, instanceConfig, reqRes, routes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+        return await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass ?? MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+        );
+      } catch (renderError) {
+        cliError('Error rendering app error route, falling back to default error page');
+        cliLog(renderError);
+        return null;
       }
     });
     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
@@ -367,7 +442,7 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "errorPage", (error, errorTrack) => {
       const autoRetryScript = devErrorPageAutoRetryScript(error);
       return `<!DOCTYPE html>
-</html>
+<html>
   <head>
     <title>Error</title>
     <style>html { font-family: arial }</style>
@@ -408,8 +483,8 @@ export class DevServer extends TungstenServer {
       //         + '\n Ensure that you have an env schema with this field, and a matching env file'
       //     )
       // }
-      const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http';
-      const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost';
+      const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http';
+      const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost';
       const port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000;
       if (isNaN(port) || port === 0) throwError('DevServer', portError(port));
       this.port = port;
@@ -463,7 +538,8 @@ export class DevServer extends TungstenServer {
       this.app.use(`/.tungsten.config.js`, express.static(join(this.compilationInfo.buildLocation, '.tungsten.config.js'))); // compiled packages
       this.app.use(`/${packagesFolder}/`, express.static(join(this.compilationInfo.buildLocation, packagesFolder))); // compiled packages
       this.app.use(`/${clientFolder}/`, express.static(join(this.compilationInfo.buildLocation, clientFolder))); // compiled packages
-      this.app.use(`/${componentCssFolder}/`, express.static(join(this.compilationInfo.buildLocation, componentCssFolder))); // compiled packages
+      this.app.use(`/${componentCssFolder}/`, express.static(join(this.compilationInfo.buildLocation, componentCssFolder))); // user component css
+      this.app.use(`/${frameworkCssFolder}/`, express.static(join(this.compilationInfo.buildLocation, frameworkCssFolder))); // framework component css
       this.app.use(express.static(join(this.compilationInfo.buildLocation, staticFolder))); // compiled stylesheets? -- etag: false to disable caching
       const publicLocation = join(this.compilationInfo.buildLocation, publicFolder);
       if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder

package/dist/Servers/MatchedRouteInfo.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/Servers/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAA;IAC3C,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}
+{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/Servers/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAK9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACrD,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}

package/dist/Servers/ProdServer.d.ts

@@ -22,8 +22,9 @@ export declare class ProdServer extends TungstenServer {
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null);
     private handleRequestApi;
     handleRequest: (req: express.Request, res: express.Response) => Promise<void>;
+    private tryRenderErrorRoute;
     errorPage: () => string;
     start(portOverride?: number | null, mute?: boolean): Promise<string>;
-    stop(): void;
+    stop(): Promise<void>;
 }
 //# sourceMappingURL=ProdServer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AASrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA8H7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA6GjF;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE,IAAI;CAKP"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAWrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAkI7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA2HjF;IASD,OAAO,CAAC,mBAAmB,CA+C1B;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IA0B5D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAY9B"}