tungsten 0.1.59 → 0.1.60

package/dist/hooks/useState.js

@@ -2,12 +2,12 @@ import { getCurrentComponent } from "./getCurrentComponent.js";
 import { TungstenError, TungstenProductionError } from "../TungstenError.js";
 import { isDev } from "../isDev.js";
 const thisHook = 'useState';
-// don't need these dumb overloads
-// export function useState<T extends undefined>(): [T, (newValue: T) => void]
+// overloads just so TS errs say defaultValue not args
+// export function useState<T extends undefined>(defaultValue?: T): [T, (newValue: T) => void]
 // export function useState<T>(defaultValue: T): [T, (newValue: T) => void]
 // export function useState<T>(...args: T extends undefined ? [defaultValue?: T] : [defaultValue: T])
 //     : [T, (newValue: T) => void] {
-export function useState(...args) {
+export function useState(...defaultValue) {
   // what do we do here?
   const c = getCurrentComponent();
   if (c === undefined) {
@@ -31,7 +31,7 @@ export function useState(...args) {
     return [c.state[index], update];
   } else {
     //console.log('useState initial run')
-    c.state[index] = args[0];
-    return [args[0], update]; // eslint-disable-line no-type-assertion/no-type-assertion -- args[0] can only be undefined if T includes undefined 
+    c.state[index] = defaultValue[0];
+    return [defaultValue[0], update]; // eslint-disable-line no-type-assertion/no-type-assertion -- args[0] can only be undefined if T includes undefined 
   }
 }

package/dist/hydrate/hydrate.d.ts

@@ -1,5 +1,5 @@
 import type { InstanceConfig } from '../Instance/InstanceConfig.js';
 import type { AppRoutes } from '../routing/AppRoutes.js';
 import { TungstenBaseComponentType } from '../Components.jsx';
-export declare function hydrate(appRoutes: AppRoutes, RootComponent: TungstenBaseComponentType, instanceConfig: InstanceConfig): Promise<void>;
+export declare function hydrate(appRoutes: AppRoutes, RootComponent: TungstenBaseComponentType | null, instanceConfig: InstanceConfig): Promise<void>;
 //# sourceMappingURL=hydrate.d.ts.map

package/dist/hydrate/hydrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAyBxD,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAgC/G,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,EACxC,cAAc,EAAE,cAAc,iBAyCjC"}
+{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AA0BxD,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAgC/G,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBAsDjC"}

package/dist/hydrate/hydrate.js

@@ -1,4 +1,6 @@
-import { $head, $number, $string, makeRenderedContentNodeNonRendered, makeRenderedContentNodeClassComponent, makeRenderedContentNodeFunctionComponent } from "../RenderedContentNode.js";
+import { integrateElementUpdateVdom } from "../update/integrateUpdateVdom.js";
+//import type { RouteType } from '../routing/RouteType.js'
+import { $number, $string, makeRenderedContentNodeNonRendered, makeRenderedContentNodeClassComponent, makeRenderedContentNodeFunctionComponent } from "../RenderedContentNode.js";
 import { ContentNodeElementIsHtml, ContentNodeIsHtml, ContentNodeIsComponent, ContentNodeComponentIsClassComponent, ContentNodeIsElement } from "../ContentNode.js";
 import { IsHTMLElement } from "../DomNodes.js";
 import { DomPointer } from "../DomPointer.js";
@@ -38,7 +40,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   //console.log('hydration global data ', __tungsten_global_data__)
   const location = window.location.pathname;
   const routes = typeof appRoutes === 'function' ? appRoutes(null) : appRoutes;
-  const matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, location, routes);
+  const matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
   const globalData = __tungsten_global_data__;
   const {
     internalStore,
@@ -59,15 +61,30 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   if (typeof __tungsten_route_data__ !== 'undefined') {
     instance.routeData = __tungsten_route_data__;
   }
-  //await hydrateRootComponent( instance, RootComponent, new DomPointer(document, 0) ) // dom pointer at doctype?
-  await hydrateRootComponent(instance, RootComponent, new DomPointer(document, 1), makeDefaultHydrateMeta()); // dom pointer at html?
+  const domPointer = new DomPointer(document, 1);
+  const meta = makeDefaultHydrateMeta();
+  if (RootComponent !== null) {
+    await hydrateRootComponent(instance, RootComponent, domPointer, meta); // dom pointer at html?
+    // FUTURE: await hydrateNode(content, element, domPointer, instance, meta)
+  } else {
+    const {
+      params,
+      content: contentOrContentFunction,
+      data
+    } = matchedRouteInfo;
+    const content = typeof contentOrContentFunction === 'function' ? contentOrContentFunction(data, params, {}, globalData, location) : contentOrContentFunction;
+    console.log('hydration content:', content);
+    hydrateNode(content, null, domPointer, instance, meta);
+  }
   instance.hydrationComplete = true;
   //// Can components update while hydrating is still taking place
   //// -- probably yes
   //// Can we pause any further update until hydration completes, to retain coherency?
   //// Or should we set a value on each component that is hydrating to guarantee correctness? seems better
 }
-function hydrationRouting(matchedRouteInfo, location, routes) {
+function hydrationRouting(matchedRouteInfo,
+//location: string,
+routes) {
   const {
     key
   } = matchedRouteInfo;
@@ -92,7 +109,7 @@ async function hydrateRootComponent(instance, RootComponent, domPointer, meta) {
     routeParams: undefined,
     routeData: undefined,
     instance,
-    parentComponent: null
+    parentElement: null
   });
   await element.__init();
   handleRootTitle(element);
@@ -150,42 +167,162 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
   } = node;
   debug('Component', Component);
   debug('domPointer', domPointer, domPointer.index);
+  const domIndexStart = domPointer.index;
+  const openingNode = domPointer.get();
+  if (openingNode.nodeType !== Node.COMMENT_NODE) {
+    throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + openingNode.toString() + ' type ' + openingNode.nodeType.toString());
+  }
+  const openingComment = openingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+  domPointer.increment();
   //// InstantiateClassComponent???
   const element = new Component({
     props,
     routeParams,
     routeData,
     instance,
-    parentComponent: parentElement
+    parentElement
   });
   await element.__init();
   //// Add to parent childNodes?
   //const content = await element.__styledContent()
-  const content = await element.__initialContent();
-  debug('content', content);
-  const domIndexStart = domPointer.index;
-  const openingNode = domPointer.get();
-  if (openingNode.nodeType !== Node.COMMENT_NODE) {
-    throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + openingNode.toString() + ' type ' + openingNode.nodeType.toString());
-  }
-  const openingComment = openingNode; // eslint-disable-line no-type-assertion/no-type-assertion
-  domPointer.increment();
-  const renderedContent = await hydrateNode(content, element, domPointer, instance, meta);
-  const closingNode = domPointer.get();
-  if (closingNode.nodeType !== Node.COMMENT_NODE) {
-    throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
+  const initialContent = await element.__initialContent();
+  debug('content', initialContent);
+  const render = Component.render;
+  //console.log('render', render)
+  //console.log('Component', Component)
+  if (render) {
+    const placeholderContent = typeof render === 'object' ? render.placeholder : null;
+    //console.log('hydrating content', placeholderContent)
+    const renderedPlaceholderContent = await hydrateNode(placeholderContent, element, domPointer, instance, meta);
+    /*
+    1. Find existing nodes (opening comment, use meta to get closing comment)
+    2. Delete content nodes (between comments)
+    3. Init Element
+    4. Get initial content
+    5. Insert content
+    6. set DomPointer to end?
+    7. Return a rendered content node?
+    */
+    /*
+    1. Init Element
+    2. Find existing nodes (opening comment, use meta to get closing comment)
+    3. Create DOM Region
+    4. Assign DOM Region to element
+    5. Hydrate the current content to get a renderedContentTree
+    6. Assign current content to element
+    7. Get initial content
+    8. integrateUpdate with new content
+    9. set DomPointer to end?
+    10. Return a rendered content node?
+    */
+    //const placeholderContent = (typeof render === 'object') ? render.placeholder : null
+    //const placeholderContent = await hydrateNodeComponent(node, parentElement, domPointer, instance, meta)
+    // replace the server content with the new content
+    //renderedContent = await hydrateNode(content, element, domPointer, instance, meta)
+    //const renderedContent = await hydrateNode(content, element, domPointer, instance, meta)
+    //domPointer.increment(contentLength)
+    //console.log('Client Render Pointer El', domPointer.get())
+    const closingNode = domPointer.get();
+    if (closingNode.nodeType !== Node.COMMENT_NODE) {
+      throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
+    }
+    const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+    domPointer.increment();
+    const domIndexCount = domPointer.index - domIndexStart;
+    debug('DOM region', domPointer.parent, domIndexStart, domIndexCount);
+    element.__domRegion = new DomRegion(domPointer.parent, domIndexStart, domIndexCount);
+    debug('el dom region', element.constructor.name, element.__domRegion);
+    if (element.__domRegion.lastElement) debug('last el children', element.__domRegion.lastElement.childNodes);
+    //console.log('hydrated', element.constructor.name, 'with content', renderedContent)
+    element.__currentContent = renderedPlaceholderContent;
+    //console.log('__domRegion', element.__domRegion)
+    //console.log('__domRegion clone', { ...element.__domRegion })
+    //console.log('__currentContent', element.__currentContent)
+    //console.log('__currentContent clone', { ...element.__currentContent })
+    //const initialClientContent = await element.__initialContent()
+    //console.log('initialClientContent', initialContent)
+    const updateResult = await integrateElementUpdateVdom(element, initialContent);
+    // dom region should still be valid?
+    //element.__domRegion
+    element.__currentContent = updateResult.renderedContent;
+    // const renderedNode = renderClassComponent({
+    //     parent: parentElement,
+    //     instance,
+    //     node,
+    //     element,
+    //     content: initialContent,
+    //     domPointer,
+    //     openingComment,
+    //     closingComment
+    // })
+    element.__didHydrate();
+    return makeRenderedContentNodeClassComponent(node, element, openingComment, closingComment);
+  } else {
+    const renderedContent = await hydrateNode(initialContent, element, domPointer, instance, meta);
+    const closingNode = domPointer.get();
+    if (closingNode.nodeType !== Node.COMMENT_NODE) {
+      throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
+    }
+    const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+    domPointer.increment();
+    const domIndexCount = domPointer.index - domIndexStart;
+    debug('DOM region', domPointer.parent, domIndexStart, domIndexCount);
+    element.__domRegion = new DomRegion(domPointer.parent, domIndexStart, domIndexCount);
+    debug('el dom region', element.constructor.name, element.__domRegion);
+    if (element.__domRegion.lastElement) debug('last el children', element.__domRegion.lastElement.childNodes);
+    //console.log('hydrated', element.constructor.name, 'with content', renderedContent)
+    element.__currentContent = renderedContent;
+    element.__didHydrate();
+    return makeRenderedContentNodeClassComponent(node, element, openingComment, closingComment);
   }
-  const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
-  domPointer.increment();
-  const domIndexCount = domPointer.index - domIndexStart;
-  debug('DOM region', domPointer.parent, domIndexStart, domIndexCount);
-  element.__domRegion = new DomRegion(domPointer.parent, domIndexStart, domIndexCount);
-  debug('el dom region', element.constructor.name, element.__domRegion);
-  if (element.__domRegion.lastElement) debug('last el children', element.__domRegion.lastElement.childNodes);
-  //console.log('hydrated', element.constructor.name, 'with content', renderedContent)
-  element.__currentContent = renderedContent;
-  element.__didHydrate();
-  return makeRenderedContentNodeClassComponent(node, element, openingComment, closingComment);
+}
+async function renderClassComponent({
+  node,
+  element,
+  domPointer,
+  openingComment,
+  closingComment
+}) {
+  //console.log('-updateClassComponent', newNode)
+  //const element = node.element
+  element.props = node[$props];
+  debug('rendering client class component', node);
+  //console.log('update class component', newNode)
+  //console.log('old element', element)
+  //console.log('domPointer before updating comp', domPointer)
+  //console.log('domPointer children', [...domPointer.parent.childNodes])
+  //throwError('','')
+  const updateResult = await element.__update(); // this going to run code on a Tungsten Base Component class
+  // which is going to call back to integrateUpdateVdom in this file
+  domPointer.increment(updateResult.nodesLength); // bump the dom pointer index forward by the number of nodes
+  // within that element's content
+  element.__didUpdate();
+  return {
+    ...node,
+    element,
+    openingComment,
+    closingComment
+  };
+}
+async function renderFunctionComponent({
+  node,
+  standIn,
+  domPointer,
+  openingComment,
+  closingComment
+}) {
+  // this func does not seem to be updating the dom pointer index
+  //console.log('updateFunctionComponent')
+  //const standIn = node.element
+  standIn.props = node[$props];
+  const updateResult = await standIn.update();
+  domPointer.increment(updateResult.nodesLength); // bump the dom pointer index forward by the number of nodes within that element's content
+  return {
+    ...node,
+    element: standIn,
+    openingComment,
+    closingComment
+  };
 }
 async function hydrateFunctionComponent(node, parentElement, domPointer, instance, meta) {
   debug('----\nhydrateComponent');
@@ -320,8 +457,9 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     instance.persistentHeadChildren = persistentHeadChildren;
     debug('head node - skipping, because we add a lot to this during initial render, breaking matching');
     domPointer.increment();
+    //return { [$type]: $head, domNode: node as HTMLElement } // eslint-disable-line no-type-assertion/no-type-assertion
     return {
-      [$type]: $head,
+      [$type]: 'head',
       domNode: node
     }; // eslint-disable-line no-type-assertion/no-type-assertion
   }
