tungsten 0.2.2 → 0.2.3

package/dist/ContentNode.d.ts

@@ -13,7 +13,7 @@ export type NodeProps = {
     value?: NodeValue;
     ref?: TungstenRef<HTMLElement>;
     /** Raw server HTML whose descendants are owned by another renderer. */
-    __html?: string;
+    __zoneHtml?: string;
     /** Prevent Tungsten from reconciling descendants of this host element. */
     __opaque?: boolean;
     [key: string]: unknown;

package/dist/ContentNode.d.ts.map

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

package/dist/RenderingNode.js

@@ -12,7 +12,7 @@ export function makeRenderingNodeClassComponentFromContentNodeClassComponent(con
       children: renderingChildren
     }
   };
-  if (placeholder) n[$placeholder] = placeholder;
+  if (placeholder === true) n[$placeholder] = placeholder;
   return n;
 }
 export function makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(contentNode, element, renderingChildren, placeholder) {
@@ -23,7 +23,7 @@ export function makeRenderingNodeFunctionComponentFromContentNodeFunctionCompone
       children: renderingChildren
     }
   };
-  if (placeholder) n[$placeholder] = placeholder;
+  if (placeholder === true) n[$placeholder] = placeholder;
   return n;
 }
 export function makeRenderingNodePlaceholderFromContentNodeComponent(contentNode, element, renderingChildren) {

package/dist/components/bindable/BindVariable.d.ts

@@ -1,3 +1,5 @@
+import { NodeValue } from '../../ContentNode.js';
 export type BindVariable<O extends object> = [O, keyof O];
+export type WidestBindVariable = BindVariable<Record<PropertyKey, NodeValue>>;
 export type TypedBindVariable<O extends object, K extends keyof O> = [O, K];
 //# sourceMappingURL=BindVariable.d.ts.map

package/dist/components/bindable/BindVariable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BindVariable.d.ts","sourceRoot":"","sources":["../../../src/components/bindable/BindVariable.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"BindVariable.d.ts","sourceRoot":"","sources":["../../../src/components/bindable/BindVariable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAA;AAG7E,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA"}

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;AA0BxD,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAiC/G,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBAyDjC"}
+{"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;AAmC/G,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBAyDjC"}

package/dist/hydrate/hydrate.js

@@ -26,6 +26,8 @@ import { checkedValueToBoolean } from "../checkedValueToBoolean.js";
 import { Default404 } from "../routing/Default404.js";
 import { initStores } from 'tungsten/Servers/initStores.js';
 import { MatchedRoute } from "../routing/MatchedRoute.js";
+import { isDev } from "../isDev.js";
+import { warn } from "../appOutput.js";
 import { jsx as _jsx } from "tungsten/jsxRuntime.js";
 function debug(...texts) {
   //console.log(...texts)
@@ -190,7 +192,7 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
   const render = Component.render;
   //console.log('render', render)
   //console.log('Component', Component)
-  if (render) {
+  if (render !== undefined) {
     const placeholderContent = typeof render === 'object' ? render.placeholder : null;
     //console.log('hydrating content', placeholderContent)
     const renderedPlaceholderContent = await hydrateNode(placeholderContent, element, domPointer, instance, meta);
@@ -465,6 +467,31 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     debug('hydarating atts');
     hydrateAttributes(node, domNode);
     //!!! node.domElement = domNode
+    const props = node[$props];
+    if (node[$type] === 'textarea') {
+      if ('value' in props) {
+        if (props.children !== undefined && !(Array.isArray(node[$props].children) && node[$props].children.length === 0)) {
+          if (isDev) {
+            warn('textarea element has both value attribute and children, children will be ignored.');
+          }
+        }
+        //if (props.value !== undefined)
+        props.children = props.value;
+        delete props.value;
+      }
+    }
+    /// !!! TODO
+    // This code relies on the select node being the immediate parent.
+    // This may not be the case (there could be a wrapping component), and could be improved
+    // if (node[$type] === 'option') {
+    //     if (ContentNodeIsHtml(parentNode) && parentNode[$type] === 'select') {
+    //         if (parentNode[$props].value !== undefined) {
+    //             if (props.value === parentNode[$props].value) {
+    //                 props.selected = 'selected'
+    //             }
+    //         }
+    //     }
+    // }
     // look up any refs
     //const props = node[$props]
     //const ref = node[$props].ref
@@ -479,6 +506,17 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
       const childDomPointer = new DomPointer(domNode);
       renderedChildren = await hydrateNode(children, parentElement, childDomPointer, instance, meta);
     }
+    if (node[$type] === 'select' && node[$props].value !== undefined && node[$props].value !== null) {
+      const options = domNode.options;
+      const value = String(node[$props].value);
+      for (let i = options.length - 1; i >= 0; i--) {
+        const option = options[i];
+        if (option.value === value) {
+          option.selected = true;
+          break;
+        }
+      }
+    }
     // note that we have left the form
     if (node[$type] === 'form') meta.insideForm = false;
     domPointer.increment();
@@ -624,6 +662,13 @@ function hydrateAttributes(node, domNode) {
       domNode[htmlEventHandlerKey(eventName)] = handler;
     }
   }
+  if (node[$type] === 'option') {
+    const option = domNode;
+    const select = option.closest('select');
+    if (select !== null && select.hasAttribute('value') && select.getAttribute('value') === option.value) {
+      option.selected = true;
+    }
+  }
   debug('--');
 }
 // onChange -> add

package/dist/react-zone.js

@@ -29,7 +29,7 @@ export class ReactZone extends TungstenSimpleComponent {
         id: this.props.hostId,
         className: className,
         "data-tungsten-react-zone": "",
-        __html: html,
+        __zoneHtml: html,
         __opaque: true
       });
     });

