tungsten 0.1.59 → 0.1.60

package/dist/render/instantiateClassComponent.d.ts

@@ -1,5 +1,5 @@
 import type { ContentNodeClassComponent } from '../ContentNode.js';
-import type { ComponentInstance } from '../ComponentInstance.js';
+import type { TungstenElement } from '../TungstenElement.js';
 import type { Instance } from '../Instance/Instance.js';
-export declare function instantiateClassComponent(node: ContentNodeClassComponent, parentComponent: (ComponentInstance | null) | undefined, instance: Instance): Promise<import("../Components.jsx").TungstenBaseComponent<any, any>>;
+export declare function instantiateClassComponent(node: ContentNodeClassComponent, parentComponent: (TungstenElement | null) | undefined, instance: Instance): Promise<import("../Components.jsx").TungstenBaseComponent<any, any>>;
 //# sourceMappingURL=instantiateClassComponent.d.ts.map

package/dist/render/instantiateClassComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instantiateClassComponent.d.ts","sourceRoot":"","sources":["../../src/render/instantiateClassComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIvD,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,yBAAyB,EAAE,eAAe,GAAE,iBAAiB,GAAG,IAAI,aAAO,EAAE,QAAQ,EAAE,QAAQ,wEAcpJ"}
+{"version":3,"file":"instantiateClassComponent.d.ts","sourceRoot":"","sources":["../../src/render/instantiateClassComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIvD,wBAAsB,yBAAyB,CAC3C,IAAI,EAAE,yBAAyB,EAAE,eAAe,GAAE,eAAe,GAAG,IAAI,aAAO,EAAE,QAAQ,EAAE,QAAQ,wEAetG"}

package/dist/render/instantiateClassComponent.js

@@ -7,7 +7,7 @@ export async function instantiateClassComponent(node, parentComponent = null, in
     routeParams: node[$routeParams],
     routeData: node[$routeData],
     instance,
-    parentComponent
+    parentElement: parentComponent
   });
   //console.log('init on', Component.name)
   await element.__init();