@@ -360,6 +498,12 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     debug('hydarating atts');
     hydrateAttributes(node, domNode);
     //!!! node.domElement = domNode
+    // look up any refs
+    //const props = node[$props]
+    //const ref = node[$props].ref
+    if ('ref' in node[$props]) {
+      node[$props].ref.current = domNode;
+    }
     debug('valid children', validChildren(node[$props].children), node[$props].children);
     const children = node[$props].children;
     let renderedChildren = $contentNull;
@@ -379,27 +523,7 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     };
   } else if (ContentNodeIsComponent(node)) {
     debug('comp');
-    if (ContentNodeComponentIsClassComponent(node)) {
-      node;
-      /// Component?
-      debug('found a class component while trying to hydrate');
-      const renderedNode = await hydrateClassComponent(node, parentElement, domPointer, instance, meta);
-      return renderedNode;
-      // return {
-      //     ...node,
-      //     element
-      // }
-    } else {
-      node;
-      /// Component?
-      debug('found a function component while trying to hydrate');
-      const renderedNode = await hydrateFunctionComponent(node, parentElement, domPointer, instance, meta);
-      return renderedNode;
-      // return {
-      //     ...node,
-      //     element
-      // }
-    }
+    return hydrateNodeComponent(node, parentElement, domPointer, instance, meta);
   }
   // confirm that this code is not reached
   const n = node; // eslint-disable-line @typescript-eslint/no-unused-vars