package/dist/render/processProps.js

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

package/dist/render/processRenderingNodeHtml.d.ts

@@ -1,3 +1,3 @@
-import { type RenderingNode, type RenderingNodeHtml } from '../RenderingNode.js';
-export declare function processRenderingNodeHtml(node: RenderingNodeHtml, parent: RenderingNode): void;
+import { type RenderingNodeHtml } from '../RenderingNode.js';
+export declare function processRenderingNodeHtml(node: RenderingNodeHtml, lastSelect: RenderingNodeHtml | null): void;
 //# sourceMappingURL=processRenderingNodeHtml.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"processRenderingNodeHtml.d.ts","sourceRoot":"","sources":["../../src/render/processRenderingNodeHtml.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAuB,MAAM,qBAAqB,CAAA;AAOrG,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,aAAa,QAoDtF"}
+{"version":3,"file":"processRenderingNodeHtml.d.ts","sourceRoot":"","sources":["../../src/render/processRenderingNodeHtml.ts"],"names":[],"mappings":"AAEA,OAAO,EACiB,KAAK,iBAAiB,EAE7C,MAAM,qBAAqB,CAAA;AAqC5B,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,QAwDhE"}

package/dist/render/processRenderingNodeHtml.js

@@ -1,15 +1,37 @@
-import { RenderingNodeIsHtml } from "../RenderingNode.js";
+import { RenderingNodeElementIsComponent, RenderingNodeElementIsHtml } from "../RenderingNode.js";
 import { bindableHtmlElements } from "../components/bindable/bindableHtmlElements.js";
 import { cliWarn } from "../cliOutput.js";
 import { debug } from "./debug.js";
 import { $props, $type } from "../contentNodeSymbols.js";
 import { checkedValueToBoolean } from "../checkedValueToBoolean.js";