package/dist/render/instantiateComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instantiateComponent.d.ts","sourceRoot":"","sources":["../../src/render/instantiateComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,uBAAuB,EAAwC,MAAM,mBAAmB,CAAA;AACjG,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIlD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,uBAAuB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,mLAQ3H"}
+{"version":3,"file":"instantiateComponent.d.ts","sourceRoot":"","sources":["../../src/render/instantiateComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,uBAAuB,EAAwC,MAAM,mBAAmB,CAAA;AACjG,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIlD,wBAAgB,oBAAoB,CAChC,IAAI,EAAE,uBAAuB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,mLAS1F"}

package/dist/render/processProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processProps.d.ts","sourceRoot":"","sources":["../../src/render/processProps.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAA;AAoBjE,wBAAgB,YAAY,CAAC,KAAK,EAAE,6BAA6B,iCA2ChE"}
+{"version":3,"file":"processProps.d.ts","sourceRoot":"","sources":["../../src/render/processProps.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAA;AAqBjE,wBAAgB,YAAY,CAAC,KAAK,EAAE,6BAA6B,iCA2ChE"}

package/dist/render/processProps.js

@@ -1,6 +1,6 @@
 import { objects } from 'sxy-lib';
 import { jssToCss } from "../style/jssToCss.js";
-const omitProps = ['onClick', 'onChange', 'onSubmit', 'onKeyDown', 'onKeyUp', 'onKeyPress', 'onMouseDown', 'onMouseUp', 'onMouseMove', 'onMouseEnter', 'onMouseLeave', 'onMouseOver', 'onMouseOut'];
+const omitProps = ['ref', 'onClick', 'onChange', 'onSubmit', 'onKeyDown', 'onKeyUp', 'onKeyPress', 'onMouseDown', 'onMouseUp', 'onMouseMove', 'onMouseEnter', 'onMouseLeave', 'onMouseOver', 'onMouseOut'];
 //// !!!! We need to handle bind here
 export function processProps(props) {
   props = objects.filter(props, key => {

package/dist/render/renderingTreeToHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderingTreeToHtml.d.ts","sourceRoot":"","sources":["../../src/render/renderingTreeToHtml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAa7C,OAAO,EAA8B,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAOpF,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAyG5I"}
+{"version":3,"file":"renderingTreeToHtml.d.ts","sourceRoot":"","sources":["../../src/render/renderingTreeToHtml.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAY7C,OAAO,EACH,KAAK,aAAa,EAGrB,MAAM,qBAAqB,CAAA;AAS5B,wBAAsB,mBAAmB,CACrC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,GAClF,OAAO,CAAC,MAAM,CAAC,CAoIjB"}

package/dist/render/renderingTreeToHtml.js

@@ -1,8 +1,7 @@
 import { reduce as objectReduce } from 'sxy-lib/objects.js';
-import { ContentNodeElementIsComponent } from "../ContentNode.js";
 import { processProps } from "./processProps.js";
 import { htmlVoidTags } from "./htmlVoidTags.js";
-import { validChildren } from "../validChildren.js";
+import { validRenderingChildren } from "../validChildren.js";
 import { htmlEntities } from "../htmlEntities.js";
 import { htmlSelfClosableTags } from "./htmlSelfClosableTags.js";
 import { htmlMonoTags } from "./htmlMonoTags.js";
@@ -11,7 +10,7 @@ import { TungstenError } from "../TungstenError.js";
 import { throwError } from "../throwError.js";
 import { $props, $type } from "../contentNodeSymbols.js";
 import { printComponentNamesInSource } from "./printComponentNameInSource.js";
-import { RenderingNodeElementIsHtml } from "../RenderingNode.js";
+import { RenderingNodeElementIsComponent, RenderingNodeElementIsHtml, RenderingNodeIsHtml, RenderingNodeIsLiteral, RenderingNodeIsNonRendered } from "../RenderingNode.js";
 import { processHead } from "./processHead.js";
 import { processRenderingNodeHtml } from "./processRenderingNodeHtml.js";
 //// Maybe we should build the full tree before rendering
@@ -87,10 +86,10 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
       children,
       ...attribProps
     } = node[$props]);
-    debug('validChildren(children)', validChildren(children));
-    if (validChildren(children)) {
+    debug('validChildren(children)', validRenderingChildren(children));
+    if (validRenderingChildren(children)) {
       if (type in htmlVoidTags) {
-        throw new TungstenError(`nodeToHtml() error: node ${JSON.stringify(node)} type ${type} is an HTML void type (cannot have children), but the node has children.`);
+        throw new TungstenError(`nodeToHtml() error: node ${JSON.stringify(node)} type ${type} is an HTML void type` + ` (cannot have children), but the node has children.`);
       }
       debug('children', children);
       const noEscape = type === 'script' || type === 'style' || '__noEscape' in node[$props] && node[$props].__noEscape !== false;
@@ -107,14 +106,49 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
       }
     }
   }
-  if (ContentNodeElementIsComponent(node)) {
+  if (RenderingNodeElementIsComponent(node)) {
+    //console.log('componentRenderingNode', node)
     //if (node[$type] === Stylesheet) {
     //    console.log('rendering stylesheet', node)
     //}
-    const inner = await renderingNodeToHtml(node[$props].children, noEscape, headData, node);
+    const {
+      children
+    } = node[$props];
+    const inner = await renderingNodeToHtml(children, noEscape, headData, node);
+    // const meta = (node[$placeholder]) ? ' -content-length=' + treeWidth(children).toString() : ''
+    // return printComponentNamesInSource
+    //     ? '<!--' + node[$type].name + meta + '-->' + inner + '<!--/' + node[$type].name + '-->'
+    //     : '<!--' + meta + '-->' + inner + '<!---->'
     return printComponentNamesInSource ? '<!--' + node[$type].name + '-->' + inner + '<!--/' + node[$type].name + '-->' : '<!---->' + inner + '<!---->';
     //throw new Error(`I don't think this ever happens`) // testing
   }
+  node;
+  // if (RenderingNodeElementIsPlaceholder(node)) {
+  //     console.log('placeholder rendering node', node)
+  //     const inner: string = await renderingNodeToHtml(node[$props].children, noEscape, headData, node)
+  //     console.log('placeholder content')
+  //     const meta = `-content-length = inner.length`
+  //     return printComponentNamesInSource
+  //         ? '<!--' + node[$component].name + ' ' + meta + '-->' + inner + '<!--/' + node[$component].name + '-->'
+  //         : '<!--' + ' ' + meta + '-->' + inner + '<!---->'
+  // }
+  // node
   const n = node; // eslint-disable-line @typescript-eslint/no-unused-vars
   throwError('render -> treeToHtml()', `node returned from a component did not match expected format.` + ` Node: ${JSON.stringify(node)}`);
+}
+function treeWidth(tree) {
+  if (RenderingNodeIsNonRendered(tree)) return 0;
+  if (RenderingNodeIsLiteral(tree)) return 1;
+  tree;
+  if (RenderingNodeIsHtml(tree)) return 1;
+  tree;
+  if (Array.isArray(tree)) {
+    let len = 0;
+    for (const node of tree) {
+      len += treeWidth(node);
+    }
+    return len;
+  }
+  tree;
+  return treeWidth(tree[$props].children);
 }

package/dist/render/rootToHtml.d.ts

@@ -4,5 +4,6 @@ import type { SiteBasePath } from './HeadData.js';
 import type { AnyComponentType } from '../AnyComponentType.js';
 import type { Instance } from '../Instance/Instance.js';
 import { TungstenEnvOrUndefined } from 'tungsten/env/types.js';
-export declare function rootToHtml(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, RootComponentClass: AnyComponentType, instance: Instance, siteBasePath: SiteBasePath, dev?: boolean, tungstenPublicEnv?: TungstenEnvOrUndefined): Promise<string>;
+import { FrameworkConfigComplete } from 'tungsten/FrameworkConfig.js';
+export declare function rootToHtml(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, RootComponentClass: AnyComponentType, instance: Instance, config: FrameworkConfigComplete, siteBasePathOverride: SiteBasePath, tungstenPublicEnv?: TungstenEnvOrUndefined, dev?: boolean): Promise<string>;
 //# sourceMappingURL=rootToHtml.d.ts.map

package/dist/render/rootToHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootToHtml.d.ts","sourceRoot":"","sources":["../../src/render/rootToHtml.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAOvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAG9D,wBAAsB,UAAU,CAC5B,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EACpE,kBAAkB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EACxD,YAAY,EAAE,YAAY,EAC1B,GAAG,UAAQ,EAAE,iBAAiB,GAAE,sBAAkC,GACnE,OAAO,CAAC,MAAM,CAAC,CA8CjB"}
+{"version":3,"file":"rootToHtml.d.ts","sourceRoot":"","sources":["../../src/render/rootToHtml.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAMvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAI9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,wBAAsB,UAAU,CAC5B,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EACpE,kBAAkB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,uBAAuB,EACzF,oBAAoB,EAAE,YAAY,EAAE,iBAAiB,GAAE,sBAAkC,EACzF,GAAG,UAAQ,GACZ,OAAO,CAAC,MAAM,CAAC,CAwDjB"}

package/dist/render/rootToHtml.js

@@ -1,16 +1,21 @@
 import { renderingNodeToHtml } from "./renderingTreeToHtml.js";
 import { TungstenError } from "../TungstenError.js";
-import { componentNodeToRenderingToTree } from "./componentNodeToRenderingToTree.js";
+import { componentNodeToRenderingTree } from "./componentNodeToRenderingTree.js";
 import { $props, $type } from "../contentNodeSymbols.js";
 import { RenderingNodeIsElement } from "../RenderingNode.js";
-export async function rootToHtml(compilationInfo, clientImportAliases, RootComponentClass, instance, siteBasePath, dev = false, tungstenPublicEnv = undefined) {
+import { writeFileSync } from 'fs';
+import { contentToHtml } from "./contentToHtml.js";
+export async function rootToHtml(compilationInfo, clientImportAliases, RootComponentClass, instance, config, siteBasePathOverride, tungstenPublicEnv = undefined, dev = false) {
   const rootNode = {
     [$type]: RootComponentClass,
     // TypeScript needs some help to understand that { type: AnyComponentType }
     [$props]: {} // is equivalent to { type: ClassComponentTypeAny } | { type: FunctionComponentTypeAny } (type names simplified here)
   };
-  //const html = await elementToHtml(rootElement, false)
-  const tree = await componentNodeToRenderingToTree(rootNode, null, instance, false);
+  return contentToHtml(compilationInfo, clientImportAliases, rootNode, instance, config, siteBasePathOverride, tungstenPublicEnv, dev);
+  // return contentTreeToRenderingTree(
+  //     rootNode, null, instance, false
+  // )
+  const tree = await componentNodeToRenderingTree(rootNode, null, instance, false);
   //console.log('tree', tree)
   if (!RenderingNodeIsElement(tree)) {
     throw new TungstenError(`Root content was not a ContentNodeElement type. Ensure that your root node returns valid content.`);
@@ -24,12 +29,13 @@ export async function rootToHtml(compilationInfo, clientImportAliases, RootCompo
     compilationLocation: compilationInfo.location,
     dev,
     tungstenPublicEnv,
-    siteBasePath: siteBasePath
+    siteBasePath: siteBasePathOverride
   };
+  //console.log('rendering tree', inspect(tree, { depth: 99 } ))
   let html = await renderingNodeToHtml(tree, false, headData, null);
+  writeFileSync('page.html', html);
   //console.log('rootToHtml html', html)
   // insert the title if one was set during processing
-  //console.log('instance title', instance.title)
   if (instance.title) {
     if (html.includes('<title>')) {
       html = html.replace(/(?:<title>)(.*?)(?:<\/title>)/, `<title>${instance.title}</title>`);

package/dist/render/rootToHtmlDev.d.ts

@@ -2,7 +2,8 @@ import type { CompilationInfo } from '../build/CompilationInfo.js';
 import type { ImportAliases } from '../build/ImportAliases.js';
 import type { AnyComponentType } from '../AnyComponentType.js';
 import type { Instance } from '../Instance/Instance.js';
-import { SiteBasePath } from './HeadData.js';
-import { TungstenEnvOrUndefined } from 'tungsten/env/types.js';
-export declare function rootToHtmlDev(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, RootComponentClass: AnyComponentType, instance: Instance, tungstenPrivateEnv: TungstenEnvOrUndefined, siteBasePath: SiteBasePath): Promise<string>;
+import type { SiteBasePath } from './HeadData.js';
+import type { TungstenEnvOrUndefined } from '../env/types.js';
+import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
+export declare function rootToHtmlDev(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, RootComponentClass: AnyComponentType, instance: Instance, config: FrameworkConfigComplete, tungstenPrivateEnv: TungstenEnvOrUndefined, siteBasePathOverride: SiteBasePath): Promise<string>;
 //# sourceMappingURL=rootToHtmlDev.d.ts.map

package/dist/render/rootToHtmlDev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootToHtmlDev.d.ts","sourceRoot":"","sources":["../../src/render/rootToHtmlDev.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAI,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,KAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,wBAAsB,aAAa,CAC/B,eAAe,EAAE,eAAe,EAAG,mBAAmB,EAAE,aAAa,EACrE,kBAAkB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,sBAAsB,EACpG,YAAY,EAAE,YAAY,mBAG7B"}
+{"version":3,"file":"rootToHtmlDev.d.ts","sourceRoot":"","sources":["../../src/render/rootToHtmlDev.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAI,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,KAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAI,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,KAAI,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAGpE,wBAAsB,aAAa,CAC/B,eAAe,EAAE,eAAe,EAAG,mBAAmB,EAAE,aAAa,EACrE,kBAAkB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,uBAAuB,EACzF,kBAAkB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,YAAY,mBAMjF"}

package/dist/render/rootToHtmlDev.js

@@ -1,4 +1,4 @@
 import { rootToHtml } from "./rootToHtml.js";
-export async function rootToHtmlDev(compilationInfo, clientImportAliases, RootComponentClass, instance, tungstenPrivateEnv, siteBasePath) {
-  return await rootToHtml(compilationInfo, clientImportAliases, RootComponentClass, instance, siteBasePath, true, tungstenPrivateEnv);
+export async function rootToHtmlDev(compilationInfo, clientImportAliases, RootComponentClass, instance, config, tungstenPrivateEnv, siteBasePathOverride) {
+  return await rootToHtml(compilationInfo, clientImportAliases, RootComponentClass, instance, config, siteBasePathOverride, tungstenPrivateEnv, true);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"MatchedRoute.d.ts","sourceRoot":"","sources":["../../src/routing/MatchedRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAA;AAKxE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AACD,qBAAa,YAAa,SAAQ,oCAAoC,CAAC,iBAAiB,CAAC;IACrF,IAAI,aAA4C;IAChD,OAAO,qQAgBN;CACJ"}
+{"version":3,"file":"MatchedRoute.d.ts","sourceRoot":"","sources":["../../src/routing/MatchedRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAA;AAKxE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AACD,qBAAa,YAAa,SAAQ,oCAAoC,CAAC,iBAAiB,CAAC;IACrF,IAAI,aAA4C;IAChD,OAAO,qQAaN;CACJ"}

package/dist/routing/MatchedRoute.js

@@ -17,9 +17,6 @@ export class MatchedRoute extends TungstenSimpleInternalStoreComponent {
         content,
         data
       } = this.__instance.matchedRouteInfo;
-      //console.log('MatchedRoute params', params)
-      //console.log('MatchedRoute content', content)
-      //console.log('MatchedRoute data', data)
       if (typeof content === 'function') {
         return content(data, params, this.props, this.__instance.globalData, this.__instance.location);
       } else {

package/dist/routing/runContentFunction.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=runContentFunction.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"runContentFunction.d.ts","sourceRoot":"","sources":["../../src/routing/runContentFunction.ts"],"names":[],"mappings":""}

package/dist/routing/runContentFunction.js

@@ -0,0 +1,13 @@
+// import { ContentFunction } from "tungsten/ContentFunction.js"
+// import type { ContentNode } from "../ContentNode.js"
+export {};
+// export function runContentFunction(
+//     contentFunction: ContentFunction,
+//     data,
+//     params,
+//     props,
+//     globalData,
+//     location
+// ): Promise<ContentNode> {
+//     return: contentFunction(data, params, this.props, this.__instance.globalData, this.__instance.location)
+// }

package/dist/staticGen/getAppRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAIzD,wBAAsB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,GAC9F,OAAO,CAAC,SAAS,CAAC,CAoBvB"}
+{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAIzD,wBAAsB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,GAC9F,OAAO,CAAC,SAAS,CAAC,CAuBvB"}

package/dist/staticGen/getAppRoutes.js

@@ -5,14 +5,15 @@ import { TungstenError } from "../TungstenError.js";
 // should compare this to the functions used by Servers
 export async function getAppRoutes(compilationInfo, config) {
   const fullBuildLocation = 'file://' + compilationInfo.location;
-  const routesLocationConfig = config.routesLocation;
+  const routesLocation = config.routesLocation;
+  if (routesLocation === null) return routesLocation;
   try {
-    if (Array.isArray(routesLocationConfig)) {
-      const routesFile = fixExtension(join(fullBuildLocation, routesLocationConfig[0]));
-      return (await import(routesFile))[routesLocationConfig[1]];
+    if (Array.isArray(routesLocation)) {
+      const routesFile = fixExtension(join(fullBuildLocation, routesLocation[0]));
+      return (await import(routesFile))[routesLocation[1]];
     } else {
-      const module = await import(join(fullBuildLocation, routesLocationConfig));
-      if ('routes' in module) return module.routes;else if ('default' in module) return module.default;else throw new TungstenError(`Err, no 'routes' or 'default' export found in routes file ${routesLocationConfig}`);
+      const module = await import(join(fullBuildLocation, routesLocation));
+      if ('routes' in module) return module.routes;else if ('default' in module) return module.default;else throw new TungstenError(`Err, no 'routes' or 'default' export found in routes file ${routesLocation}`);
     }
   } catch (e) {
     throw new TungstenError(`Error loading app routes. You can specify the location of your routes object in tungsten.config.js,` + ` e.g. routesLocation: ['Routes.jsx', 'routes'] (file, exportName)` + `\n${e}`);

package/dist/staticGen/staticGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAgBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBAwKnD"}
+{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBAiLnD"}

package/dist/staticGen/staticGen.js

@@ -2,6 +2,7 @@ import { existsSync, promises as fsPromises } from 'fs';
 import { join, dirname } from 'path';
 import fsExtra from 'fs-extra';
 import axios from 'axios';
+//import type { SxyFrameworkConfigComplete } from '../FrameworkConfig.js'
 import { staticSiteFolder, staticFolder, assetsFolder, publicFolder, bundleFolder, componentCssFolder } from "../settings.js";
 import { getAppRoutes } from "./getAppRoutes.js";
 import { cliError, cliWarn } from "../cliOutput.js";
@@ -23,7 +24,14 @@ export async function staticGen(framework) {
   const projectDir = process.cwd();
   //let appRoutes: RouteDefinition[] | Record<RouteKey, RouteDefinition> = await getAppRoutes(framework.compilationInfo, config)
   const getRoutes = await getAppRoutes(framework.compilationInfo, config);
-  const appRoutes = typeof getRoutes === 'function' ? getRoutes(null) : getRoutes;
+  const appRoutes = getRoutes === null ? {
+    '/': {
+      content: 'Code for static rendering SPA TBC'
+    },
+    404: {
+      content: '404 TBC'
+    }
+  } : typeof getRoutes === 'function' ? getRoutes(null) : getRoutes;
   const buildLocation = framework.compilationInfo.location;
   const server = await framework.createProdServer();
   const serverLocation = await server.start(null, true); // port, mute

package/dist/update/integrateUpdateVdom.d.ts

@@ -1,5 +1,9 @@
-import { ContentNode, ContentNodeHtml } from '../ContentNode.js';
+import { DomPointer } from '../DomPointer.js';
+import { ContentNode, ContentNodeHtml, ContentNodeComponentAny } from '../ContentNode.js';
+import { Instance } from '../Instance/Instance.js';
+import { TungstenElement } from '../TungstenElement.js';
 import { AnyComponent } from '../AnyComponent.js';
+import { RenderedContentNodeComponent } from '../RenderedContentNode.js';
 import { UpdateResult } from './UpdateResult.js';
 export type TungstenHTMLElement = HTMLElement & {
     __tungsten_click_handler: (this: HTMLElement, ev: MouseEvent) => any;
@@ -7,4 +11,12 @@ export type TungstenHTMLElement = HTMLElement & {
 };
 export declare function integrateElementUpdateVdom(element: AnyComponent, newContent: ContentNode): Promise<UpdateResult>;
 export declare function processHtmlNode(node: ContentNodeHtml, parentNode: ContentNode): void;
+type CreateTungstenComponentArgs = {
+    parent: TungstenElement;
+    instance: Instance;
+    node: ContentNodeComponentAny;
+    domPointer: DomPointer;
+};
+export declare function createTungstenComponent({ parent, instance, node, domPointer }: CreateTungstenComponentArgs): Promise<RenderedContentNodeComponent>;
+export {};
 //# sourceMappingURL=integrateUpdateVdom.d.ts.map

package/dist/update/integrateUpdateVdom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"AAWA,OAAO,EACH,WAAW,EAAwC,eAAe,EAIrE,MAAM,mBAAmB,CAAA;AAQ1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAejD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAShD,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC5C,wBAAwB,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,UAAU,KAAK,GAAG,CAAA;IACpE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB,CAAA;AASD,wBAAsB,0BAA0B,CAC5C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,GAC/C,OAAO,CAAC,YAAY,CAAC,CAgGvB;AAgiBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E"}
+{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EACH,WAAW,EAAwC,eAAe,EAElE,uBAAuB,EAG1B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,OAAO,EAKyB,4BAA4B,EAI3D,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAWhD,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC5C,wBAAwB,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,UAAU,KAAK,GAAG,CAAA;IACpE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACzB,CAAA;AAYD,wBAAsB,0BAA0B,CAC5C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,GAC/C,OAAO,CAAC,YAAY,CAAC,CA0GvB;AAskBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E;AA8TD,KAAK,2BAA2B,GAAG;IAC/B,MAAM,EAAE,eAAe,CAAA;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,uBAAuB,CAAC;IAE9B,UAAU,EAAE,UAAU,CAAA;CACzB,CAAA;AACD,wBAAsB,uBAAuB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,2BAA2B,GAC3G,OAAO,CAAC,4BAA4B,CAAC,CAU1C"}