@@ -408,6 +532,21 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
   //return makeRenderedContentNodeNonRendered()
 }
 //// !!!! We need to handle bind here (or somewhere)
+async function hydrateNodeComponent(node, parentElement, domPointer, instance, meta) {
+  if (ContentNodeComponentIsClassComponent(node)) {
+    node;
+    /// Component?
+    debug('found a class component while trying to hydrate');
+    const renderedNode = await hydrateClassComponent(node, parentElement, domPointer, instance, meta);
+    return renderedNode;
+  } else {
+    node;
+    /// Component?
+    debug('found a function component while trying to hydrate');
+    const renderedNode = await hydrateFunctionComponent(node, parentElement, domPointer, instance, meta);
+    return renderedNode;
+  }
+}
 // export type HTMLBindableElement = HTMLButtonElement | HTMLDataElement | HTMLInputElement | HTMLLIElement
 // | HTMLMeterElement | HTMLOptionElement | HTMLParamElement | HTMLProgressElement | HTMLSelectElement | HTMLTextAreaElement
 function hydrateAttributes(node, domNode) {

package/dist/jsx-runtime.d.ts

@@ -0,0 +1,2 @@
+export { jsx, jsxs, Fragment, type JsxNodeType } from './jsxRuntime.js';
+//# sourceMappingURL=jsx-runtime.d.ts.map

package/dist/jsx-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsx-runtime.d.ts","sourceRoot":"","sources":["../src/jsx-runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAA"}

package/dist/jsx-runtime.js

@@ -0,0 +1 @@
+export { jsx, jsxs, Fragment } from "./jsxRuntime.js";

package/dist/jsxRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsxRuntime.d.ts","sourceRoot":"","sources":["../src/jsxRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,6BAA6B,EAAoD,MAAM,kBAAkB,CAAA;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAM9C,cAAc,yBAAyB,CAAA;AAEvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAEvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAkBrE,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO,GACb,WAAW,CAgEb;AAID,eAAO,MAAM,IAAI,YAAM,CAAA"}
+{"version":3,"file":"jsxRuntime.d.ts","sourceRoot":"","sources":["../src/jsxRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,6BAA6B,EAAoD,MAAM,kBAAkB,CAAA;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAM9C,cAAc,yBAAyB,CAAA;AAEvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAEvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAkBrE,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO,GACb,WAAW,CAyEb;AAID,eAAO,MAAM,IAAI,YAAM,CAAA"}

package/dist/jsxRuntime.js

@@ -18,6 +18,10 @@ function ComponentIsClassComponent(c) {
 }
 // jsx func to turn a jsx element into a tree node
 export function jsx(type, props, key) {
+  console.log('--jsx--');
+  console.log('type', type);
+  console.log('type', props);
+  console.log('key', key);
   // merge together class and className, into className
   // and convert any arrays to strings in the process
   if (Array.isArray(props.className)) props.className = classNameArrayToString(props.className);
@@ -78,7 +82,7 @@ export function jsx(type, props, key) {
   if (typeof type === 'number') {
     return String(type);
   }
-  throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: did not recognize element, expected a string, function, class (type function), or fragment. Received type ${typeof type}: ${type}`);
+  throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: did not recognize element` + `, expected a string, function, class (type function), or fragment.` + ` Received type ${typeof type}: ${type}`);
 }
 // jsxs is used when children is an array instead of a single object
 // just use the same function for both

package/dist/makeFinalConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAGpF,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,GAAG,uBAAuB,CAYpF"}
+{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAGpF,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,GAAG,uBAAuB,CAWpF"}

package/dist/makeInstanceConfigFromFrameworkConfig.d.ts

@@ -0,0 +1,4 @@
+import type { InstanceConfig } from './Instance/InstanceConfig.js';
+import type { FrameworkConfigComplete } from './FrameworkConfig.js';
+export declare function makeInstanceConfigFromFrameworkConfig(frameworkConfig: FrameworkConfigComplete, dev?: boolean): InstanceConfig;
+//# sourceMappingURL=makeInstanceConfigFromFrameworkConfig.d.ts.map

package/dist/makeInstanceConfigFromFrameworkConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeInstanceConfigFromFrameworkConfig.d.ts","sourceRoot":"","sources":["../src/makeInstanceConfigFromFrameworkConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,wBAAgB,qCAAqC,CACjD,eAAe,EAAE,uBAAuB,EAAE,GAAG,GAAE,OAAe,GAC/D,cAAc,CAUhB"}

package/dist/makeInstanceConfigFromFrameworkConfig.js

@@ -0,0 +1,12 @@
+import { isProd } from "./isProd.js";
+export function makeInstanceConfigFromFrameworkConfig(frameworkConfig, dev = false) {
+  const c = {
+    prod: isProd,
+    useRootComponent: frameworkConfig.useRootComponent,
+    clientSideNav: frameworkConfig.clientSideNav,
+    siteBasePath: dev ? '' : frameworkConfig.siteBasePath,
+    staticSite: frameworkConfig.staticSite
+  };
+  if ('sourceDir' in frameworkConfig) c.sourceDir = frameworkConfig.sourceDir;
+  return c;
+}

package/dist/render/componentNodeToRenderingTree.d.ts

@@ -0,0 +1,6 @@
+import type { Instance } from '../Instance/Instance.js';
+import { type RenderingNodeComponent } from '../RenderingNode.js';
+import { type ContentNodeComponent } from '../ContentNode.js';
+import { AnyComponent } from '../AnyComponent.js';
+export declare function componentNodeToRenderingTree(componentNode: ContentNodeComponent, parentComponent: AnyComponent | null, instance: Instance, noEscape: boolean): Promise<RenderingNodeComponent>;
+//# sourceMappingURL=componentNodeToRenderingTree.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"componentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/componentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAGhH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,wBAAsB,4BAA4B,CAC9C,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACjH,OAAO,CAAC,sBAAsB,CAAC,CA6CjC"}

package/dist/render/componentNodeToRenderingTree.js

@@ -0,0 +1,41 @@
+import { makeRenderingNodeClassComponentFromContentNodeClassComponent, makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent } from "../RenderingNode.js";
+import { ContentNodeComponentIsClassComponent } from "../ContentNode.js";
+import { classComponentNodeToRenderingTree } from "./classComponentNodeToRenderingTree.js";
+import { functionComponentNodeToRenderingTree } from "./functionComponentNodeToRenderingTree.js";
+import { TungstenError } from "../TungstenError.js";
+import { $type } from "../contentNodeSymbols.js";
+import { contentTreeToRenderingTree } from "./contentTreeToRenderingTree.js";
+export async function componentNodeToRenderingTree(componentNode, parentComponent, instance, noEscape) {
+  //console.log('type', componentNode[$type])
+  const render = componentNode[$type].render;
+  //console.log('render', render)
+  if (render) {
+    let location;
+    let placeholder = null;
+    if (typeof render === 'string') {
+      location = render;
+    } else {
+      location = render.location;
+      if (typeof render === 'object' && 'placeholder') {
+        placeholder = render.placeholder;
+      }
+    }
+    if (location === 'client') {
+      const placeholderTree = await contentTreeToRenderingTree(placeholder, parentComponent, instance, noEscape);
+      if (ContentNodeComponentIsClassComponent(componentNode)) {
+        return makeRenderingNodeClassComponentFromContentNodeClassComponent(componentNode, null, placeholderTree, true);
+      } else {
+        return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(componentNode, null, placeholderTree, true);
+      }
+    }
+  }
+  //console.log('componentRenderToTree component', component)
+  if (ContentNodeComponentIsClassComponent(componentNode)) {
+    //console.log('class component')
+    return await classComponentNodeToRenderingTree(componentNode, parentComponent, instance, noEscape);
+  } else {
+    //console.log('function component')
+    return await functionComponentNodeToRenderingTree(componentNode, parentComponent, instance, noEscape);
+  }
+  throw new TungstenError(`Error, component passed to componentRenderToTree() was not a valid component`);
+}

package/dist/render/contentToHtml.d.ts

@@ -0,0 +1,9 @@
+import type { CompilationInfo } from '../build/CompilationInfo.js';
+import type { ImportAliases } from '../build/ImportAliases.js';
+import type { SiteBasePath } from './HeadData.js';
+import type { ContentNode } from '../ContentNode.js';
+import type { Instance } from '../Instance/Instance.js';
+import { TungstenEnvOrUndefined } from 'tungsten/env/types.js';
+import { FrameworkConfigComplete } from 'tungsten/FrameworkConfig.js';
+export declare function contentToHtml(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, content: ContentNode, instance: Instance, config: FrameworkConfigComplete, siteBasePathOverride: SiteBasePath, tungstenPublicEnv?: TungstenEnvOrUndefined, dev?: boolean): Promise<string>;
+//# sourceMappingURL=contentToHtml.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"contentToHtml.d.ts","sourceRoot":"","sources":["../../src/render/contentToHtml.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,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,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,aAAa,CAC/B,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EACpE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EACxC,MAAM,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,YAAY,EACnE,iBAAiB,GAAE,sBAAkC,EAAE,GAAG,UAAQ,GACnE,OAAO,CAAC,MAAM,CAAC,CAoDjB"}

package/dist/render/contentToHtml.js

@@ -0,0 +1,44 @@
+import { renderingNodeToHtml } from "./renderingTreeToHtml.js";
+import { TungstenError } from "../TungstenError.js";
+import { RenderingNodeIsElement } from "../RenderingNode.js";
+import { contentTreeToRenderingTree } from "./contentTreeToRenderingTree.js";
+import { cliWarn } from 'tungsten/cliOutput.js';
+export async function contentToHtml(compilationInfo, clientImportAliases, content, instance, config, siteBasePathOverride, tungstenPublicEnv = undefined, dev = false) {
+  // const rootNode = { // eslint-disable-line no-type-assertion/no-type-assertion 
+  //     [$type]: RootComponentClass,    // TypeScript needs some help to understand that { type: AnyComponentType }
+  //     [$props]: {}                   // is equivalent to { type: ClassComponentTypeAny } | { type: FunctionComponentTypeAny } (type names simplified here)
+  // } as ContentNodeComponent
+  const tree = await contentTreeToRenderingTree(content, null, instance, false);
+  //console.log('tree', tree)
+  if (config.useRootComponent && !RenderingNodeIsElement(tree)) {
+    throw new TungstenError(`Root content was not a ContentNodeElement type. Ensure that your root node returns valid content.`);
+  }
+  // // render tree to html string
+  const headData = {
+    found: false,
+    instance,
+    importAliases: compilationInfo.importAliases,
+    clientImportAliases,
+    compilationLocation: compilationInfo.location,
+    dev,
+    tungstenPublicEnv,
+    siteBasePath: siteBasePathOverride
+  };
+  //console.log('rendering tree', inspect(tree, { depth: 99 } ))
+  let html = await renderingNodeToHtml(tree, false, headData, null);
+  if (!headData.found && !config.suppressNoHeadWarning) {
+    cliWarn(`Found no <head> while rendering path '${instance.location}'. This is probably a mistake`);
+  }
+  //writeFileSync('__debug.html', html)
+  //console.log('rootToHtml html', html)
+  // insert the title if one was set during processing
+  if (instance.title) {
+    if (html.includes('<title>')) {
+      html = html.replace(/(?:<title>)(.*?)(?:<\/title>)/, `<title>${instance.title}</title>`);
+    } else {
+      html = html.replace('</head>', `</head><title>${instance.title}</title>`);
+    }
+  }
+  html = '<!DOCTYPE html>' + html;
+  return html;
+}

package/dist/render/contentToHtmlDev.d.ts

@@ -0,0 +1,9 @@
+import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
+import type { CompilationInfo } from '../build/CompilationInfo.js';
+import type { ImportAliases } from '../build/ImportAliases.js';
+import type { ContentNode } from '../ContentNode.js';
+import type { Instance } from '../Instance/Instance.js';
+import { SiteBasePath } from './HeadData.js';
+import { TungstenEnvOrUndefined } from 'tungsten/env/types.js';
+export declare function contentToHtmlDev(compilationInfo: CompilationInfo, clientImportAliases: ImportAliases, content: ContentNode, instance: Instance, config: FrameworkConfigComplete, tungstenPrivateEnv: TungstenEnvOrUndefined, siteBasePathOverride: SiteBasePath): Promise<string>;
+//# sourceMappingURL=contentToHtmlDev.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"contentToHtmlDev.d.ts","sourceRoot":"","sources":["../../src/render/contentToHtmlDev.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,wBAAsB,gBAAgB,CAClC,eAAe,EAAE,eAAe,EAAG,mBAAmB,EAAE,aAAa,EACrE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,uBAAuB,EACzE,kBAAkB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,YAAY,mBAKjF"}

package/dist/render/contentToHtmlDev.js

@@ -0,0 +1,4 @@
+import { contentToHtml } from "./contentToHtml.js";
+export async function contentToHtmlDev(compilationInfo, clientImportAliases, content, instance, config, tungstenPrivateEnv, siteBasePathOverride) {
+  return await contentToHtml(compilationInfo, clientImportAliases, content, instance, config, siteBasePathOverride, tungstenPrivateEnv, true);
+}

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

@@ -1 +1 @@
-{"version":3,"file":"contentTreeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/contentTreeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACH,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAU1B,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACzI,OAAO,CAAC,aAAa,CAAC,CAuE3B"}
+{"version":3,"file":"contentTreeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/contentTreeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EACH,KAAK,WAAW,EAEnB,MAAM,mBAAmB,CAAA;AAS1B,wBAAsB,0BAA0B,CAC5C,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAC9F,OAAO,CAAC,aAAa,CAAC,CA2EzB"}

package/dist/render/contentTreeToRenderingTree.js

@@ -1,11 +1,10 @@
-import { ContentNodeIsLiteral, ContentNodeElementIsComponent, ContentNodeElementIsHtml, ContentNodeComponentIsClassComponent } from "../ContentNode.js";
+import { ContentNodeIsLiteral, ContentNodeElementIsComponent, ContentNodeElementIsHtml } from "../ContentNode.js";
 import { validChildren } from "../validChildren.js";
 import { debug } from "./debug.js";
 import { throwError } from "../throwError.js";
 import { $key, $props, $type } from "../contentNodeSymbols.js";
-import { classComponentNodeToRenderingTree } from "./classComponentNodeToRenderingTree.js";
-import { functionComponentNodeToRenderingTree } from "./functionComponentNodeToRenderingTree.js";
 import { processHtmlNode } from "./processHtmlNode.js";
+import { componentNodeToRenderingTree } from "./componentNodeToRenderingTree.js";
 export async function contentTreeToRenderingTree(node, parentComponent, instance, noEscape) {
   //console.log('completeTree node', node)
   debug('completeTree node', node);
@@ -58,11 +57,12 @@ export async function contentTreeToRenderingTree(node, parentComponent, instance
     //renderingNode node
   }
   if (ContentNodeElementIsComponent(node)) {
-    if (ContentNodeComponentIsClassComponent(node)) {
-      return classComponentNodeToRenderingTree(node, parentComponent, instance, noEscape);
-    } else {
-      return functionComponentNodeToRenderingTree(node, parentComponent, instance, noEscape);
-    }
+    return componentNodeToRenderingTree(node, parentComponent, instance, noEscape);
+    // if (ContentNodeComponentIsClassComponent(node)) {
+    //     return classComponentNodeToRenderingTree(node, parentComponent, instance, noEscape)
+    // } else {
+    //     return functionComponentNodeToRenderingTree(node, parentComponent, instance, noEscape)
+    // }
   }
   const n = node; // eslint-disable-line @typescript-eslint/no-unused-vars
   throwError('render -> completeTree()', `node returned from a component did not match expected format.` + ` Node: ${JSON.stringify(node)}`);

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

@@ -1 +1 @@
-{"version":3,"file":"functionComponentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/functionComponentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAsE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAGrI,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAGhE,wBAAsB,oCAAoC,CACtD,WAAW,EAAE,4BAA4B,EACzC,eAAe,EAAE,YAAY,GAAG,IAAI,EACpC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACtC,OAAO,CAAC,sBAAsB,CAAC,CAajC"}
+{"version":3,"file":"functionComponentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/functionComponentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAE9B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAKhE,wBAAsB,oCAAoC,CACtD,WAAW,EAAE,4BAA4B,EACzC,eAAe,EAAE,YAAY,GAAG,IAAI,EACpC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACtC,OAAO,CAAC,sBAAsB,CAAC,CAajC"}

package/dist/render/functionComponentNodeToRenderingTree.js

@@ -2,12 +2,14 @@ import { makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent } fr
 import { getStyledContentFromFunctionComponent } from "../getStyledContentFromFunctionComponent.js";
 import { contentTreeToRenderingTree } from "./contentTreeToRenderingTree.js";
 import { instantiateFunctionComponent } from "./instantiateFunctionComponent.js";
+import { setCurrentComponent } from 'tungsten/hooks/setCurrentComponent.js';
+import { clearCurrentComponent } from 'tungsten/hooks/clearCurrentComponent.js';
 export async function functionComponentNodeToRenderingTree(contentNode, parentComponent, instance, noEscape) {
   const standIn = instantiateFunctionComponent(contentNode, parentComponent, instance);
   //console.log('functionComponentToTree')
-  // MC? setCurrentComponent(standIn)
+  setCurrentComponent(standIn);
   const content = await getStyledContentFromFunctionComponent(standIn);
   //const content = await getStyledContentFromFunctionComponent(standIn.func, standIn.props)
-  // MC? clearCurrentComponent()
+  clearCurrentComponent();
   return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, standIn, await contentTreeToRenderingTree(content, parentComponent, instance, noEscape));
 }