-export function processRenderingNodeHtml(node, parent) {
+function collectOptionText(node) {
+  if (node === undefined || node === null || node === false || node === true) return '';
+  if (Array.isArray(node)) {
+    let text = '';
+    for (const child of node) text += collectOptionText(child);
+    return text;
+  }
+  if (typeof node === 'string' || typeof node === 'number') return String(node);
+  if (RenderingNodeElementIsHtml(node)) {
+    if (node[$type] === 'script' || typeof node[$props].__html === 'string') return '';
+    return collectOptionText(node[$props].children);
+  }
+  if (RenderingNodeElementIsComponent(node)) {
+    return collectOptionText(node[$props].children);
+  }
+  return '';
+}
+function normalizeOptionText(text) {
+  return text.replace(/^[\t\n\f\r ]+|[\t\n\f\r ]+$/g, '').replace(/[\t\n\f\r ]+/g, ' ');
+}
+export function processRenderingNodeHtml(node, lastSelect) {
   const props = node[$props];
   debug('processRenderingNodeHtml', node);
   if ('bind' in props && node[$type] in bindableHtmlElements) {
     debug('setting bound value');
+    // do we actually enforce NodeValue as the type of a bind value?
     const [bindObject, bindKey] = props.bind;
+    //const [bindObject, bindKey] = (props.bind as [Record<PropertyKey, NodeValue>, PropertyKey])
     props.value = bindObject[bindKey] ?? ''; // nullish coalesce to avoid putting undef/null into elements
     delete props.bind;
     delete props.filter;
@@ -27,20 +49,19 @@ export function processRenderingNodeHtml(node, parent) {
   }
   if (node[$type] === 'textarea') {
     if ('value' in props) {
-      if (props.children && !(Array.isArray(props.children) && props.children.length === 0)) {
-        cliWarn('textarea element has both value attribute and children, value attribute will be ignored.');
-      } else {
-        if (props.value !== undefined) props.children = [props.value];
-        delete props.value;
+      if (props.children !== undefined && !(Array.isArray(props.children) && props.children.length === 0)) {
+        cliWarn('textarea element has both value attribute and children, children will be ignored.');
       }
+      //if (props.value !== undefined)
+      props.children = props.value;
+      delete props.value;
     }
   }
-  // This code relies on the select node being the immediate parent.
-  // This may not be the case (there could be a wrapping component), and could be improved
   if (node[$type] === 'option') {
-    if (RenderingNodeIsHtml(parent) && parent[$type] === 'select') {
-      if (parent[$props].value !== undefined) {
-        if (props.value === parent[$props].value) {
+    if (lastSelect !== null) {
+      if (lastSelect[$props].value !== undefined && lastSelect[$props].value !== null) {
+        const optionValue = props.value !== undefined && props.value !== null ? String(props.value) : normalizeOptionText(collectOptionText(props.children));
+        if (optionValue === String(lastSelect[$props].value)) {
           props.selected = 'selected';
         }
       }

package/dist/render/renderingTreeToHtml.d.ts

@@ -1,4 +1,4 @@
 import type { HeadData } from './HeadData.js';
-import { type RenderingNode } from '../RenderingNode.js';
-export declare function renderingNodeToHtml(node: RenderingNode, noEscape: boolean, headData: HeadData, parent: RenderingNode): Promise<string>;
+import { type RenderingNode, type RenderingNodeHtml } from '../RenderingNode.js';
+export declare function renderingNodeToHtml(node: RenderingNode, noEscape: boolean, headData: HeadData, lastSelect: RenderingNodeHtml | null): Promise<string>;
 //# sourceMappingURL=renderingTreeToHtml.d.ts.map

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;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,CAwIjB"}
+{"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,EAAE,KAAK,iBAAiB,EAG7C,MAAM,qBAAqB,CAAA;AAS5B,wBAAsB,mBAAmB,CACrC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAC1D,UAAU,EAAE,iBAAiB,GAAG,IAAI,GACrC,OAAO,CAAC,MAAM,CAAC,CA4IjB"}

package/dist/render/renderingTreeToHtml.js

@@ -10,12 +10,12 @@ import { TungstenError } from "../TungstenError.js";
 import { throwError } from "../throwError.js";
 import { $props, $type } from "../contentNodeSymbols.js";
 import { printComponentNamesInSource } from "./printComponentNameInSource.js";
-import { RenderingNodeElementIsComponent, RenderingNodeElementIsHtml, RenderingNodeIsHtml, RenderingNodeIsLiteral, RenderingNodeIsNonRendered } from "../RenderingNode.js";
+import { RenderingNodeElementIsComponent, RenderingNodeElementIsHtml } from "../RenderingNode.js";
 import { processHead } from "./processHead.js";
 import { processRenderingNodeHtml } from "./processRenderingNodeHtml.js";
 //// Maybe we should build the full tree before rendering
 //// may need some merging with componentTreeToHtml
-export async function renderingNodeToHtml(node, noEscape, headData, parent) {
+export async function renderingNodeToHtml(node, noEscape, headData, lastSelect) {
   //console.log('nodeToHtml node', node)
   debug('nodeToHtml node', node);
   if (node === undefined || node === null || node === false || node === true) {
@@ -26,7 +26,7 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
     const htmls = [];
     for (const i in node) {
       const subNode = node[i];
-      htmls[i] = await renderingNodeToHtml(subNode, noEscape, headData, parent);
+      htmls[i] = await renderingNodeToHtml(subNode, noEscape, headData, lastSelect);
     }
     return htmls.join('');
   }
@@ -57,21 +57,23 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
           children: []
         }
       };
-      const headHtml = await renderingNodeToHtml(headNode, noEscape, headData, node);
+      const headHtml = await renderingNodeToHtml(headNode, noEscape, headData, lastSelect);
       html += headHtml;
       // how do we render it?
       //tree[$props].children.unshift(head)
     }
-    processRenderingNodeHtml(node, parent);
+    processRenderingNodeHtml(node, lastSelect);
     // update the children and attribs after processing
     let children, attribProps;
-    if (node[$props]) {
-      ({
-        children,
-        ...attribProps
-      } = node[$props]);
-    }
-    const attribs = node[$props] ? objectReduce(processProps(attribProps), (string, key, value) => {
+    //if (node[$props]) {
+    ({
+      children,
+      ...attribProps
+    } = node[$props]);
+    //}
+    //const attribs = (node[$props])
+    //    ? 
+    const attribs = objectReduce(processProps(attribProps), (string, key, value) => {
       //debug('reducing attr', key, value)
       if (typeof value === 'boolean') {
         if (value) return string + ` ${key}`;else return string;
@@ -80,12 +82,12 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
       } else {
         return string + ` ${key}="${value}"`;
       }
-    }, '') : '';
+    }, '');
+    //   : ''
     debug('attribs', attribs);
-    if (typeof node[$props].__html === 'string') {
-      return html + `<${type}${attribs}>${node[$props].__html}</${type}>`;
+    if (typeof node[$props].__zoneHtml === 'string') {
+      return html + `<${type}${attribs}>${node[$props].__zoneHtml}</${type}>`;
     }
-    ;
     ({
       children,
       ...attribProps
@@ -98,7 +100,8 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
       debug('children', children);
       const noEscape = type === 'script' || type === 'style' || '__noEscape' in node[$props] && node[$props].__noEscape !== false;
       //console.log(node[$type], node[$props], 'noEscape', noEscape)
-      const childrenHtml = await renderingNodeToHtml(children, noEscape, headData, node);
+      const childLastSelect = type === 'select' ? node : lastSelect;
+      const childrenHtml = await renderingNodeToHtml(children, noEscape, headData, childLastSelect);
       return html + `<${type}${attribs}>${childrenHtml}</${type}>`;
     } else {
       if (type in htmlMonoTags) {
@@ -118,7 +121,7 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
     const {
       children
     } = node[$props];
-    const inner = await renderingNodeToHtml(children, noEscape, headData, node);
+    const inner = await renderingNodeToHtml(children, noEscape, headData, lastSelect);
     // const meta = (node[$placeholder]) ? ' -content-length=' + treeWidth(children).toString() : ''
     // return printComponentNamesInSource
     //     ? '<!--' + node[$type].name + meta + '-->' + inner + '<!--/' + node[$type].name + '-->'
@@ -140,19 +143,19 @@ export async function renderingNodeToHtml(node, noEscape, headData, parent) {
   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);
-}
+// function treeWidth(tree: RenderingNode): number {
+//     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.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;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"}
+{"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,CAWjB"}

package/dist/render/rootToHtml.js

@@ -1,9 +1,4 @@
-import { renderingNodeToHtml } from "./renderingTreeToHtml.js";
-import { TungstenError } from "../TungstenError.js";
-import { componentNodeToRenderingTree } from "./componentNodeToRenderingTree.js";
 import { $props, $type } from "../contentNodeSymbols.js";
-import { RenderingNodeIsElement } from "../RenderingNode.js";
-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 = {
@@ -12,37 +7,4 @@ export async function rootToHtml(compilationInfo, clientImportAliases, RootCompo
     [$props]: {} // is equivalent to { type: ClassComponentTypeAny } | { type: FunctionComponentTypeAny } (type names simplified here)
   };
   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.`);
-  }
-  // // render tree to html string
-  const headData = {
-    found: false,
-    instance,
-    importAliases: compilationInfo.importAliases,
-    clientImportAliases,
-    compilationLocation: compilationInfo.buildCodeLocation,
-    dev,
-    tungstenPublicEnv,
-    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
-  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/update/integrateUpdateVdom.d.ts.map

@@ -1 +1 @@
-{"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;AAukBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E;AAkUD,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"}
+{"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;AAYhD,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;AA+mBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E;AAuWD,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"}

package/dist/update/integrateUpdateVdom.js

@@ -19,6 +19,7 @@ import { bindableHtmlElementsNumber, bindableHtmlElementsString } from "../compo
 import { checkedValueToBoolean } from "../checkedValueToBoolean.js";
 import { setCurrentComponent } from 'tungsten/hooks/setCurrentComponent.js';
 import { clearCurrentComponent } from 'tungsten/hooks/clearCurrentComponent.js';
+import { isDev } from "../isDev.js";
 function debug(...texts) {
   //console.log(...texts)
   //console.log(getStackTrace().split('\n')[2])
@@ -343,30 +344,7 @@ async function applyUpdate({
       debug('node types', newNode[$type].toLocaleLowerCase(), oldNode[$type].toLocaleLowerCase(), newNode[$type].toLocaleLowerCase() === oldNode[$type].toLocaleLowerCase());
     }
     if (WideRenderedContentNodeIsHtml(oldNode) && newNode[$type].toLocaleLowerCase() === oldNode[$type].toLocaleLowerCase()) {
-      //newNode[$props].it = it
-      //console.log('updating html node', newNode[$type])
-      //console.log('old node', oldNode[$type])
-      debug('updating html node', newNode[$type]);
-      // !!!! update
-      const domNode = oldNode.domNode;
-      updateAttributes(newNode, oldNode, domNode);
-      domPointer.increment();
-      debug(`!!!!dom pointer index is`, domPointer.index, 'after updating html node');
-      // !!! handle children
-      const newChildren = newNode[$props].children;
-      //console.log(newNode[$type], 'children', newChildren)
-      const oldChildren = oldNode.renderedChildren;
-      //console.log('oldChildren', oldChildren)
-      const renderedChildren = newNode[$props].__opaque === true ? oldChildren : await applyUpdate({
-        tungstenElement: tungstenElement,
-        instance,
-        newNode: newChildren,
-        oldNode: oldChildren,
-        domRegion: new DomRegion(domNode),
-        domPointer: new DomPointer(domNode, 0),
-        parentNode: newNode
-      });
-      return makeRenderedContentNodeHtml(newNode, domNode, renderedChildren);
+      return updateHtmlElement(tungstenElement, instance, newNode, oldNode, domPointer);
     } else {
       //console.log('deleting node and creating html', newNode[$type], oldNode)
       debug('deleting node and creating html node', newNode[$type], oldNode);
@@ -408,6 +386,50 @@ async function applyUpdate({
   const n = newNode; // eslint-disable-line @typescript-eslint/no-unused-vars
   return makeRenderedContentNodeNonRendered();
 }
+async function updateHtmlElement(tungstenElement, instance, newNode, oldNode, domPointer) {
+  //newNode[$props].it = it
+  //console.log('updating html node', newNode[$type])
+  //console.log('old node', oldNode[$type])
+  debug('updating html node', newNode[$type]);
+  // !!!! update
+  const domNode = oldNode.domNode;
+  updateAttributes(newNode, oldNode, domNode);
+  domPointer.increment();
+  debug(`!!!!dom pointer index is`, domPointer.index, 'after updating html node');
+  // !!! handle children
+  const newChildren = newNode[$props].children;
+  //console.log(newNode[$type], 'children', newChildren)
+  const oldChildren = oldNode.renderedChildren;
+  //console.log('oldChildren', oldChildren)
+  const renderedChildren = newNode[$props].__opaque === true ? oldChildren : await applyUpdate({
+    tungstenElement: tungstenElement,
+    instance,
+    newNode: newChildren,
+    oldNode: oldChildren,
+    domRegion: new DomRegion(domNode),
+    domPointer: new DomPointer(domNode, 0),
+    parentNode: newNode
+  });
+  if (newNode[$type] === 'select') {
+    // if we updated a select element
+    // if the value changed, we need to update the options
+    // alternatively the options might have changed, also requiring 
+    // updates to `selected`
+    // if the options update without the select updating, then they will need to look-back to find the value of the select
+    if (newNode[$props].value !== undefined && newNode[$props].value !== null && String(newNode[$props].value) !== String(oldNode[$props].value)) {
+      const options = domNode.options;
+      const value = String(newNode[$props].value);
+      for (let i = options.length - 1; i >= 0; i--) {
+        const option = options[i];
+        if (option.value === value) {
+          option.selected = true;
+          break;
+        }
+      }
+    }
+  }
+  return makeRenderedContentNodeHtml(newNode, domNode, renderedChildren);
+}
 async function updateComponent({
   newNode,
   parent,
@@ -583,7 +605,7 @@ export function processHtmlNode(node, parentNode) {
   //console.log('processHtmlNode', node)
   const props = node[$props];
   // set a button without specified type to button, so buttons don't submit forms unless instructed to
-  if (node[$type] === 'button' && !props.type) props.type = 'button';
+  if (node[$type] === 'button' && !('type' in props)) props.type = 'button';
   if (props.bind !== undefined) {
     const eventName = 'onInput';
     //// we have event handler code here as well as in addAttributes -- should this be moved to updateAttributes??
@@ -689,25 +711,25 @@ export function processHtmlNode(node, parentNode) {
     delete props.bindRadio;
   }
   if (node[$type] === 'textarea') {
-    if ('children' in props) {
-      if ('value' in props) {
-        warn('textarea element has both value attribute and children, value attribute will be used.');
-        //delete props.children
-        props.children = props.value;
+    if ('value' in props) {
+      if ('children' in props && !(Array.isArray(props.children) && props.children.length === 0)) {
+        if (isDev) warn('textarea element has both value attribute and children, value attribute will be used.');
       }
+      props.children = props.value;
+      delete props.value;
     }
   }
   // This code relies on the select node being the immediate parent.
   // This may not be the case (there could be a wrapping component), and could be improved
-  if (node[$type] === 'option') {
-    if (ContentNodeIsHtml(parentNode) && parentNode[$type] === 'select') {
-      if (parentNode[$props].value !== undefined) {
-        if (props.value === parentNode[$props].value) {
-          props.selected = 'selected';
-        }
-      }
-    }
-  }
+  // if (node[$type] === 'option') {
+  //     if (ContentNodeIsHtml(parentNode) && parentNode[$type] === 'select') {
+  //         if (parentNode[$props].value !== undefined) {
+  //             if (props.value === parentNode[$props].value) {
+  //                 props.selected = 'selected'
+  //             }
+  //         }
+  //     }
+  // }
   //console.log('processed:', node)
   debug('post processHtmlNode', node);
 }
@@ -776,6 +798,26 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
     domPointer: new DomPointer(htmlEl, htmlEl.childNodes.length),
     parentNode: node
   });
+  if (node[$type] === 'select') {
+    if (node[$props].value !== undefined && node[$props].value !== null) {
+      const options = htmlEl.options;
+      const value = String(node[$props].value);
+      for (let i = options.length - 1; i >= 0; i--) {
+        const option = options[i];
+        if (option.value === value) {
+          option.selected = true;
+          break;
+        }
+      }
+    }
+  }
+  if (node[$type] === 'option') {
+    const option = htmlEl;
+    const select = option.closest('select');
+    if (select !== null && select.hasAttribute('value') && select.getAttribute('value') === option.value) {
+      option.selected = true;
+    }
+  }
   return {
     ...node,
     domNode: htmlEl,
@@ -863,7 +905,7 @@ function updateAttributes(node, oldNode, domNodeHTMLElement) {
           debug('add onclick');
           const clickHandlerKey = htmlEventHandlerKey('click');
           debug('domNode.' + clickHandlerKey, domNode[clickHandlerKey]);
-          if (domNode[clickHandlerKey]) {
+          if ('clickHandlerKey' in domNode) {
             domNode.removeEventListener('click', domNode[clickHandlerKey]);
           }
           // if its a button without type="submit", prevent default to stop it from submitting forms
@@ -896,6 +938,13 @@ function updateAttributes(node, oldNode, domNodeHTMLElement) {
         }
     }
   }
+  if (node[$type] === 'option') {
+    const option = domNode;
+    const select = option.closest('select');
+    if (select !== null && select.hasAttribute('value') && select.getAttribute('value') === option.value) {
+      option.selected = true;
+    }
+  }
   domNode.__tungsten_oldAttributes = newAttributes;
   return newAttributes;
 }
@@ -913,13 +962,13 @@ function processAttributes(node) {
     ...props
   };
   delete attributes.ref;
-  delete attributes.__html;
+  delete attributes.__zoneHtml;
   delete attributes.__opaque;
   delete attributes.class;
   if (attributes.className !== undefined) attributes.class = attributes.className;
   delete attributes.className;
   // process the bind attr to a value attr
-  if (attributes.bind) {
+  if ('bind' in attributes && attributes.bind !== undefined) {
     const bind = attributes.bind;
     // this will overwrite any existing value attr
     attributes.value = bind[0][bind[1]] ?? ''; // !!! unsafe, assuming bind variable is a suitable value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "",
   "type": "module",
   "bin": {

package/types/jsx/html.d.ts

@@ -527,7 +527,7 @@ type AriaRole =
 type ClassNameType = string | undefined | (string | undefined)[];
 
 export interface HTMLAttributes<T> extends AriaAttributes, DOMAttributes<T> {
-    __html?: string | undefined;
+    __zoneHtml?: string | undefined;
     __opaque?: boolean | undefined;
     // React-specific Attributes
     defaultChecked?: boolean | undefined;