tungsten 0.7.1 → 0.8.0

package/dist/.build-complete

@@ -1 +1 @@
-1790982915586
+1792235388722

package/dist/Components.d.ts

@@ -141,6 +141,8 @@ export declare abstract class TungstenBaseComponent<Props extends TungstenCompon
     shouldStoreComponentUpdate?: (key: Key, data: unknown) => boolean;
     static tagName?: string;
     static displayName?: string;
+    static render?: ComponentRenderInfo;
+    static noEscape?: boolean;
     static __opaque?: boolean;
     constructor(pkg: ConstructPackage<Props, RouteData>);
     get globalData(): GlobalData;
@@ -176,7 +178,7 @@ export declare abstract class TungstenSimpleComponent<Props extends TungstenComp
     componentDidRender?: ((prevProps: Props) => void | Promise<void>) | (() => void | Promise<void>);
     _rendered?: ((prevProps: Props) => void | Promise<void>) | (() => void | Promise<void>);
     __init: () => Promise<void>;
-    __initialContent: () => ContentNode | Promise<ContentNode>;
+    __initialContent: () => Promise<ContentNode> | ContentNode;
     __runUpdate: () => Promise<UpdateResult>;
     __updateAndReturnContent: () => Promise<{
         content: ContentNode;
@@ -204,7 +206,7 @@ export declare abstract class TungstenComponent<Props extends TungstenComponentP
     static displayName?: string;
     constructor(pkg: ConstructPackage<Props, RouteData>);
     __init: () => Promise<void>;
-    __initialContent: () => ContentNode | Promise<ContentNode>;
+    __initialContent: () => Promise<ContentNode> | ContentNode;
     __runUpdate: () => Promise<UpdateResult>;
     __handleTitle: () => void;
     setState: (stateUpdates: State) => void;
@@ -230,7 +232,7 @@ export declare abstract class TungstenStatefulComponent<Props extends TungstenCo
     static displayName?: string;
     constructor(pkg: ConstructPackage<Props, RouteData>);
     __init: () => Promise<void>;
-    __initialContent: () => ContentNode | Promise<ContentNode>;
+    __initialContent: () => Promise<ContentNode> | ContentNode;
     __runUpdate: () => Promise<UpdateResult>;
     __updateAndReturnContent: () => Promise<{
         content: ContentNode;
@@ -271,7 +273,7 @@ export declare abstract class TungstenSignalsComponent<Props extends TungstenCom
     static displayName?: string;
     constructor(pkg: ConstructPackage<Props, RouteData>);
     __init: () => Promise<void>;
-    __initialContent: () => ContentNode | Promise<ContentNode>;
+    __initialContent: () => Promise<ContentNode> | ContentNode;
     __runUpdate: () => Promise<UpdateResult>;
     __updateAndReturnContent: () => Promise<{
         content: ContentNode;

package/dist/Components.js

@@ -342,6 +342,8 @@ export class TungstenBaseComponent {
 }
 _defineProperty(TungstenBaseComponent, "tagName", void 0);
 _defineProperty(TungstenBaseComponent, "displayName", void 0);
+_defineProperty(TungstenBaseComponent, "render", void 0);
+_defineProperty(TungstenBaseComponent, "noEscape", void 0);
 // rendered once, then owns its dom: the parent never re-renders it (see updateClassComponent)
 _defineProperty(TungstenBaseComponent, "__opaque", void 0);
 export class TungstenSimpleComponent extends TungstenBaseComponent {

package/dist/Framework.js

@@ -169,9 +169,9 @@ export class Framework {
       // dev only: only tungsten build sets quiet, so this check cannot fire yet
       if (!this.quiet) 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 = {};
+      globalThis.tungstenPublicEnv = {};
       // should we default the debug value? we'd have issues if they set DEBUG to undef
-      global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
+      globalThis.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
       //cliOut(`Try Load Env`)
       //this.loadEnv()
       if (this.config === undefined) throwError('Framework.createDevServer()', 'config is undefined');
@@ -201,9 +201,9 @@ export class Framework {
     For validators, load env, pass to validators, receive result and write
     */
     // TS global var definition requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
-    global.tungstenPublicEnv = {};
+    globalThis.tungstenPublicEnv = {};
     // should we default the debug value? we'd have issues if they set DEBUG to undef
-    global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
+    globalThis.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
     // Load schemas
     const envSchemas = await getEnvSchemas(config);
     let someEnvLoaded = false;
@@ -265,7 +265,7 @@ export class Framework {
       if (!coreResult.success) {
         throwError('Framework.createEnvProd()', 'Your private environment variables don\'t meet the Tungsten requirements\n' + coreResult.problems);
       }
-      global.tungstenPrivateEnv = coreResult.value;
+      globalThis.tungstenPrivateEnv = coreResult.value;
       if (!this.quiet) 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) {
@@ -289,10 +289,10 @@ export class Framework {
       if (!coreResult.success) {
         throwError('Framework.createEnvProd()', 'Your public environment variables don\'t meet the Tungsten requirements\n' + coreResult.problems);
       }
-      global.tungstenPublicEnv = coreResult.value;
+      globalThis.tungstenPublicEnv = coreResult.value;
       // save to public env file
       const clientContents = readFileSync(join(projectDir, bundleFolder, 'client.js'), 'utf-8');
-      const publicEnvContent = windowGlobalEnvStatement('tungstenPublicEnv', global.tungstenPublicEnv);
+      const publicEnvContent = windowGlobalEnvStatement('tungstenPublicEnv', globalThis.tungstenPublicEnv);
       const clientWithEnvHandle = openSync(join(projectDir, bundleFolder, 'clientWithEnv.js'), 'w');
       writeFileSync(clientWithEnvHandle, publicEnvContent);
       writeFileSync(clientWithEnvHandle, clientContents);

package/dist/FrameworkConfig.d.ts

@@ -36,6 +36,8 @@ export type FrameworkConfigBase = {
     skipPackageCompilation?: string | string[];
     sourceMaps?: boolean;
     serverMiddleware?: ServerMiddlewareInfo;
+    serverIgnoreDirs?: string | string[];
+    serverIgnorePatterns?: string | string[];
     apiRoutes?: string;
     apiPath?: string;
     suppressNoHeadWarning?: boolean;
@@ -43,7 +45,6 @@ export type FrameworkConfigBase = {
     suppressEnvOverwriteWarnings?: boolean;
     hmr?: boolean | 'reload';
     csr?: boolean;
-    serverSideRouting?: boolean;
     defaultCacheControl?: CacheControl;
     registration?: Registration;
 };
@@ -51,9 +52,11 @@ export type Registration = 'register' | 'pipeline';
 export type FrameworkConfigWithRootComponent = FrameworkConfigBase & {
     useRootComponent?: true;
     rootComponent: string;
+    serverSideRouting?: boolean;
 };
 export type FrameworkConfigWithoutRootComponent = FrameworkConfigBase & {
     useRootComponent: false;
+    serverSideRouting?: true;
 };
 export type FrameworkConfig = FrameworkConfigWithRootComponent | FrameworkConfigWithoutRootComponent;
 export type FrameworkConfigCompleteBase = {
@@ -89,6 +92,8 @@ export type FrameworkConfigCompleteBase = {
     skipPackageCompilation?: string | string[];
     sourceMaps?: boolean;
     serverMiddleware?: ServerMiddlewareInfo;
+    serverIgnoreDirs?: string | string[];
+    serverIgnorePatterns?: string | string[];
     apiRoutes?: string;
     apiPath: string;
     suppressNoHeadWarning: boolean;
@@ -97,16 +102,17 @@ export type FrameworkConfigCompleteBase = {
     warnOnFrameworkChange: boolean;
     hmr: boolean | 'reload';
     csr: boolean;
-    serverSideRouting?: boolean;
     defaultCacheControl?: CacheControl;
     registration?: Registration;
 };
 export type FrameworkConfigCompleteWithRootComponent = FrameworkConfigCompleteBase & {
     useRootComponent: true;
     rootComponent: string;
+    serverSideRouting?: boolean;
 };
 export type FrameworkConfigCompleteWithoutRootComponent = FrameworkConfigCompleteBase & {
     useRootComponent: false;
+    serverSideRouting?: true;
 };
 export type FrameworkConfigComplete = FrameworkConfigCompleteWithRootComponent | FrameworkConfigCompleteWithoutRootComponent;
 export type FrameworkConfigOverrides = Pick<FrameworkConfigCompleteBase, 'ignoreDirs' | 'ignorePatterns' | 'sourceMaps'>;

package/dist/Instance/Instance.d.ts

@@ -11,6 +11,7 @@ import type { ClientRuntimeContext } from './ClientRuntimeContext.js';
 import type { RouteKey } from '../routing/RouteTypes.js';
 import type { ClientRoute } from '../pipeline/pipelineDefinition.js';
 import type { BrandedContext, BrandedGlobalData, BrandedNetworkedData } from '../Brands.js';
+import { type TungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
 type DisposableComponent = {
     __delete: () => void;
     __deleted: () => void;
@@ -19,7 +20,8 @@ export type NavigationCause = 'navigate' | 'history';
 export type InstancePipeline = {
     routingContext: BrandedContext;
     routingNetworkedData: BrandedNetworkedData;
-    allRoutesData: (() => Promise<BrandedGlobalData>) | undefined;
+    allRoutesData: ((location: string) => Promise<BrandedGlobalData>) | undefined;
+    allRoutesDataFallback?: ((location: string, error: unknown) => Promise<BrandedGlobalData>) | undefined;
     afterRouting: ((route: ClientRoute, allRoutesData: object) => Promise<BrandedContext>) | undefined;
 };
 export declare class Instance {
@@ -49,6 +51,7 @@ export declare class Instance {
         url: string;
         code: RedirectCode;
     } | undefined;
+    errorInfo: TungstenErrorInfo | undefined;
     pipeline: InstancePipeline | undefined;
     pipelineNetworked: object;
     constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes<any>, routes: Routes<any>, internalStore: InternalStore, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: BrandedGlobalData, matchedRouteInfo: MatchedRouteInfo, runtimeContext?: ClientRuntimeContext);
@@ -63,6 +66,8 @@ export declare class Instance {
         cause?: NavigationCause;
     }) => Promise<void>;
     redirect: (url: string, code?: RedirectCode) => void;
+    private routeClassic;
+    private routePipeline;
     httpTo: (url: string) => void;
     httpReload: () => void;
     setDefaultTitle: (defaultTitle: string) => void;

package/dist/Instance/Instance.js

@@ -14,8 +14,9 @@ import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { tAssert } from '../assert.js';
 import { throwError } from '../throwError.js';
 import { clientRoute } from '../pipeline/pipelineDefinition.js';
+import { settleRouting } from '../pipeline/settleRouting.js';
 export class Instance {
-  constructor(_location, instanceConfig, reqRes, appRoutes, routes,
+  constructor(_location, instanceConfig, reqRes, appRoutes, _routes,
   //globalData: GlobalData,
   //matchedRouteInfo: MatchedRouteInfo
   internalStore, stores, storeSubscriptions, _globalData, _matchedRouteInfo, runtimeContext) {
@@ -56,6 +57,8 @@ export class Instance {
     _defineProperty(this, "registeredComponents", []);
     // set when the server has answered the request with a redirect, so it sends nothing more
     _defineProperty(this, "redirected", undefined);
+    // set when the page is the pipeline's error page: written into it, for hydration to know it
+    _defineProperty(this, "errorInfo", undefined);
     // the pipeline's, set by hydratePipeline(): client navigation routes with Init's context, as
     // the server did, and reruns the all-routes data. Unset, goto() takes the classic path
     _defineProperty(this, "pipeline", undefined);
@@ -103,32 +106,19 @@ export class Instance {
       navigating.set(true);
       // get route data
       try {
-        let matchedRouteInfo;
-        // global data runs before any route renders, here as before SSR; beside routing, as there
-        let globalData = this.globalData;
         const pipeline = this.pipeline;
-        try {
-          [matchedRouteInfo, globalData] = await Promise.all([pipeline === undefined ? routing(path, this.getRoutes(), this.context, this.networkedData) : routing(path, this.getRoutes(), pipeline.routingContext, pipeline.routingNetworkedData), pipeline === undefined ? globalDataFunc.value?.(null, this.context, this.networkedData) ?? globalData : pipeline.allRoutesData?.() ?? globalData]);
-        } catch (error) {
-          errorOut(`Tungsten client navigation to '${path}' 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)
-          };
-        }
+        const routed = pipeline === undefined ? await this.routeClassic(path) : await this.routePipeline(pipeline, path);
+        if (routed === undefined) return;
+        const {
+          matchedRouteInfo,
+          globalData
+        } = routed;
         //console.log('matchedRouteInfo', location, matchedRouteInfo)
         //console.log('matched route info', this.matchedRouteInfo)
         if (i !== navigationIndex.get()) return; // another nav has taken over
         // A redirect to a URL leaves the app: on the server redirect() writes an HTTP redirect;
         // in the browser it replaces the location
-        const redirection = redirectOf(matchedRouteInfo);
+        const redirection = redirectOf(matchedRouteInfo, globalData);
         if (redirection !== undefined) {
           // awaited, so goto() settles when the navigation it started has
           if ('route' in redirection) await this.goto(redirection.route);else this.redirect(redirection.url, redirection.code);
@@ -184,6 +174,56 @@ export class Instance {
         runtimeWindow.location.replace(url);
       }
     });
+    // goto()'s routing, with the global data beside it, as before SSR. Undefined: nothing to show
+    _defineProperty(this, "routeClassic", async path => {
+      try {
+        const [matchedRouteInfo, globalData] = await Promise.all([routing(path, this.getRoutes(), this.context, this.networkedData), globalDataFunc.value?.(null, this.context, this.networkedData, path) ?? this.globalData]);
+        return {
+          matchedRouteInfo,
+          globalData
+        };
+      } catch (error) {
+        errorOut(`Tungsten client navigation to '${path}' 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 undefined;
+        const matchedRouteInfo = {
+          key: 'error',
+          params: {},
+          content: errorRoute.content,
+          data: makeTungstenErrorInfo(error)
+        };
+        return {
+          matchedRouteInfo,
+          globalData: this.globalData
+        };
+      }
+    });
+    // A pipeline's, recovering to the 'error' route where it can. Past that the server renders its
+    // error page: undefined, as the page loads from the server
+    _defineProperty(this, "routePipeline", async (pipeline, path) => {
+      const routes = this.getRoutes();
+      const getAllRoutesData = pipeline.allRoutesData;
+      const fallback = pipeline.allRoutesDataFallback;
+      const current = this.globalData;
+      try {
+        const settled = await settleRouting(routes, async () => routing(path, routes, pipeline.routingContext, pipeline.routingNetworkedData), async () => getAllRoutesData === undefined ? current : getAllRoutesData(path), fallback && (async error => fallback(path, error)), makeTungstenErrorInfo);
+        if (settled.recoveredFrom !== undefined) {
+          errorOut(`Tungsten client navigation to '${path}' failed, showing the error route:`, settled.recoveredFrom);
+        }
+        const globalData = settled.allRoutesData; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- the framework brands what it builds
+        return {
+          matchedRouteInfo: settled.matchedRouteInfo,
+          globalData
+        };
+      } catch (error) {
+        errorOut(`Tungsten client navigation to '${path}' failed while loading route data:`, error);
+        this.httpTo(this.routeKeyToUrl(path));
+        return undefined;
+      }
+    });
     _defineProperty(this, "httpTo", url => {
       if (!isClient) {
         throwError('gotoHttp', 'Cannot modify window location on the server');
@@ -255,7 +295,7 @@ export class Instance {
     this.stores = stores;
     this.storeSubscriptions = storeSubscriptions;
     this.appRoutes = appRoutes;
-    this.routes = routes;
+    this.routes = _routes;
     this.globalData = _globalData;
     this.matchedRouteInfo = _matchedRouteInfo;
     this.config = instanceConfig; // createInstanceConfig(appConfig)

package/dist/Servers/DevServer.d.ts

@@ -20,15 +20,17 @@ export declare class DevServer extends TungstenServer {
     apiRoutes?: ApiRoutes;
     apiPath?: string;
     server?: Server;
-    reqId: number;
     firstRender: boolean;
     iterationCount: number;
     serverIterationCount: number;
     private liveReloadClients;
     private unsubscribeReload;
+    private watchedMiddleware;
     private bootId;
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, initialProcessEnv?: Record<string, string>);
     private addServerMiddleware;
+    private addWatchedServerMiddleware;
+    private addPerRequestServerMiddleware;
     private handleLiveReloadStream;
     private reloadDebounceTimer;
     private pendingReloadKind;
@@ -36,13 +38,14 @@ export declare class DevServer extends TungstenServer {
     private static readonly reloadDebounceMs;
     private broadcastReloadEvent;
     private sourceFileToUrlPath;
-    private pipelineHandler;
     private handleRequestApi;
     private handleRequest;
+    private handleRequestPipeline;
+    private renderPipelinePage;
     private tryRenderErrorRoute;
-    getGlobalData: (func: BrandedGlobalDataFunction, reqRes: ReqRes, context: BrandedContext, networkedData: BrandedNetworkedData) => Promise<BrandedGlobalData>;
-    errorLog: (error: unknown) => void;
-    errorPage: (error: unknown, errorTrack: string[]) => string;
+    getGlobalData: (func: BrandedGlobalDataFunction, reqRes: ReqRes, context: BrandedContext, networkedData: BrandedNetworkedData, location: string) => Promise<BrandedGlobalData>;
+    printError: (error: unknown, errorSites?: string[]) => void;
+    errorPage: (error: unknown, errorSites: string[]) => string;
     start: () => Promise<{
         localOrigin: string;
         publicOrigin: string;