tungsten 0.1.59 → 0.1.61

package/dist/FunctionComponent.d.ts

@@ -1,10 +1,12 @@
 import type { TungstenComponentPropsBase } from './Components.jsx';
 import type { ContentNode } from './ContentNode.js';
+import type { ComponentRenderInfo } from './ComponentRenderInfo.type.js';
 import { TungstenStyleObject } from './TungstenStyleObject.js';
 export type FunctionComponent<Props extends TungstenComponentPropsBase, RouteData = unknown> = {
     (props: Props): ContentNode;
     style?: TungstenStyleObject;
     tagName?: string;
     displayName?: string;
+    render?: ComponentRenderInfo;
 };
 //# sourceMappingURL=FunctionComponent.d.ts.map

package/dist/FunctionComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionComponent.d.ts","sourceRoot":"","sources":["../src/FunctionComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS,GAAG,OAAO,IAAI;IAC3F,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC3B,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA"}
+{"version":3,"file":"FunctionComponent.d.ts","sourceRoot":"","sources":["../src/FunctionComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS,GAAG,OAAO,IAAI;IAC3F,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC3B,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAC/B,CAAA"}

package/dist/FunctionComponentStandIn.d.ts

@@ -1,7 +1,7 @@
 import type { FunctionComponent } from './FunctionComponent.js';
 import type { DomRegion } from './DomRegion.js';
 import type { Instance } from './Instance/Instance.js';
-import type { ComponentInstance } from './ComponentInstance.js';
+import type { TungstenElement } from './TungstenElement.js';
 import type { TungstenComponentPropsBase } from './Components.jsx';
 import type { RouteParams } from './routing/RouteParams.type.js';
 import { ContentNode } from './ContentNode.js';
@@ -22,8 +22,8 @@ export declare class FunctionElement<Props extends TungstenComponentPropsBase, R
     routeParams?: RouteParams | undefined;
     routeData?: RouteData | undefined;
     __instance: Instance;
-    parentComponent: ComponentInstance | null;
-    childComponents: ComponentInstance[];
+    parentComponent: TungstenElement | null;
+    childComponents: TungstenElement[];
     __currentContent: RenderedContentNode | $ContentNull;
     __domRegion?: DomRegion;
     __queuedUpdateHandle?: NodeJS.Timeout;
@@ -35,9 +35,14 @@ export declare class FunctionElement<Props extends TungstenComponentPropsBase, R
     memos: Memo[][];
     useCallbackIndex: number;
     callbacks: Callback[][];
-    constructor(func: FunctionComponent<Props>, props: Props, routeParams: RouteParams | undefined, routeData: RouteData | undefined, instance: Instance, parentComponent: ComponentInstance | null);
+    constructor(func: FunctionComponent<Props>, props: Props, routeParams: RouteParams | undefined, routeData: RouteData | undefined, instance: Instance, parentComponent: TungstenElement | null);
     __queueUpdate: () => void;
     update: () => Promise<UpdateResult>;
+    __update: () => Promise<UpdateResult>;
+    __updateAndReturnContent: () => Promise<{
+        content: ContentNode;
+        complete: () => void;
+    }>;
     styledContent: () => Promise<ContentNode>;
     content: () => Promise<ContentNode>;
     __delete: () => void;

package/dist/FunctionComponentStandIn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionComponentStandIn.d.ts","sourceRoot":"","sources":["../src/FunctionComponentStandIn.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,KAAK,IAAI,GAAG;IACR,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,KAAK,EAAE,GAAG,CAAA;CACb,CAAA;AACD,KAAK,QAAQ,GAAG;IACZ,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;CAChC,CAAA;AAED,qBAAa,eAAe,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS;IAC5E,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC9B,KAAK,EAAE,KAAK,CAAA;IACZ,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,QAAQ,CAAA;IACpB,eAAe,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACzC,eAAe,EAAE,iBAAiB,EAAE,CAAK;IACzC,gBAAgB,EAAE,mBAAmB,GAAG,YAAY,CAAe;IACnE,WAAW,CAAC,EAAE,SAAS,CAAA;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAErC,aAAa,SAAI;IACjB,KAAK,EAAE,GAAG,EAAE,CAAK;IACjB,cAAc,SAAI;IAClB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAK;IACrB,YAAY,SAAI;IAChB,KAAK,EAAE,IAAI,EAAE,EAAE,CAAK;IACpB,gBAAgB,SAAI;IACpB,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAK;gBAEhB,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EACpD,WAAW,EAAE,WAAW,GAAG,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EACtE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,GAAG,IAAI;IASjE,aAAa,aAIZ;IACD,MAAM,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAclC;IACD,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAMxC;IACD,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAuBlC;IACD,QAAQ,aAEP;IACD,SAAS,aAER;CACJ;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}
+{"version":3,"file":"FunctionComponentStandIn.d.ts","sourceRoot":"","sources":["../src/FunctionComponentStandIn.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAKvD,KAAK,IAAI,GAAG;IACR,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,KAAK,EAAE,GAAG,CAAA;CACb,CAAA;AACD,KAAK,QAAQ,GAAG;IACZ,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;CAChC,CAAA;AAED,qBAAa,eAAe,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS;IAC5E,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC9B,KAAK,EAAE,KAAK,CAAA;IACZ,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,QAAQ,CAAA;IACpB,eAAe,EAAE,eAAe,GAAG,IAAI,CAAA;IACvC,eAAe,EAAE,eAAe,EAAE,CAAK;IACvC,gBAAgB,EAAE,mBAAmB,GAAG,YAAY,CAAe;IACnE,WAAW,CAAC,EAAE,SAAS,CAAA;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAErC,aAAa,SAAI;IACjB,KAAK,EAAE,GAAG,EAAE,CAAK;IACjB,cAAc,SAAI;IAClB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAK;IACrB,YAAY,SAAI;IAChB,KAAK,EAAE,IAAI,EAAE,EAAE,CAAK;IACpB,gBAAgB,SAAI;IACpB,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAK;gBAEhB,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EACpD,WAAW,EAAE,WAAW,GAAG,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EACtE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,GAAG,IAAI;IAS/D,aAAa,aAIZ;IACD,MAAM,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAclC;IACD,QAAQ,8BAAsB;IAC9B,wBAAwB;;;OAWvB;IACD,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAMxC;IACD,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAuBlC;IACD,QAAQ,aAEP;IACD,SAAS,aAER;CACJ;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}

package/dist/FunctionComponentStandIn.js

@@ -7,6 +7,8 @@ import { isDev } from "./isDev.js";
 import { TungstenError } from "./TungstenError.js";
 import { $contentNull } from "./symbols.js";
 import { integrateElementUpdateVdom } from "./update/integrateUpdateVdom.js";
+import { setCurrentComponent } from "./hooks/setCurrentComponent.js";
+import { clearCurrentComponent } from "./hooks/clearCurrentComponent.js";
 export class FunctionElement {
   constructor(func, props, routeParams, routeData, instance, parentComponent) {
     _defineProperty(this, "func", void 0);
@@ -38,15 +40,28 @@ export class FunctionElement {
         delete this.__queuedUpdateHandle;
       }
       // do update
-      // MC? setCurrentComponent(this)
+      setCurrentComponent(this);
       //const styledContent = await getContentFromFunctionComponent(this.func, this.props)
       const styledContent = await this.styledContent();
       //console.log('got new content for func comp', styledContent)
-      // MC? clearCurrentComponent() // obso? I think this is only for micro components
+      clearCurrentComponent();
       //integrateUpdate(this, styledContent)
       const updateResult = integrateElementUpdateVdom(this, styledContent);
       return updateResult;
     });
+    _defineProperty(this, "__update", () => this.update());
+    _defineProperty(this, "__updateAndReturnContent", async () => {
+      if (this.__queuedUpdateHandle !== undefined) {
+        clearTimeout(this.__queuedUpdateHandle);
+        delete this.__queuedUpdateHandle;
+      }
+      setCurrentComponent(this);
+      const styledContent = await this.styledContent();
+      return {
+        content: styledContent,
+        complete: () => {}
+      };
+    });
     _defineProperty(this, "styledContent", async () => {
       const content = await this.content();
       if (this.func.style !== undefined) {

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

@@ -1 +1 @@
-{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAGlF,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,aAAc,MAAM,UAMjC;IACD,IAAI,aAAoB,QAAQ,mBAyB/B;IASD,eAAe,iBAAkB,MAAM,UAEtC;IACD,QAAQ,UAAW,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAGlF,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,GAAI,UAAU,MAAM,UAMjC;IACD,IAAI,GAAU,UAAU,QAAQ,mBAyB/B;IASD,eAAe,GAAI,cAAc,MAAM,UAEtC;IACD,QAAQ,GAAI,OAAO,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}

package/dist/Instance/InstanceConfig.d.ts

@@ -1,8 +1,10 @@
 import { SiteBasePath } from 'tungsten/render/HeadData.js';
 export type InstanceConfig = {
     prod: boolean;
+    useRootComponent: boolean;
     clientSideNav: boolean;
     siteBasePath: SiteBasePath;
     staticSite: 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,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,OAAO,CAAA;CACtB,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,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA"}

package/dist/RenderedContentNode.d.ts

@@ -25,13 +25,18 @@ export type RenderedContentNodeNumber = {
     value: number;
     domNode: Text;
 };
+export type RenderedContentNodeText = {
+    [$type]: $Text;
+    value: number;
+    domNode: Text;
+};
 export type RenderedContentNodeLiteral = RenderedContentNodeString | RenderedContentNodeNumber;
 export type RenderedContentNodeHtml = ContentNodeHtml & {
     domNode: TungstenHTMLElement;
     renderedChildren: RenderedContentNode | $ContentNull;
 };
 export type RenderedContentNodeHead = {
-    [$type]: $Head;
+    [$type]: 'head';
     domNode: HTMLElement;
 };
 export type RenderedContentNodeClassComponent = ContentNodeClassComponent & {

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/RenderedContentNode.js

@@ -52,10 +52,10 @@ export function WideRenderedContentNodeIsHtml(wrcn) {
   return wrcn !== $contentNull && RenderedContentNodeIsHtml(wrcn);
 }
 export function RenderedContentNodeIsHead(rcn) {
-  return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && rcn[$type] === $head;
+  return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && rcn[$type] === 'head'; //$head
 }
 export function RenderedContentNodeSingleIsHead(rcns) {
-  return typeof rcns === 'object' && rcns[$type] === $head;
+  return typeof rcns === 'object' && rcns[$type] === 'head'; // $head
 }
 export function RenderedContentNodeIsComponent(rcn) {
   return typeof rcn === 'object' && rcn !== null && !Array.isArray(rcn) && typeof rcn[$type] === 'function';

package/dist/RenderingNode.d.ts

@@ -1,13 +1,17 @@
 import type { TungstenBaseComponent, TungstenBaseComponentType } from './Components.jsx';
 import type { FunctionComponentStandInAny } from './FunctionComponentStandIn.js';
-import { type ContentNodeLiteral, type ContentNodeNonRendered, type NodeValue, ContentNodeClassComponent, ContentNodeFunctionComponent } from './ContentNode.js';
+import { type ContentNodeLiteral, type ContentNodeNonRendered, type NodeValue, ContentNodeClassComponent, ContentNodeFunctionComponent, ContentNodeRendered } from './ContentNode.js';
 import { $key, $props, $type } from './contentNodeSymbols.js';
 import { KeyAttr } from './KeyAttr.js';
 import { FunctionComponent } from './FunctionComponent.js';
 export declare const $component: unique symbol;
-export declare const $Component: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export type $Component = typeof $component;
+export declare const $element: unique symbol;
+export type $Element = typeof $element;
 export declare const $children: unique symbol;
-export declare const $Children: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export type $Children = typeof $children;
+export declare const $placeholder: unique symbol;
+export type $Placeholder = typeof $placeholder;
 export type RenderingNodeProps = {
     children?: RenderingNode;
     value?: NodeValue;
@@ -15,6 +19,7 @@ export type RenderingNodeProps = {
 };
 export type RenderingNodeNonRendered = ContentNodeNonRendered;
 export type RenderingNodeLiteral = ContentNodeLiteral;
+export type RenderingNodeRendered = ContentNodeRendered;
 export type RenderingNodeHtml = {
     [$type]: string;
     [$props]: RenderingNodeProps;
@@ -22,21 +27,31 @@ export type RenderingNodeHtml = {
 };
 export type RenderingNodeClassComponent = {
     [$type]: TungstenBaseComponentType<any, any>;
-    [$component]: TungstenBaseComponent;
     [$props]: RenderingNodeProps;
+    [$placeholder]?: boolean;
 };
 export type RenderingNodeFunctionComponent = {
     [$type]: FunctionComponent<any, any>;
-    [$component]: FunctionComponentStandInAny;
+    [$props]: RenderingNodeProps;
+    [$placeholder]?: boolean;
+};
+export type RenderingNodePlaceholder = {
+    [$type]: $Placeholder;
+    [$component]: TungstenBaseComponentType<any, any>;
     [$props]: RenderingNodeProps;
 };
 export type RenderingNodeComponent = RenderingNodeClassComponent | RenderingNodeFunctionComponent;
 export type RenderingNodeElement = RenderingNodeHtml | RenderingNodeComponent;
 export type RenderingNodeSingle = RenderingNodeElement | RenderingNodeLiteral | ContentNodeNonRendered;
 export type RenderingNode = RenderingNodeSingle | RenderingNode[];
-export declare function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode: ContentNodeClassComponent, component: TungstenBaseComponent<any, any>, renderingChildren: RenderingNode): RenderingNodeClassComponent;
-export declare function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode: ContentNodeFunctionComponent, component: FunctionComponentStandInAny, renderingChildren: RenderingNode): RenderingNodeFunctionComponent;
+export declare function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode: ContentNodeClassComponent, element: TungstenBaseComponent<any, any> | null, renderingChildren: RenderingNode, placeholder?: boolean): RenderingNodeClassComponent;
+export declare function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode: ContentNodeFunctionComponent, element: FunctionComponentStandInAny | null, renderingChildren: RenderingNode, placeholder?: boolean): RenderingNodeFunctionComponent;
+export declare function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode: ContentNodeClassComponent, element: TungstenBaseComponent<any, any> | FunctionComponentStandInAny | null, renderingChildren: RenderingNode): RenderingNodePlaceholder;
 export declare function RenderingNodeIsElement(item: RenderingNode): item is RenderingNodeElement;
-export declare function RenderingNodeIsHtml(item: RenderingNode): item is RenderingNodeElement;
+export declare function RenderingNodeIsHtml(item: RenderingNode): item is RenderingNodeHtml;
 export declare function RenderingNodeElementIsHtml(item: RenderingNodeElement): item is RenderingNodeHtml;
+export declare function RenderingNodeElementIsComponent(item: RenderingNodeElement): item is RenderingNodeClassComponent | RenderingNodeFunctionComponent;
+export declare function RenderingNodeIsLiteral(item: RenderingNode): item is RenderingNodeLiteral;
+export declare function RenderingNodeIsNonRendered(item: RenderingNode): item is RenderingNodeNonRendered;
+export declare function RenderingNodeIsRendered(item: RenderingNode): item is RenderingNodeRendered;
 //# sourceMappingURL=RenderingNode.d.ts.map

package/dist/RenderingNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AACxF,OAAO,KAAK,EAAmB,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AACjG,OAAO,EAAmE,KAAK,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,KAAK,SAAS,EAAE,yBAAyB,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAA;AACjO,OAAO,EAAE,IAAI,EAAE,MAAM,EAA4B,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,eAAO,MAAM,UAAU,eAAoB,CAAA;AAC3C,eAAO,MAAM,UAAU,6FAAoB,CAAA;AAC3C,eAAO,MAAM,SAAS,eAAqB,CAAA;AAC3C,eAAO,MAAM,SAAS,6FAAmB,CAAA;AAEzC,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,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;IAC5C,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAA;IACnC,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAK/B,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IACzC,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACpC,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAA;IACzC,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,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAEtG,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG,aAAa,EAAE,CAAA;AAGjE,wBAAgB,4DAA4D,CACxE,WAAW,EAAE,yBAAyB,EACtC,SAAS,EAAE,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1C,iBAAiB,EAAE,aAAa,GACjC,2BAA2B,CAQ7B;AAED,wBAAgB,kEAAkE,CAC9E,WAAW,EAAE,4BAA4B,EACzC,SAAS,EAAE,2BAA2B,EACtC,iBAAiB,EAAE,aAAa,GACjC,8BAA8B,CAQhC;AAGD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAExF;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,IAAI,oBAAoB,CAErF;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,oBAAoB,GAAG,IAAI,IAAI,iBAAiB,CAEhG"}
+{"version":3,"file":"RenderingNode.d.ts","sourceRoot":"","sources":["../src/RenderingNode.ts"],"names":[],"mappings":"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"}

package/dist/RenderingNode.js

@@ -1,21 +1,36 @@
+import { ContentNodeIsLiteral } from "./ContentNode.js";
 import { $key, $props, $type } from "./contentNodeSymbols.js";
 export const $component = Symbol('element');
-export const $Component = typeof $component;
+export const $element = Symbol('element');
 export const $children = Symbol('children');
-export const $Children = typeof $children;
-export function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode, component, renderingChildren) {
-  return {
+export const $placeholder = Symbol('placeholder');
+export function makeRenderingNodeClassComponentFromContentNodeClassComponent(contentNode, element, renderingChildren, placeholder) {
+  const n = {
     [$type]: contentNode[$type],
-    [$component]: component,
+    //[$component]: component,
     [$props]: {
       children: renderingChildren
     }
   };
+  if (placeholder) n[$placeholder] = placeholder;
+  return n;
 }
-export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, component, renderingChildren) {
-  return {
+export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, element, renderingChildren, placeholder) {
+  const n = {
     [$type]: contentNode[$type],
-    [$component]: component,
+    //[$component]: component,
+    [$props]: {
+      children: renderingChildren
+    }
+  };
+  if (placeholder) n[$placeholder] = placeholder;
+  return n;
+}
+export function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode, element, renderingChildren) {
+  return {
+    [$type]: $placeholder,
+    [$component]: contentNode[$type],
+    //[$component]: component,
     [$props]: {
       children: renderingChildren
     }
@@ -29,4 +44,20 @@ export function RenderingNodeIsHtml(item) {
 }
 export function RenderingNodeElementIsHtml(item) {
   return typeof item[$type] === 'string';
+}
+export function RenderingNodeElementIsComponent(item) {
+  //: item is ContentNodeComponentAny {
+  return typeof item[$type] === 'function';
+}
+// export function RenderingNodeElementIsPlaceholder(item: RenderingNodeElement): item is RenderingNodePlaceholder {
+//     return item[$type] === $placeholder
+// }
+export function RenderingNodeIsLiteral(item) {
+  return ContentNodeIsLiteral(item);
+}
+export function RenderingNodeIsNonRendered(item) {
+  return item === null || item === undefined || typeof item === 'boolean';
+}
+export function RenderingNodeIsRendered(item) {
+  return !RenderingNodeIsNonRendered(item);
 }

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,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;AAIpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,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;gBAEvB,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IA8DlD,OAAO,CAAC,mBAAmB,CAwC1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IACD,OAAO,CAAC,aAAa,CAwGpB;IAID,QAAQ,UAAW,OAAO,UAEzB;IACD,SAAS,UAAW,OAAO,YAY1B;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAQ1B;IACD,IAAI,aAEH;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,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;AAOpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAiBrD,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;gBAEvB,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IA0ElD,OAAO,CAAC,mBAAmB,CA8C1B;IAKD,OAAO,CAAC,gBAAgB,CAcvB;IACD,OAAO,CAAC,aAAa,CA4JpB;IAID,QAAQ,GAAI,OAAO,OAAO,UAEzB;IACD,SAAS,GAAI,OAAO,OAAO,YAY1B;IACD,KAAK,QAAO,OAAO,CAAC,MAAM,CAAC,CAQ1B;IACD,IAAI,aAEH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -8,7 +8,7 @@ import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder,
 import { rootToHtmlDev as renderRootToHtmlDev } from "../render/rootToHtmlDev.js";
 import { Instance } from "../Instance/Instance.js";
 import { TungstenError } from "../TungstenError.js";
-import { createAppConfigFromFrameworkConfig } from "../createInstanceConfigFromFrameworkConfig.js";
+import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
 import { cliNews, cliOut, cliLog } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { existsSync } from 'fs';
 import { getApiRoutes } from "../api/getApiRoutes.js";
@@ -22,10 +22,11 @@ import { createLoad } from 'sxy-loader';
 import { routing } from "./routing.js";
 import { globalDataFunc } from "../routing/registerGlobalData.js";
 import { TungstenServer } from "./TungstenServer.js";
-import { RoutingRedirect } from "../indexInner.js";
+import { RoutingRedirect } from "../routing/RoutingRedirect.js";
 import { portError } from "./portError.js";
 import { loadEnvsDev } from "./loadEnvsDev.js";
 import { initStores } from "./initStores.js";
+import { MatchedRoute } from 'tungsten/indexInner.js';
 function debug(...texts) {
   // console.log(...texts)
 }
@@ -63,13 +64,15 @@ export class DevServer extends TungstenServer {
         const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
         const middlewareModule = await load(fullFilePath);
         if (!(middlewareExportName in middlewareModule)) {
-          throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile} when trying to load server middleware`);
+          throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile}` + ` when trying to load server middleware`);
         }
         const middlewares = middlewareModule[middlewareExportName]; // eslint-disable-line no-type-assertion/no-type-assertion
         if (!Array.isArray(middlewares)) throwError('addServerMiddleware', `Expected middlewares to be an array`);
         if (!(0 in middlewares)) throwError('addServerMiddleware', `No middleware entry at index 0`);
         const firstMiddleware = middlewares[0];
-        if (!(typeof firstMiddleware === 'function')) throwError('addServerMiddleware', `Expected middleware to be a function`);
+        if (!(typeof firstMiddleware === 'function')) {
+          throwError('addServerMiddleware', `Expected middleware to be a function`);
+        }
         let i = 0;
         const next = () => {
           i++;
@@ -123,7 +126,7 @@ export class DevServer extends TungstenServer {
         //// perhaps, set some return data in the instance
         //// then return html string + other data
         const location = req.url;
-        const instanceConfig = createAppConfigFromFrameworkConfig(this.config, true);
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
         if (this.framework.frameworkModules === undefined) {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
@@ -132,22 +135,6 @@ export class DevServer extends TungstenServer {
         }
         const load = await createLoad(import.meta.url, sxyLoaderConfig);
         await loadEnvsDev(this.config, load, this.initialProcessEnv, false);
-        // load everything in parallel
-        //const envFile = join(this.compilationInfo.location, '.env.js')
-        //const privateEnvFile = join(this.compilationInfo.location, '.private.env.js')
-        //const publicEnvFile = join(this.compilationInfo.location, clientFolder, '.public.env.js')
-        const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
-        const {
-          appRoutes,
-          RootComponentClass
-        } = await promiseAllObj({
-          //envFile: existsSync(envFile) && load(envFile),
-          //privateEnv: existsSync(privateEnvFile) && load(privateEnvFile),
-          //publicEnv: existsSync(publicEnvFile) && load(publicEnvFile),
-          //AppClass: getAppClass(),
-          appRoutes: getRoutesDev(this.compilationInfo, this.config, load),
-          RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
-        });
         // we are delaying instance creation until after we load the app code, to lets things initialise?
         const reqRes = {
           req,
@@ -157,10 +144,51 @@ export class DevServer extends TungstenServer {
         const serverDataLoading = {
           value: false
         };
+        const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(async appRoutes => {
+          const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+          // load data, and do routing
+          return promiseAllObj({
+            appRoutes,
+            routes,
+            globalData: globalDataFunc !== undefined ? globalDataFunc(reqRes) : {},
+            matchedRouteInfo: routing(location, routes, serverDataLoading)
+          });
+        });
+        let appRoutes;
+        let routes;
+        let globalData;
+        let matchedRouteInfo;
+        let RootComponentClass = null;
+        if (this.config.useRootComponent) {
+          const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent);
+          ({
+            routing: {
+              appRoutes,
+              routes,
+              globalData,
+              matchedRouteInfo
+            },
+            RootComponentClass
+          } = await promiseAllObj({
+            routing: routingPromise,
+            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+          }));
+        } else {
+          ({
+            appRoutes,
+            routes,
+            globalData,
+            matchedRouteInfo
+          } = await routingPromise);
+          //throwError('DevServer', 'useRootComponent = false not implemented yet')
+        }
         // get routes (running the getRoutes function if needed)
-        const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+        //const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
         // load data, and do routing
-        const [globalData, matchedRouteInfo] = await Promise.all([globalDataFunc !== undefined ? globalDataFunc(reqRes) : {}, routing(location, routes, serverDataLoading)]);
+        // const [globalData, matchedRouteInfo] = await Promise.all([
+        //     (globalDataFunc !== undefined) ? globalDataFunc(reqRes) : {},
+        //     routing(location, routes, serverDataLoading)
+        // ])
         // handle any redirect issued during routing
         if (matchedRouteInfo.data instanceof RoutingRedirect) {
           const redirect = matchedRouteInfo.data;
@@ -175,7 +203,26 @@ export class DevServer extends TungstenServer {
         } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
         // create the instance
         const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
-        const html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, global.tungstenPublicEnv, '');
+        let html;
+        if (RootComponentClass) {
+          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          );
+        } else {
+          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          );
+          // const { params, data } = matchedRouteInfo
+          // let { content } = matchedRouteInfo
+          // if (typeof content === 'function') {
+          //     content = content(data, params, {} /* props */, globalData, location)
+          //     //throwError('DevServer', 'route content is a function')
+          // }
+          // //console.log('content to render', content)
+          // html = await renderContentToHtmlDev(
+          //     this.compilationInfo, this.framework.clientImportAliases,
+          //     content, instance, this.config, global.tungstenPublicEnv,
+          //     '' // siteBasePathOverride
+          // )
+        }
         //debug('html', html)
         res.setHeader('Content-Type', 'text/html');
         res.status(instance.matchedRouteInfo.key === '404' ? 404 : 200);
@@ -256,7 +303,9 @@ export class DevServer extends TungstenServer {
       const publicLocation = join(this.compilationInfo.location, publicFolder);
       if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder
       //cliWarn(`assets dir:`, this.config.assetsDir)
-      if (this.config.assetsDir !== undefined) this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))); // files from assets folder
+      if (this.config.assetsDir !== undefined) {
+        this.app.use(`/${this.config.assetsDir}`, express.static(join(this.compilationInfo.location, assetsFolder))); // files from assets folder
+      }
       this.app.use(express.static(this.compilationInfo.location, {
         dotfiles: 'allow'
       })); // serving the app files themselves

package/dist/Servers/ProdServer.d.ts

@@ -4,19 +4,23 @@ import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { CompilationInfo } from '../build/CompilationInfo.js';
 import type { ApiRoutes } from '../api/ApiRoutes.js';
 import { Framework } from '../Framework.js';
+import { AnyComponentType } from '../AnyComponentType.js';
+import { AppRoutes } from '../routing/AppRoutes.js';
 import { ServerMiddleware } from './ServerMiddleware.js';
 import { TungstenServer } from './TungstenServer.jsx';
 export declare class ProdServer extends TungstenServer {
     framework: Framework;
     config: FrameworkConfigComplete;
     compilationInfo: CompilationInfo;
+    appRoutes: AppRoutes;
+    RootComponentOrNull: AnyComponentType | null;
     port: number;
     location: string | null;
     app: express.Application;
     apiRoutesPromise?: Promise<ApiRoutes>;
     apiRoutes?: ApiRoutes;
     server?: Server;
-    constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, serverMiddleware: ServerMiddleware | null);
+    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>;
     errorPage: () => string;

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;AAKpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiB3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAIhC,IAAI,EAAE,MAAM,CAAA;IACZ,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,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA0F7C,OAAO,CAAC,gBAAgB,CAcvB;IACD,aAAa,QAAe,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA4DjF;IACD,SAAS,eASR;IAID,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlE,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;AAMpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,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;IAI5C,IAAI,EAAE,MAAM,CAAA;IACZ,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;IA+E7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CAqFjF;IACD,SAAS,eASR;IAID,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlE,IAAI;CAKP"}