tungsten 0.4.11 → 0.4.13

package/dist/timeProfiler.js

@@ -5,7 +5,7 @@
 import { performance } from 'node:perf_hooks';
 import { AsyncLocalStorage, createHook } from 'node:async_hooks';
 import chalk from 'chalk-extensions';
-import { cliOut } from "./cliOutput.js";
+import { cliOut } from './cliOutput.js';
 // Nesting has to be recorded, not inferred: sibling phases started together sit inside each other's
 // time windows, so intervals alone cannot tell a nested call from a concurrent one. Async storage
 // gives each task its own phase even when several run at once.
@@ -161,7 +161,9 @@ function reportTimeline() {
     // trimmed to what is left of the line - a wrapped note breaks the column alignment of
     // every row after it, which is worse than losing the end of one label
     const notes = fullNotes.slice(0, Math.max(0, columns - rowWidth - 1));
-    cliOut('  ' + chalk.yellow`${label.padEnd(labelWidth)}` + ' ' + chalk.orange`${ms(phase.end - phase.start).padStart(9)}` + ' ' + chalk.mediumgrey`${`cpu ${ms(ownCpu)}`.padStart(13)}` + ' ' + ' '.repeat(from) + bar
+    cliOut('  ' + chalk.yellow`${label.padEnd(labelWidth)}`
+    // cpu is the figure that says what the phase cost, so it gets the colour
+    + ' ' + chalk.mediumgrey`${ms(phase.end - phase.start).padStart(9)}` + ' ' + chalk.orange`${`cpu ${ms(ownCpu)}`.padStart(13)}` + ' ' + ' '.repeat(from) + bar
     // only pad out to the full bar when something follows it
     + (notes === '' ? '' : ' '.repeat(barWidth - to) + chalk.mediumgrey`${notes}`));
   }
@@ -189,32 +191,82 @@ export function reportStartupPhase(name) {
   report(name, lastPhaseEnd, now);
   lastPhaseEnd = now;
 }
-// Per-operation totals, for pricing one call inside a phase - a phase says where time went, this
-// says what it went on. Accumulating is two clock reads, so callers need not check whether
-// profiling is on; only the report is gated.
-const tallies = new Map();
-export function tally(name, ms) {
-  const entry = tallies.get(name) ?? {
-    calls: 0,
-    ms: 0
+const rootTallies = new Map();
+const tallyStack = [];
+function tallyNode(name) {
+  const parent = tallyStack[tallyStack.length - 1];
+  const siblings = parent === undefined ? rootTallies : parent.children;
+  let node = siblings.get(name);
+  if (node === undefined) {
+    node = {
+      name,
+      parent,
+      children: new Map(),
+      calls: 0,
+      ms: 0
+    };
+    siblings.set(name, node);
+  }
+  return node;
+}
+// Synchronous work only. Concurrent operations overlap, so summing their wall clock counts the
+// same time once per operation - 291 parallel transforms tallied as 689,576ms of an 11s run - and
+// the stack that gives the nesting assumes nothing else runs in between. Time async work with a
+// phase, whose cpu figure is attributed rather than summed.
+export function tallied(name, work) {
+  const node = tallyNode(name);
+  tallyStack.push(node);
+  const start = performance.now();
+  try {
+    return work();
+  } finally {
+    node.calls++;
+    node.ms += performance.now() - start;
+    tallyStack.pop();
+  }
+}
+// a tally's totals wherever it sits in the tree, for tests of instrumentation
+export function findTally(name) {
+  const search = nodes => {
+    for (const node of nodes.values()) {
+      if (node.name === name) return node;
+      const found = search(node.children);
+      if (found !== undefined) return found;
+    }
+    return undefined;
+  };
+  const node = search(rootTallies);
+  return node === undefined ? undefined : {
+    calls: node.calls,
+    ms: node.ms
   };
-  entry.calls++;
-  entry.ms += ms;
-  tallies.set(name, entry);
 }
-// Deliberately no async variant. Concurrent operations overlap, so summing their wall clock counts
-// the same time once per operation - 291 parallel transforms tallied as 689,576ms of an 11s run.
-// Time async work with a phase, whose cpu figure is attributed rather than summed.
 function reportTallies() {
-  if (tallies.size === 0) return;
+  if (rootTallies.size === 0) return;
   cliOut('');
-  cliOut(chalk.mediumgrey`tallied work - synchronous totals across the run, nested counted in both`);
-  const nameWidth = Math.max(...[...tallies.keys()].map(name => name.length));
-  for (const [name, {
-    calls,
-    ms: total
-  }] of [...tallies].sort((a, b) => b[1].ms - a[1].ms)) {
-    cliOut('  ' + chalk.yellow`${name.padEnd(nameWidth)}` + ' ' + chalk.orange`${ms(total).padStart(10)}` + ' ' + chalk.mediumgrey`${`${calls.toLocaleString()} calls`.padStart(13)}` + ' ' + chalk.mediumgrey`${`${(total / calls).toFixed(2)}ms each`}`);
+  cliOut(chalk.mediumgrey`tallied work - synchronous, nested under what it ran inside; self is the line's own time`);
+  const rows = [];
+  const collect = (nodes, indent) => {
+    for (const node of [...nodes.values()].sort((a, b) => b.ms - a.ms)) {
+      rows.push({
+        indent,
+        node
+      });
+      collect(node.children, indent + 1);
+    }
+  };
+  collect(rootTallies, 0);
+  const nameWidth = Math.max(...rows.map(({
+    indent,
+    node
+  }) => indent * 2 + node.name.length));
+  for (const {
+    indent,
+    node
+  } of rows) {
+    const childMs = [...node.children.values()].reduce((sum, child) => sum + child.ms, 0);
+    const self = node.children.size === 0 ? '' : `self ${ms(node.ms - childMs)}`;
+    cliOut('  ' + ' '.repeat(indent * 2) + chalk.yellow`${node.name.padEnd(nameWidth - indent * 2)}` + ' ' + chalk.orange`${ms(node.ms).padStart(10)}` + ' ' + chalk.mediumgrey`${self.padStart(14)}` + ' ' + chalk.mediumgrey`${`${node.calls.toLocaleString()} calls`.padStart(13)}` + ' ' + chalk.mediumgrey`${`${(node.ms / node.calls).toFixed(2)}ms each`}`);
   }
 }
 // Other reports to print where the run total goes - the module load analysis registers itself here.

package/dist/todo.js

@@ -1,3 +1,4 @@
+import { warn } from './output.js';
 export function todo(task) {
-  //warn('Todo: ' + task)
+  warn('Todo: ' + task);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,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;AAIlD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,OAAO,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAA;AAE1D,OAAO,EACe,mBAAmB,EAIT,4BAA4B,EAI3D,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAahD,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAwEhE,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,CA4HvB;AAiCD,MAAM,MAAM,eAAe,GAAG;IAC1B,eAAe,EAAE,YAAY,CAAC;IAC9B,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAA;IAC3C,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,WAAW,CAAA;CAC1B,CAAA;AAGD,wBAAsB,WAAW,CAC7B,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,eAAe,GACnG,OAAO,CAAC,mBAAmB,CAAC,CAmV/B;AA0JD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,mBAAmB,QAuC5E;AA2DD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QA8J7E;AA0WD,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;AAED,MAAM,MAAM,mBAAmB,CAC3B,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,IACzD;IACA,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,CAAA;IACtC,cAAc,EAAE,OAAO,CAAA;IACvB,cAAc,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,wBAAsB,2BAA2B,CAC7C,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAC3C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC/C,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,WAAW,GACvB,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,CAqD7C;AAED,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAC/D,IAAI,CAON;AAiRD,wBAAsB,wBAAwB,CAC1C,UAAU,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAC5E,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAiC3C;AAED,wBAAsB,qBAAqB,CACvC,UAAU,EAAE,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,GAC1F,OAAO,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAyCjD"}
+{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"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"}

package/dist/update/integrateUpdateVdom.js

@@ -1,33 +1,32 @@
-import { IsHTMLElement } from "../DomNodes.js";
-import { DomRegion } from "../DomRegion.js";
-import { DomPointer } from "../DomPointer.js";
-import { ContentNodeComponentIsClassComponent, ContentNodeIsNonRendered, ContentNodeIsLiteral, ContentNodeIsHtml, ContentNodeIsComponent, ContentNodeIsArray, ContentNodeIsElement, ContentNodeElementHasValidKey } from "../ContentNode.js";
-import { StringIsHtmlEvent, htmlEvents } from "../htmlEvents.js";
-import { out, warn } from "../appOutput.js";
-import { getStyledContentFromFunctionComponent } from "../getStyledContentFromFunctionComponent.js";
-import { FunctionElement } from "../FunctionComponentStandIn.js";
-import { jssToCss } from "../style/jssToCss.js";
-import { htmlEventHandlerKey } from "../htmlEventHandlerKey.js";
-import { todo } from "../todo.js";
-import { $contentNull } from "../symbols.js";
-import { throwError } from "../throwError.js";
-import { $number, $string, RenderedContentNodeIsArray, RenderedContentNodeIsLiteral, makeRenderedContentNodeNonRendered, makeRenderedContentNodeHtml, makeRenderedContentNodeLiteral, RenderedContentNodeIsNonRendered, WideRenderedContentNodeIsArray, WideRenderedContentNodeIsLiteral, WideRenderedContentNodeIsHtml, WideRenderedContentNodeIsComponent, RenderedContentNodeSingleIsHead, RenderedContentNodeSingleIsComponent, RenderedContentNodeSingleIsHtml, RenderedContentNodeIsElement, RenderedContentNodeSingleIsLiteral } from "../RenderedContentNode.js";
-import { hasValidKey } from "../hasValidKey.js";
-import { $key, $props, $routeData, $routeParams, $type } from "../contentNodeSymbols.js";
-import { printComponentNamesInSource } from "../render/printComponentNameInSource.js";
-import { bindableHtmlElementsNumber, bindableHtmlElementsString } from "../components/bindable/bindableHtmlElements.js";
-import { checkedValueToBoolean } from "../checkedValueToBoolean.js";
-import { markOptionSelected } from "../markOptionSelected.js";
-import { innerHtmlFromProps } from "../innerHtmlFromProps.js";
-import { validChildren } from "../validChildren.js";
+import { IsHTMLElement } from '../DomNodes.js';
+import { DomRegion } from '../DomRegion.js';
+import { DomPointer } from '../DomPointer.js';
+import { ContentNodeComponentIsClassComponent, ContentNodeIsNonRendered, ContentNodeIsLiteral, ContentNodeIsHtml, ContentNodeIsComponent, ContentNodeIsArray, ContentNodeIsElement, ContentNodeElementHasValidKey } from '../ContentNode.js';
+import { StringIsHtmlEvent, htmlEvents } from '../htmlEvents.js';
+import { out, warn } from '../appOutput.js';
+import { getStyledContentFromFunctionComponent } from '../getStyledContentFromFunctionComponent.js';
+import { FunctionElement } from '../FunctionComponentStandIn.js';
+import { jssToCss } from '../style/jssToCss.js';
+import { htmlEventHandlerKey } from '../htmlEventHandlerKey.js';
+import { $contentNull } from '../symbols.js';
+import { throwError } from '../throwError.js';
+import { $number, $string, RenderedContentNodeIsArray, RenderedContentNodeIsLiteral, makeRenderedContentNodeNonRendered, makeRenderedContentNodeHtml, makeRenderedContentNodeLiteral, RenderedContentNodeIsNonRendered, WideRenderedContentNodeIsArray, WideRenderedContentNodeIsLiteral, WideRenderedContentNodeIsHtml, WideRenderedContentNodeIsComponent, RenderedContentNodeSingleIsHead, RenderedContentNodeSingleIsComponent, RenderedContentNodeSingleIsHtml, RenderedContentNodeIsElement, RenderedContentNodeSingleIsLiteral } from '../RenderedContentNode.js';
+import { hasValidKey } from '../hasValidKey.js';
+import { $key, $props, $routeData, $routeParams, $type } from '../contentNodeSymbols.js';
+import { printComponentNamesInSource } from '../render/printComponentNameInSource.js';
+import { bindableHtmlElementsNumber, bindableHtmlElementsString } from '../components/bindable/bindableHtmlElements.js';
+import { checkedValueToBoolean } from '../checkedValueToBoolean.js';
+import { markOptionSelected } from '../markOptionSelected.js';
+import { innerHtmlFromProps } from '../innerHtmlFromProps.js';
+import { validChildren } from '../validChildren.js';
 import { setCurrentComponent } from 'tungsten/hooks/setCurrentComponent.js';
 import { clearCurrentComponent } from 'tungsten/hooks/clearCurrentComponent.js';
-import { isDev } from "../isDev.js";
-import { $original } from "../componentProxyHandlers.js";
-import { booleanAttributeValue } from "../booleanAttributeValue.js";
-import { propsAreEqual } from "../propsAreEqual.js";
-import { markRendered, refreshTracing, renderedAt, trace, tracing } from "../stateTracking.js";
-import { beginMountScope, discardPendingMounts, endMountScope, queueMount } from "./pendingMounts.js";
+import { isDev } from '../isDev.js';
+import { $original } from '../componentProxyHandlers.js';
+import { booleanAttributeValue } from '../booleanAttributeValue.js';
+import { propsAreEqual } from '../propsAreEqual.js';
+import { markRendered, refreshTracing, renderedAt, trace, tracing } from '../stateTracking.js';
+import { beginMountScope, discardPendingMounts, endMountScope, queueMount } from './pendingMounts.js';
 /**
  * How many dom nodes each element's rendered content currently occupies, recorded on
  * every real update. When an update is skipped for unchanged props the child's dom is
@@ -80,7 +79,7 @@ function debug(...texts) {
   //console.log(...texts)
   //console.log(getStackTrace().split('\n')[2])
 }
-const timing = false; // eslint-disable-line no-type-assertion/no-type-assertion
+const timing = false; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 // need to be adapted to work for func components?
 export async function integrateElementUpdateVdom(element, newContent) {
   let startTime = 0;
@@ -516,7 +515,7 @@ async function updateComponent({
       instance,
       newNode,
       oldNode: oldNode,
-      // eslint-disable-line no-type-assertion/no-type-assertion -- oldNode is proven to be class comp, because type is the same as newNode
+      // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- oldNode is proven to be class comp, because type is the same as newNode
       domPointer
     });
   } else {
@@ -526,7 +525,7 @@ async function updateComponent({
       instance,
       newNode,
       oldNode: oldNode,
-      // eslint-disable-line no-type-assertion/no-type-assertion -- oldNode is proven to be function comp, because type is the same as newNode
+      // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- oldNode is proven to be function comp, because type is the same as newNode
       domPointer
     });
   }
@@ -567,7 +566,7 @@ function moveDomNode(domNode, domPointer) {
   // is not a child at all (indexOf -1), or index is past the end (undefined).
   // one live-NodeList read, reused as the insertBefore reference below -- see
   // DomPointer.insert() for why these reads are worth counting
-  const reference = domPointer.parent.childNodes[domPointer.index]; // eslint-disable-line no-type-assertion/no-type-assertion -- indexing past the end gives undefined, which the DOM types do not model
+  const reference = domPointer.parent.childNodes[domPointer.index]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- indexing past the end gives undefined, which the DOM types do not model
   if (reference !== domNode) {
     //console.log('document.activeElement', document.activeElement, domNode ==  document.activeElement,  domNode ===  document.activeElement)
     const ownerDocument = domNode.ownerDocument;
@@ -583,7 +582,7 @@ function moveDomNode(domNode, domPointer) {
     //console.log('had focus', hasFocus)
     if (hasFocus) domNode.focus();
     //console.log('post document.activeElement', document.activeElement)
-    if (activeElement) activeElement.focus(); // eslint-disable-line no-type-assertion/no-type-assertion -- activeElement was a focused dom node, so it should have a focus method??
+    if (activeElement) activeElement.focus(); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- activeElement was a focused dom node, so it should have a focus method??
   }
   domPointer.increment();
 }
@@ -836,7 +835,7 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
   processHtmlNode(node, parentNode);
   debug('-createHtmlElement', node);
   const htmlEl = documentFromParent(domPointer.parent).createElement(node[$type]);
-  const extendableEl = htmlEl; // eslint-disable-line no-type-assertion/no-type-assertion -- attributes are attached to the element later
+  const extendableEl = htmlEl; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- attributes are attached to the element later
   addAttributes(tungstenElement, instance, node, extendableEl);
   if (node[$type] === 'head') {
     for (const el of instance.persistentHeadChildren) {
@@ -887,7 +886,7 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
   return {
     ...node,
     domNode: htmlEl,
-    // eslint-disable-line no-type-assertion/no-type-assertion -- as TungstenHTMLElement allows us to attach additional props later (for storing event handler funcs)
+    // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- as TungstenHTMLElement allows us to attach additional props later (for storing event handler funcs)
     renderedChildren
   };
 }
@@ -903,9 +902,13 @@ function addAttributes(tungstenElement, instance, node, domNode) {
     if (StringIsHtmlEvent(key)) {
       debug('add', htmlEvents[key]);
       const eventName = htmlEvents[key];
-      todo('addAttributes() warning - ensure type safety of event names');
-      todo('addAttributes() warning - ensure type safety of event listener'); // we need to set all possible event listeners to take only EventListener funcs
-      const handler = makeEventListener(tungstenElement, instance, eventName, attributes[key]);
+      const value = attributes[key];
+      // JSX types the prop as a handler; a non-function is a spread of foreign props or a raw
+      // content tree, and addEventListener would throw a bare TypeError for it
+      if (isDev && typeof value !== 'function') {
+        throwError('integrateUpdate', `<${node[$type]}> ${key} is ${typeof value}, not a function`);
+      }
+      const handler = makeEventListener(tungstenElement, instance, eventName, value);
       // // if its a button without type="submit", prevent default to stop it from submitting forms
       // const handler = (key === 'onClick' && node[$type] === 'button' && node[$props].type !== 'submit')
       //     ? (event: Event) => { event.preventDefault(); return (attributes[key] as EventListener)(event) } 
@@ -1431,10 +1434,10 @@ export async function hotSwapClassComponent(oldElement, NewType) {
   // carry the old state across, unwrapping the old proxy so the new instance's own
   // constructor-created proxy (bound to itself) is what ends up owning it
   if ('state' in oldElement && oldElement.state !== undefined && 'state' in newElement) {
-    const oldState = oldElement.state; // eslint-disable-line no-type-assertion/no-type-assertion -- state shape is unknown to this generic dev-only code path
-    const rawOldState = $original in oldState ? oldState[$original] // eslint-disable-line no-type-assertion/no-type-assertion -- $original always yields the raw backing object
+    const oldState = oldElement.state; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- state shape is unknown to this generic dev-only code path
+    const rawOldState = $original in oldState ? oldState[$original] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- $original always yields the raw backing object
     : oldState;
-    const newState = newElement.state; // eslint-disable-line no-type-assertion/no-type-assertion -- state shape is unknown to this generic dev-only code path
+    const newState = newElement.state; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- state shape is unknown to this generic dev-only code path
     for (const key in rawOldState) newState[key] = rawOldState[key];
   }
   await newElement.__init();

package/dist/update/integrateUpdateVdomPrebuild.js

@@ -66,7 +66,7 @@ export {};
 //     //console.log(...texts)
 //     //console.log(getStackTrace().split('\n')[2])
 // }
-// const timing = true as boolean // eslint-disable-line no-type-assertion/no-type-assertion
+// const timing = true as boolean // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 // // need to be adapted to work for func components?
 // export async function integrateElementUpdateVdom(
 //     element: AnyComponent, newContent: ContentNode
@@ -552,7 +552,7 @@ export {};
 //             parent, 
 //             instance, 
 //             newNode,
-//             oldNode: oldNode as RenderedContentNodeClassComponent, // eslint-disable-line no-type-assertion/no-type-assertion -- oldNode is proven to be class comp, because type is the same as newNode
+//             oldNode: oldNode as RenderedContentNodeClassComponent, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- oldNode is proven to be class comp, because type is the same as newNode
 //             domPointer,
 //         })
 //     } else {
@@ -561,7 +561,7 @@ export {};
 //             parent,
 //             instance,
 //             newNode,
-//             oldNode: oldNode as RenderedContentNodeFunctionComponent, // eslint-disable-line no-type-assertion/no-type-assertion -- oldNode is proven to be function comp, because type is the same as newNode
+//             oldNode: oldNode as RenderedContentNodeFunctionComponent, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- oldNode is proven to be function comp, because type is the same as newNode
 //             domPointer,
 //         })
 //     }
@@ -608,7 +608,7 @@ export {};
 //         //console.log('had focus', hasFocus)
 //         if (hasFocus) domNode.focus()
 //         //console.log('post document.activeElement', document.activeElement)
-//         if ( activeElement) (activeElement as Element & { focus: () => void } ).focus() // eslint-disable-line no-type-assertion/no-type-assertion -- activeElement was a focused dom node, so it should have a focus method??
+//         if ( activeElement) (activeElement as Element & { focus: () => void } ).focus() // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- activeElement was a focused dom node, so it should have a focus method??
 //     }
 //     domPointer.increment()
 // }
@@ -1061,7 +1061,7 @@ export {};
 //     return htmlEl as TungstenHTMLElement
 //     // return {
 //     //     ...node,
-//     //     domNode: htmlEl as TungstenHTMLElement, // eslint-disable-line no-type-assertion/no-type-assertion -- as TungstenHTMLElement allows us to attach additional props later (for storing event handler funcs)
+//     //     domNode: htmlEl as TungstenHTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- as TungstenHTMLElement allows us to attach additional props later (for storing event handler funcs)
 //     //     renderedChildren
 //     // }
 // }

package/dist/validChildren.js

@@ -1,5 +1,5 @@
-import { ContentNodeIsRendered } from "./ContentNode.js";
-import { RenderingNodeIsRendered } from "./RenderingNode.js";
+import { ContentNodeIsRendered } from './ContentNode.js';
+import { RenderingNodeIsRendered } from './RenderingNode.js';
 export function validChildren(children) {
   return ContentNodeIsRendered(children);
   //return children === 0 || children

package/dist/warnOnFrameworkChange.js

@@ -1,7 +1,7 @@
 import { join } from 'path';
 import chokidar from 'chokidar';
-import { getFrameworkDir } from "./getFrameworkDir.js";
-import { cliWarn } from "./cliOutput.js";
+import { getFrameworkDir } from './getFrameworkDir.js';
+import { cliWarn } from './cliOutput.js';
 // Dev mode only, opt-in via warnOnFrameworkChange in tungsten.config.js. Node's ESM module
 // cache can't be invalidated at runtime, so an already-running dev server can't pick up a
 // change to the tungsten package itself (e.g. a linked/workspace copy being rebuilt) without a

package/dist/watch.js

@@ -1,5 +1,5 @@
 import chokidar from 'chokidar';
-import slash from 'slash';
+import slash from './slash.js';
 export function watch({
   dir,
   patterns,
@@ -21,7 +21,7 @@ export function watch({
   });
 }
 function addBasePath(base, items) {
-  if (base !== undefined && base !== '.' && base !== '') {
+  if (base !== '.' && base !== '') {
     items = Array.isArray(items) ? items.map(item => `${base}/${item}`) : `${base}/${items}`;
   }
   return items;

package/dist/zones/react.js

@@ -2,9 +2,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { TungstenSimpleComponent } from "../Components.js";
-import { createElementRef } from "../createRef.js";
-import { isServer } from "../isServer.js";
-import { jsx as _jsx } from "tungsten/jsxRuntime.js";
+import { createElementRef } from '../createRef.js';
+import { isServer } from '../isServer.js';
+import { jsx as _jsx } from "tungsten/jsx-runtime";
 export class ReactZone extends TungstenSimpleComponent {
   constructor(...args) {
     super(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "",
   "type": "module",
   "bin": {
@@ -13,112 +13,99 @@
     "./library": "./dist/components/library/index.js",
     "./react-zone": "./dist/zones/react.js",
     "./testing": "./dist/testing/index.js",
+    "./jsx-runtime": "./dist/jsx-runtime.js",
     "./*": "./dist/*",
     "./types/*": "./types/*"
   },
   "files": [
     "dist",
     "!dist/**/*.sxyt.*",
+    "vendor",
     "types",
-    "sxy-loader.config.js",
     "readme.md"
   ],
   "keywords": [],
   "author": "",
   "license": "UNLICENSED",
+  "engines": {
+    "node": ">=24"
+  },
   "dependencies": {
-    "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
     "@babel/parser": "^7.29.2",
     "@babel/plugin-syntax-import-assertions": "^7.29.7",
-    "@babel/plugin-transform-class-properties": "^7.28.6",
+    "@babel/preset-env": "^7.29.7",
     "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.29.7",
     "@babel/types": "^7.29.0",
-    "@hono/node-server": "^1.19.11",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-commonjs": "^28.0.9",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^14.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
     "@types/babel__core": "^7.20.5",
     "@types/express": "^5.0.6",
-    "babel-plugin-css-to-js": "^0.0.4",
-    "babel-plugin-sxy-module-resolver": "^4.1.9",
-    "babel-plugin-sxy-transform-cjs-to-esm": "^0.2.6",
     "bcryptjs": "^3.0.3",
     "chalk": "^5.6.2",
     "chalk-extensions": "^2.0.24",
     "chokidar": "^3.6.0",
     "cjs-module-lexer": "^1.4.3",
-    "cjstoesm": "^2.1.2",
-    "cookie-parser": "^1.4.7",
-    "cross-env": "^7.0.3",
     "csstype": "^3.2.3",
-    "decamelize": "^6.0.1",
     "dotenv": "^16.6.1",
-    "esm-reload": "^1.0.1",
     "express": "^5.2.1",
-    "find-package-json": "^1.2.0",
-    "fs-extra": "^10.1.0",
-    "globby": "^13.2.2",
-    "hono": "^4.12.32",
     "import-meta-resolve": "^4.2.0",
-    "ini": "^4.1.3",
-    "lodash.clonedeep": "^4.5.0",
-    "npm-run-all": "^4.1.5",
     "open": "^8.4.2",
-    "path-to-regexp": "^8.4.2",
     "postcss": "^8.5.24",
     "precinct": "^12.2.0",
-    "react-router": "^6.30.3",
     "require-resolve-hook": "^1.1.0",
-    "rollup": "^2.80.0",
+    "rollup": "^4.63.1",
     "rollup-plugin-gzip": "^3.1.2",
     "sass": "^1.102.0",
     "serialize-javascript": "^6.0.2",
-    "slash": "^4.0.0",
-    "sxy-dependency-tree": "^8.1.11",
-    "sxy-filing-cabinet": "^3.4.2",
     "sxy-lib": "^3.0.7",
     "sxy-lib-object-copy": "^2.0.5",
-    "sxy-loader": "^3.1.0",
     "sxy-package-investigator": "^1.0.0",
     "sxy-types": "^1.0.23",
     "valibot": "^1.4.2"
   },
   "devDependencies": {
+    "@babel/cli": "^7.29.7",
     "@babel/generator": "^7.29.1",
+    "@stylistic/eslint-plugin": "^3.1.0",
     "@types/babel-types": "^7.0.16",
     "@types/babel__generator": "^7.27.0",
     "@types/chai": "^4.3.20",
-    "@types/cookie-parser": "^1.4.10",
-    "@types/find-package-json": "^1.2.7",
-    "@types/fs-extra": "^11.0.4",
-    "@types/ini": "^1.3.34",
-    "@types/lodash.clonedeep": "^4.5.9",
     "@types/node": "^24.1.0",
     "@types/react": "19.1.9",
     "@types/react-dom": "19.1.7",
     "@types/serialize-javascript": "^5.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^8.69.0",
+    "@typescript-eslint/parser": "^8.69.0",
     "babel-plugin-replace-import-extension": "^1.1.5",
     "babel-plugin-sxy-transform-import-extensions": "^1.0.5",
     "babel-plugin-transform-import-extension": "^1.0.3",
     "chai": "^4.5.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.57.1",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-no-type-assertion": "^1.3.0",
+    "eslint-plugin-unused-imports": "^3.2.0",
     "happy-dom": "^20.11.1",
+    "npm-run-all": "^4.1.5",
     "rimraf": "^5.0.10",
     "rollup-plugin-visualizer": "^5.14.0",
-    "sxy-test-runner": "^2.4.3",
+    "sxy-test-runner": "^2.4.9",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19.0.0",
-    "react-dom": "^18.2.0 || ^19.0.0",
+    "react-dom": "^18.2.0 || ^19.0.0"
+  },
+  "__oldDependencies": {
+    "babel-plugin-sxy-module-resolver": "^4.1.9"
+  },
+  "__oldPeerDependencies": {
     "rollup": "^2.79.1"
   },
   "peerDependenciesMeta": {
@@ -135,6 +122,7 @@
     "clean": "rimraf intermed dist",
     "build-once": "rimraf intermed dist && pnpm build-ts-once && pnpm build-babel-once && pnpm build-component-styles",
     "build-component-styles": "node scripts/buildComponentStyles.mjs",
+    "build-vendor": "node scripts/bundleVendor.mjs",
     "build-once-nd": "rimraf intermed dist.building && pnpm build-ts-once && pnpm build-babel-staged && node scripts/syncDist.mjs && node scripts/writeBuildMarker.mjs",
     "build-quick": "pnpm build-watch",
     "build-prep": "pnpm build-ts-once",

package/types/modules.d.ts

@@ -1,6 +1,7 @@
 declare module '@babel/preset-react'
+declare module '@babel/preset-env'
+declare module '@babel/preset-typescript'
 declare module 'babel-plugin-sxy-module-resolver'
-declare module 'babel-plugin-css-to-js'
 declare module '@babel/plugin-transform-class-properties'
 declare module '@rollup/plugin-node-resolve'
 declare module '@rollup/plugin-commonjs'

package/vendor/babel-core.js

@@ -0,0 +1,26 @@
+import { createRequire as __tungstenCreateRequire } from 'node:module';
+const require = __tungstenCreateRequire(import.meta.url);
+import { r as requireLib } from './chunk-C3fcZDjl.js';
+import './chunk-C9FSKeSx.js';
+import './chunk-CPArXGxa.js';
+import './chunk-C12hSZn7.js';
+import './chunk-1TN2rK3j.js';
+import 'tty';
+import 'util';
+import 'os';
+import './chunk-C3YkUGz5.js';
+import './chunk-1UuLTU0U.js';
+import 'assert';
+import 'path';
+import 'fs';
+import 'url';
+import 'module';
+import './chunk-B_NeooyV.js';
+import 'process';
+import 'v8';
+
+var libExports = requireLib();
+
+const __v0 = libExports["DEFAULT_EXTENSIONS"];const __v1 = libExports["File"];const __v2 = libExports["OptionManager"];const __v3 = libExports["Plugin"];const __v4 = libExports["__esModule"];const __v5 = libExports["buildExternalHelpers"];const __v6 = libExports["createConfigItem"];const __v7 = libExports["createConfigItemAsync"];const __v8 = libExports["createConfigItemSync"];const __v9 = libExports["getEnv"];const __v10 = libExports["loadOptions"];const __v11 = libExports["loadOptionsAsync"];const __v12 = libExports["loadOptionsSync"];const __v13 = libExports["loadPartialConfig"];const __v14 = libExports["loadPartialConfigAsync"];const __v15 = libExports["loadPartialConfigSync"];const __v16 = libExports["parse"];const __v17 = libExports["parseAsync"];const __v18 = libExports["parseSync"];const __v19 = libExports["resolvePlugin"];const __v20 = libExports["resolvePreset"];const __v21 = libExports["template"];const __v22 = libExports["tokTypes"];const __v23 = libExports["transform"];const __v24 = libExports["transformAsync"];const __v25 = libExports["transformFile"];const __v26 = libExports["transformFileAsync"];const __v27 = libExports["transformFileSync"];const __v28 = libExports["transformFromAst"];const __v29 = libExports["transformFromAstAsync"];const __v30 = libExports["transformFromAstSync"];const __v31 = libExports["transformSync"];const __v32 = libExports["traverse"];const __v33 = libExports["types"];const __v34 = libExports["version"];
+
+export { __v0 as DEFAULT_EXTENSIONS, __v1 as File, __v2 as OptionManager, __v3 as Plugin, __v4 as __esModule, __v5 as buildExternalHelpers, __v6 as createConfigItem, __v7 as createConfigItemAsync, __v8 as createConfigItemSync, libExports as default, __v9 as getEnv, __v10 as loadOptions, __v11 as loadOptionsAsync, __v12 as loadOptionsSync, __v13 as loadPartialConfig, __v14 as loadPartialConfigAsync, __v15 as loadPartialConfigSync, __v16 as parse, __v17 as parseAsync, __v18 as parseSync, __v19 as resolvePlugin, __v20 as resolvePreset, __v21 as template, __v22 as tokTypes, __v23 as transform, __v24 as transformAsync, __v25 as transformFile, __v26 as transformFileAsync, __v27 as transformFileSync, __v28 as transformFromAst, __v29 as transformFromAstAsync, __v30 as transformFromAstSync, __v31 as transformSync, __v32 as traverse, __v33 as types, __v34 as version };

package/vendor/babel-parser.js

@@ -0,0 +1,9 @@
+import { createRequire as __tungstenCreateRequire } from 'node:module';
+const require = __tungstenCreateRequire(import.meta.url);
+import { r as requireLib } from './chunk-CPArXGxa.js';
+
+var libExports = requireLib();
+
+const __v0 = libExports["__esModule"];const __v1 = libExports["parse"];const __v2 = libExports["parseExpression"];const __v3 = libExports["tokTypes"];
+
+export { __v0 as __esModule, libExports as default, __v1 as parse, __v2 as parseExpression, __v3 as tokTypes };