tungsten 0.6.2 → 0.7.0

package/dist/Instance/Instance.js

@@ -4,7 +4,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { isClient } from '../isClient.js';
 import { routing } from "../Servers/routing.js";
 import { RoutingRedirect } from '../routing/RoutingRedirect.js';
-import { routeKeyToUrl, urlToRouteKey } from '../routing/routeUrl.js';
+import { routeKeyToUrl, urlToLocation } from '../routing/routeUrl.js';
 import { isProd } from '../isProd.js';
 import { WebRedirect } from '../routing/WebRedirect.js';
 import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
@@ -14,13 +14,16 @@ import { ContentNodeIsClassComponent } from '../ContentNode.js';
 import { $props, $type } from '../contentNodeSymbols.js';
 import { errorOut } from '../appOutput.js';
 import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
+import { toRoutes } from '../routing/routesArray.js';
+import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { tAssert } from '../assert.js';
 import { throwError } from '../throwError.js';
+import { clientRoute } from '../pipeline/pipelineDefinition.js';
 export class Instance {
   constructor(_location, instanceConfig, reqRes, appRoutes, routes,
   //globalData: GlobalData,
   //matchedRouteInfo: MatchedRouteInfo
-  internalStore, stores, storeSubscriptions, globalData, _matchedRouteInfo, runtimeContext) {
+  internalStore, stores, storeSubscriptions, _globalData, _matchedRouteInfo, runtimeContext) {
     _defineProperty(this, "location", void 0);
     _defineProperty(this, "reqRes", void 0);
     _defineProperty(this, "appRoutes", void 0);
@@ -36,10 +39,20 @@ export class Instance {
     //routerDataError?: unknown
     //routerData?: any
     _defineProperty(this, "config", void 0);
-    _defineProperty(this, "title", void 0);
-    _defineProperty(this, "defaultTitle", '');
+    // prod: web path of each site file -> content hash, for ?v= cache busting (fileVersions.ts)
+    _defineProperty(this, "fileVersions", undefined);
+    // the registered context (registerRouting): one per request on the server, per page on the
+    // client. Never undefined - createContext() gives {} when the app registered none
+    _defineProperty(this, "context", {});
+    // replaced after construction, not using undef to avoid type issues
+    // the registered networked store, made beside the context and before routing, since the
+    // routes function takes it. Same {} when none is registered
+    _defineProperty(this, "networkedData", {});
+    // replaced after construction, not using undef to avoid type issues
     _defineProperty(this, "globalData", void 0);
     _defineProperty(this, "matchedRouteInfo", void 0);
+    _defineProperty(this, "title", void 0);
+    _defineProperty(this, "defaultTitle", '');
     _defineProperty(this, "persistentHeadChildren", void 0);
     //navigationIndex: number = 0
     //lastNavigation: number = 0
@@ -48,16 +61,22 @@ 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);
+    // 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);
+    // the split pipeline's networked data as the page carries it, on both sides: createStore's
+    // second argument
+    _defineProperty(this, "pipelineNetworked", {});
     _defineProperty(this, "routeKeyToUrl", routeKey => {
       return routeKeyToUrl(routeKey, this.config.siteBasePath, isProd && this.config.staticSite);
     });
     // unchecked: goto's routing() does the pattern matching and 404 fallback
-    _defineProperty(this, "urlToRouteKey", pathname => {
-      const routeKey = urlToRouteKey(pathname, this.config.siteBasePath, isProd && this.config.staticSite);
-      return routeKey; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+    _defineProperty(this, "urlToLocation", url => {
+      const location = urlToLocation(url, this.config.siteBasePath, isProd && this.config.staticSite);
+      return location; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     });
     _defineProperty(this, "getRoutes", () => {
-      return typeof this.appRoutes === 'function' ? this.appRoutes(this.reqRes) : this.appRoutes;
+      return toRoutes(typeof this.appRoutes === 'function' ? this.appRoutes(this.reqRes, this.context, this.networkedData) : this.appRoutes, !this.config.prod);
     });
     _defineProperty(this, "updateLocation", location => {
       //if (this.internalStore === undefined) {
@@ -66,18 +85,19 @@ export class Instance {
       this.location = location;
       this.internalStore.location.set(location);
     });
+    // 'history': the browser has already moved to path (back/forward)
     _defineProperty(this, "goto", async (path, {
-      pushHistory = true
+      cause = 'navigate'
     } = {}) => {
       if (isServer) {
         this.redirect(this.routeKeyToUrl(path));
         return;
       }
-      // immediate redirect
-      // 
+      // a history move within the page (a #fragment): the browser has already scrolled
+      if (cause === 'history' && path === this.location) return;
       if (!this.config.clientSideNav) {
         // if clientSideNav is off, these navs should turn into requests to the server
-        this.httpTo(this.routeKeyToUrl(path));
+        if (cause === 'history') this.httpReload();else this.httpTo(this.routeKeyToUrl(path));
         return;
       }
       // the store types these two readonly for everyone else; goto() is what owns them
@@ -89,8 +109,11 @@ export class Instance {
       // 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 = await routing(path, this.getRoutes());
+          [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;
@@ -111,7 +134,8 @@ export class Instance {
         // data here is the result of the route data function
         if (matchedRouteInfo.data instanceof RoutingRedirect) {
           const redirect = matchedRouteInfo.data;
-          this.goto(redirect.to);
+          // awaited, so goto() settles when the navigation it started has
+          await this.goto(redirect.to);
           return;
         } else if (matchedRouteInfo.data instanceof WebRedirect) {
           // A WebRedirect names a URL rather than a route, so it leaves the
@@ -129,21 +153,29 @@ export class Instance {
         // ) {
         if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
           if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
-            this.goto(matchedRouteInfo.content[$props].to);
+            await this.goto(matchedRouteInfo.content[$props].to);
             return;
           } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
-            console.log('Content is a WebRedirectComponent - perform a hard redirect');
+            //console.log('Content is a WebRedirectComponent - perform a hard redirect')
             this.redirect(matchedRouteInfo.content[$props].to);
             return;
           }
         }
+        // after routing, before the render: the components' context for the new route
+        const afterRouting = pipeline?.afterRouting;
+        if (afterRouting !== undefined) {
+          const context = await afterRouting(clientRoute(matchedRouteInfo, path), globalData);
+          if (i !== navigationIndex.get()) return;
+          this.context = context;
+        }
         //console.log('updating route info to', matchedRouteInfo)
         //console.log('instance goto')
         //console.log('siteBasePath', this.config.siteBasePath) 
         //console.log('location', location) 
         //console.log('final dest', this.config.siteBasePath + location)
+        this.globalData = globalData;
         this.matchedRouteInfo = matchedRouteInfo;
-        if (isClient && pushHistory) {
+        if (isClient && cause === 'navigate') {
           const runtimeWindow = this.runtimeContext?.window ?? window;
           runtimeWindow.history.pushState(null, '', this.routeKeyToUrl(path));
         }
@@ -186,6 +218,13 @@ export class Instance {
       const runtimeWindow = this.runtimeContext?.window ?? window;
       runtimeWindow.location.assign(url);
     });
+    _defineProperty(this, "httpReload", () => {
+      if (!isClient) {
+        throwError('httpReload', 'Cannot modify window location on the server');
+      }
+      const runtimeWindow = this.runtimeContext?.window ?? window;
+      runtimeWindow.location.reload();
+    });
     _defineProperty(this, "setDefaultTitle", defaultTitle => {
       this.defaultTitle = defaultTitle;
     });
@@ -244,7 +283,7 @@ export class Instance {
     this.storeSubscriptions = storeSubscriptions;
     this.appRoutes = appRoutes;
     this.routes = routes;
-    this.globalData = globalData;
+    this.globalData = _globalData;
     this.matchedRouteInfo = _matchedRouteInfo;
     this.config = instanceConfig; // createInstanceConfig(appConfig)
     this.persistentHeadChildren = [];
@@ -256,9 +295,8 @@ export class Instance {
       runtimeWindow.addEventListener('popstate', event => {
         //console.log('popstate', window.location.pathname)
         //this.updateLocation(window.location.pathname)
-        const newLocation = this.urlToRouteKey(runtimeWindow.location.pathname);
-        void this.goto(newLocation, {
-          pushHistory: false
+        void this.goto(this.urlToLocation(runtimeWindow.location), {
+          cause: 'history'
         });
       });
     }

package/dist/Instance/InstanceConfig.d.ts

@@ -1,4 +1,4 @@
-import type { SiteBasePath } from 'tungsten/render/HeadData.js';
+import type { SiteBasePath } from '../render/HeadData.js';
 export type InstanceConfig = {
     prod: boolean;
     useRootComponent: boolean;
@@ -7,5 +7,6 @@ export type InstanceConfig = {
     staticSite: boolean;
     csr: boolean;
     sourceDir?: string;
+    registration?: 'pipeline';
 };
 //# 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":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAI/D,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"}
+{"version":3,"file":"InstanceConfig.d.ts","sourceRoot":"","sources":["../../src/Instance/InstanceConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAIzD,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;IAElB,YAAY,CAAC,EAAE,UAAU,CAAA;CAC5B,CAAA"}

package/dist/RenderedContentNode.d.ts.map

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

package/dist/RenderingNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AACxF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAChF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EACH,KAAK,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,KAAK,SAAS,EACpE,KAAK,yBAAyB,EAAE,KAAK,4BAA4B,EAEpE,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAG7D,eAAO,MAAM,UAAU,eAAoB,CAAA;AAC3C,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAA;AAC1C,eAAO,MAAM,QAAQ,eAAoB,CAAA;AACzC,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAA;AACtC,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,eAAO,MAAM,YAAY,eAAwB,CAAA;AACjD,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAA;AAE9C,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,EAAE,aAAa,CAAA;IACxB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAC7D,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAA;AAErD,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,GAAG,oBAAoB,CAAA;AAE/E,MAAM,MAAM,iBAAiB,GAAG;IAC5B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC5B,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACtC,CAAC,KAAK,CAAC,EAAE,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE5C,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC5B,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IACzC,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAEpC,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC5B,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACnC,CAAC,KAAK,CAAC,EAAE,YAAY,CAAA;IACrB,CAAC,UAAU,CAAC,EAAE,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAK/B,CAAA;AAID,MAAM,MAAM,sBAAsB,GAAG,2BAA2B,GAAG,8BAA8B,CAAA;AAEjG,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG,sBAAsB,CAAA;AAE7E,MAAM,MAAM,mBAAmB,GACzB,oBAAoB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAG1E,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG,aAAa,EAAE,CAAA;AAGjE,wBAAgB,4DAA4D,CACxE,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,EAC/C,iBAAiB,EAAE,aAAa,EAChC,WAAW,CAAC,EAAE,OAAO,GACtB,2BAA2B,CAU7B;AAED,wBAAgB,kEAAkE,CAC9E,WAAW,EAAE,4BAA4B,EACzC,OAAO,EAAE,2BAA2B,GAAG,IAAI,EAC3C,iBAAiB,EAAE,aAAa,EAChC,WAAW,CAAC,EAAE,OAAO,GACtB,8BAA8B,CAUhC;AAED,wBAAgB,oDAAoD,CAChE,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,2BAA2B,GAAG,IAAI,EAC7E,iBAAiB,EAAE,aAAa,GACjC,wBAAwB,CAS1B;AAGD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAExF;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,iBAAiB,CAElF;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,oBAAoB,GAAG,IAAI,IAAI,iBAAiB,CAEhG;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,oBAAoB,GACpE,IAAI,IAAI,2BAA2B,GAAG,8BAA8B,CAGzE;AAMD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAExF;AAGD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,wBAAwB,CAEhG;AACD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,qBAAqB,CAE1F"}

package/dist/Servers/DevServer.d.ts

@@ -5,7 +5,8 @@ import type { CompilationInfo } from '../build/CompilationInfo.js';
 import type { ApiRoutes } from '../api/ApiRoutes.js';
 import type { Framework } from '../Framework.js';
 import type { ReqRes } from '../ReqRes.js';
-import { type GlobalData, type GlobalDataFunction } from '../routing/registerGlobalData.js';
+import type { BrandedContext, BrandedGlobalData, BrandedNetworkedData } from '../Brands.js';
+import { type BrandedGlobalDataFunction } from '../routing/registerGlobalData.js';
 import { TungstenServer } from './TungstenServer.jsx';
 export declare class DevServer extends TungstenServer {
     framework: Framework;
@@ -35,10 +36,11 @@ export declare class DevServer extends TungstenServer {
     private static readonly reloadDebounceMs;
     private broadcastReloadEvent;
     private sourceFileToUrlPath;
+    private pipelineHandler;
     private handleRequestApi;
     private handleRequest;
     private tryRenderErrorRoute;
-    getGlobalData: (func: GlobalDataFunction, reqRes: ReqRes) => Promise<GlobalData>;
+    getGlobalData: (func: BrandedGlobalDataFunction, reqRes: ReqRes, context: BrandedContext, networkedData: BrandedNetworkedData) => Promise<BrandedGlobalData>;
     errorLog: (error: unknown) => void;
     errorPage: (error: unknown, errorTrack: string[]) => string;
     start: () => Promise<{

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,OAAgF,MAAM,SAAS,CAAA;AAOtG,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AA0B1C,OAAO,EAAkB,KAAK,UAAU,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAC3G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAsBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,MAAM,CAAA;IAGrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,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;IAoIlD,OAAO,CAAC,mBAAmB,CA2E1B;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,CAK1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAsOpB;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;IAGD,KAAK;;;;OA+BJ;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,OAEN,MAAM,SAAS,CAAA;AAOhB,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAM1C,OAAO,KAAK,EACkC,cAAc,EAAE,iBAAiB,EAC3E,oBAAoB,EACvB,MAAM,cAAc,CAAA;AAsBrB,OAAO,EAAkB,KAAK,yBAAyB,EAAE,MAAM,kCAAkC,CAAA;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AA2BrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,MAAM,CAAA;IAGrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,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;IAoIlD,OAAO,CAAC,mBAAmB,CA2E1B;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,CAK1B;IAED,OAAO,CAAC,eAAe,CAmCrB;IACF,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAuPpB;IAaD,OAAO,CAAC,mBAAmB,CA2C1B;IAID,aAAa,GACT,MAAM,yBAAyB,EAAE,QAAQ,MAAM,EAAE,SAAS,cAAc,EAAE,eAAe,oBAAoB,KAC9G,OAAO,CAAC,iBAAiB,CAAC,CAQ5B;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAehD;IAGD,KAAK;;;;OA+BJ;IACD,IAAI,aAMH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -26,17 +26,23 @@ import { serveStatic } from './serveStatic.js';
 // old loading method
 import { routing } from "./routing.js";
 import { globalDataFunc } from '../routing/registerGlobalData.js';
+import { createNetworkedData } from '../routing/routingRegistry.js';
 import { TungstenServer } from "./TungstenServer.js";
 import { portError } from './portError.js';
 import { loadEnvsDev } from './loadEnvsDev.js';
 import { initStores } from './initStores.js';
+import { createContext } from '../context/registerContext.js';
 import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
 import { MatchedRoute } from '../routing/MatchedRoute.js';
+import { toRoutes } from '../routing/routesArray.js';
+import { resetRegistrations } from './resetRegistrations.js';
+import { PipelineRequestHandler } from '../pipeline/PipelineRequestHandler.js';
+import { importRoutesModule } from '../pipeline/importRoutesModule.js';
 import { iterationQueryString } from '../iterationQueryString.js';
 import { onReloadEvent } from '../hmr/liveReloadHub.js';
 import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
-import { devErrorPageAutoRetryScript } from './devErrorPageAutoRetry.js';
 import { listenVerified, registerBootProbe } from './listenVerified.js';
+import { JSONstringify } from '../json.js';
 //import cookieParser from 'cookie-parser'
 function debug(...texts) {
   // console.log(...texts)
@@ -142,7 +148,7 @@ 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({
+      res.write(`event: boot\ndata: ${JSONstringify({
         bootId: this.bootId
       })}\n\n`);
       this.liveReloadClients.add(res);
@@ -172,7 +178,7 @@ export class DevServer extends TungstenServer {
         // css events, or if a js event arrived with no known source file - the client falls
         // back to a full reload in both cases.
         const files = finalKind === 'js' ? [...this.pendingReloadFiles].map(this.sourceFileToUrlPath) : [];
-        const payload = JSON.stringify({
+        const payload = JSONstringify({
           files
         });
         for (const client of this.liveReloadClients) client.write(`event: ${finalKind}\ndata: ${payload}\n\n`);
@@ -187,6 +193,35 @@ export class DevServer extends TungstenServer {
       const rel = fixExtension(slash(relative(this.compilationInfo.codeLocation, file)));
       return `/${this.compilationInfo.codeSubPath}/${rel}`;
     });
+    // pages under config.registration 'pipeline': the app is re-imported per request, as below
+    _defineProperty(this, "pipelineHandler", () => new PipelineRequestHandler({
+      dev: true,
+      config: this.config,
+      instanceConfig: () => makeInstanceConfigFromFrameworkConfig(this.config, true),
+      fileVersions: undefined,
+      loadApp: async () => {
+        this.firstRender = false;
+        const iteration = this.iterationCount++;
+        resetRegistrations();
+        await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
+        const [app, Root] = await Promise.all([importRoutesModule(this.compilationInfo, this.config, iteration), this.config.useRootComponent ? getComponentDev(join(this.compilationInfo.buildCodeLocation, this.config.rootComponent), this.config.rootComponent, iteration) : null]);
+        return {
+          Root,
+          app
+        };
+      },
+      render: async (Root, instance) => {
+        if (this.framework.clientImportAliases === undefined) {
+          throwError('DevServer', 'framework.clientImportAliases is undefined');
+        }
+        return renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, Root, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+        );
+      },
+      errorPage: error => {
+        this.errorLog(error);
+        return this.errorPage(error, []);
+      }
+    }));
     _defineProperty(this, "handleRequestApi", async (req, res, next) => {
       req.params.foo;
       this.apiRoutes = await getApiRoutes(this.config, this.compilationInfo, 'dev');
@@ -233,8 +268,11 @@ export class DevServer extends TungstenServer {
       // 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 = {};
+      // this request's context: made once the app code, which registers it, has loaded
+      let capturedContext = {};
+      let capturedNetworkedData = {};
       try {
-        const _firstRender = this.firstRender;
+        //const _firstRender = this.firstRender
         this.firstRender = false;
         const iteration = this.iterationCount++;
         //console.log('received a frontend req', req.originalUrl, res.locals.reqId)
@@ -253,7 +291,7 @@ export class DevServer extends TungstenServer {
         if (this.framework.clientImportAliases === undefined) {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
-        globalDataFunc.value = undefined;
+        resetRegistrations();
         //const load = await createLoad(import.meta.url, sxyLoaderConfig)
         await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
         // we are delaying instance creation until after we load the app code, to lets things initialise?
@@ -267,13 +305,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;
+          capturedContext = createContext('server', reqRes);
+          capturedNetworkedData = createNetworkedData(reqRes, capturedContext);
+          const routes = toRoutes(typeof appRoutes === 'function' ? appRoutes(reqRes, capturedContext, capturedNetworkedData) : appRoutes, true);
           capturedRoutes = routes;
           // load data, and do routing
           return promiseAllObj({
             appRoutes,
             routes,
-            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).then(globalData => {
+            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes, capturedContext, capturedNetworkedData).then(globalData => {
               capturedGlobalData = globalData;
               return globalData;
             }).catch(e => {
@@ -282,7 +322,7 @@ export class DevServer extends TungstenServer {
               errorTrack.push(msg);
               throw e;
             }) : {},
-            matchedRouteInfo: routing(location, routes, serverDataLoading).catch(e => {
+            matchedRouteInfo: routing(location, routes, capturedContext, capturedNetworkedData, serverDataLoading).catch(e => {
               const msg = 'Error performing routing';
               cliError(msg);
               errorTrack.push(msg);
@@ -333,7 +373,7 @@ export class DevServer extends TungstenServer {
           // })
           );
         } else {
-          console.log('do routing');
+          //console.log('do routing')
           ({
             appRoutes,
             routes,
@@ -356,9 +396,11 @@ export class DevServer extends TungstenServer {
           internalStore,
           stores,
           storeSubscriptions
-        } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
+        } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading, capturedContext, capturedNetworkedData);
         // create the instance
         const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+        instance.context = capturedContext;
+        instance.networkedData = capturedNetworkedData;
         let html;
         if (RootComponentClass) {
           html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
@@ -391,7 +433,7 @@ export class DevServer extends TungstenServer {
         cliLog('');
         // too late for an error page once a redirect has gone out
         if (res.headersSent) return;
-        const errorRouteHtml = await this.tryRenderErrorRoute(req, res, capturedRoutes, capturedRootComponentClass, capturedGlobalData, e);
+        const errorRouteHtml = await this.tryRenderErrorRoute(req, res, capturedRoutes, capturedRootComponentClass, capturedGlobalData, capturedContext, capturedNetworkedData, e);
         res.setHeader('Content-Type', 'text/html');
         res.status(500);
         res.send(errorRouteHtml ?? this.errorPage(e, errorTrack));
@@ -409,7 +451,7 @@ export class DevServer extends TungstenServer {
     // 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) => {
+    _defineProperty(this, "tryRenderErrorRoute", async (req, res, routes, RootComponentClass, globalData, context, networkedData, error) => {
       try {
         if (routes === undefined) return null;
         const errorRouteDef = routes.error;
@@ -435,8 +477,10 @@ export class DevServer extends TungstenServer {
           internalStore,
           stores,
           storeSubscriptions
-        } = initStores(req.url, reqRes, globalData, matchedRouteInfo, serverDataLoading);
+        } = initStores(req.url, reqRes, globalData, matchedRouteInfo, serverDataLoading, context, networkedData);
         const instance = new Instance(req.url, instanceConfig, reqRes, routes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+        instance.context = context;
+        instance.networkedData = networkedData;
         return await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass ?? MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
         );
       } catch (renderError) {
@@ -448,9 +492,9 @@ export class DevServer extends TungstenServer {
     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
     //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
     // }
-    _defineProperty(this, "getGlobalData", async (func, reqRes) => {
+    _defineProperty(this, "getGlobalData", async (func, reqRes, context, networkedData) => {
       try {
-        return await func(reqRes);
+        return await func(reqRes, context, networkedData);
       } catch (e) {
         cliError('Error fetching global data');
         //cliError(e)
@@ -463,13 +507,11 @@ export class DevServer extends TungstenServer {
       log('end error log');
     });
     _defineProperty(this, "errorPage", (error, errorTrack) => {
-      const autoRetryScript = devErrorPageAutoRetryScript(error);
       return `<!DOCTYPE html>
 <html>
   <head>
     <title>Error</title>
     <style>html { font-family: arial }</style>
-    ${autoRetryScript ? `<script>${autoRetryScript}</script>` : ''}
   </head>
   <body>
     <h1>Application Error</h1>
@@ -499,7 +541,7 @@ export class DevServer extends TungstenServer {
       const publicOrigin = this.makeOrigin(FRONTEND_PROTO ?? 'http', FRONTEND_HOSTNAME ?? 'localhost', FRONTEND_PORT || port);
       this.publicOrigin = publicOrigin;
       if (localOrigin !== publicOrigin) {
-        cliNews(`Dev server ready at ${publicOrigin}`);
+        cliNews(`Public URL: ${publicOrigin}`);
       }
       // Tungsten only serves over http, so the seen origin will always
       // be http even if the FRONTEND_PROTO is https. The hostname+port
@@ -574,7 +616,7 @@ export class DevServer extends TungstenServer {
             cliWarn(`Received a request from the frontend, but it did not arrive at the` + ` address the frontend was loaded from. This may indicate a` + ` misconfiguration, and may prevent the passing of cookies to the` + ` tungsten server.`);
             cliWarn(`request: ${target}`);
             cliWarn(`loaded from: ${origin}`);
-            cliWarn(`arrived at: ${host}`);
+            cliWarn(`arrived at: ${this.arrivedAt(host, req.protocol)}`);
           }
         }
         next();
@@ -612,7 +654,7 @@ export class DevServer extends TungstenServer {
         this.app.use(apiPath, express.json());
         this.app.use(apiPath, this.handleRequestApi);
       }
-      this.app.use(this.handleRequest);
+      this.app.use(config.registration === 'pipeline' ? this.pipelineHandler().handle : this.handleRequest);
       // !!! obsolete?
       // start hooking into require to rewrite react requires to tungsten
       //addRequireResolveHooks() // we need this for server side

package/dist/Servers/ProdServer.d.ts

@@ -7,12 +7,13 @@ import type { Framework } from '../Framework.js';
 import type { AnyComponentType } from '../AnyComponentType.js';
 import type { AppRoutes } from '../routing/AppRoutes.js';
 import type { ServerMiddleware } from './ServerMiddleware.js';
+import type { PipelineApp } from '../pipeline/pipelineDefinition.js';
 import { TungstenServer } from './TungstenServer.jsx';
 export declare class ProdServer extends TungstenServer {
     framework: Framework;
     config: FrameworkConfigComplete;
     compilationInfo: CompilationInfo;
-    appRoutes: AppRoutes;
+    appRoutes: AppRoutes<any>;
     RootComponentOrNull: AnyComponentType | null;
     publicOrigin: string | null;
     expectedHost: string | null;
@@ -21,7 +22,8 @@ export declare class ProdServer extends TungstenServer {
     apiRoutes?: ApiRoutes;
     server?: Server;
     private bootId;
-    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null);
+    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes<any>, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null, pipelineApp?: PipelineApp | null);
+    readonly requestHandler: (req: express.Request, res: express.Response) => Promise<void>;
     private handleRequestApi;
     handleRequest: (req: express.Request, res: express.Response) => Promise<void>;
     private tryRenderErrorRoute;

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

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAiB7D,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;IAO5C,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,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;IACf,OAAO,CAAC,MAAM,CAAc;gBAExB,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;IAqJ7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CAgIjF;IASD,OAAO,CAAC,mBAAmB,CA+C1B;IACD,SAAS,eASR;IAOK,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IA4BlE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAa9B"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAyBpE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAerD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;IACzB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAO5C,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,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;IACf,OAAO,CAAC,MAAM,CAAc;gBAExB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,EACzB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,EAEzC,WAAW,GAAE,WAAW,GAAG,IAAW;IAqJ1C,QAAQ,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IA2BvF,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA0JjF;IASD,OAAO,CAAC,mBAAmB,CAuD1B;IACD,SAAS,eASR;IAOK,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAiClE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAa9B"}