tungsten 0.5.0 → 0.5.2

package/dist/routing/__fluentRouteBuilder.d.ts

@@ -0,0 +1,80 @@
+import { ContentNode, ParamsFromPath, RouteContentFunction, RouteDataFunction, RouteKey } from 'tungsten';
+import { Expand } from 'tungsten/types/helpers.js';
+type FR = {
+    path: RouteKey;
+    content: ContentNode | RouteContentFunction<any, any>;
+};
+export type FluentRoutesToRoutes<T extends readonly FR[]> = {
+    [E in T[number] as E['path'] & string]: E;
+} & {};
+export declare function fluentRoutes<const T extends readonly FR[]>(frs: T): FluentRoutesToRoutes<T>;
+declare const $invalidKeyError: unique symbol;
+type MustNotIncludePathDataContent<T extends Record<string, unknown>> = 'path' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'path\'';
+} : 'data' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'data\'';
+} : 'content' extends keyof T ? {
+    [$invalidKeyError]: 'meta may not contain key \'content\'';
+} : T;
+export declare function routeLegacy<P extends RouteKey>(path: P): {
+    meta<M extends Record<string, unknown>>(meta: M & MustNotIncludePathDataContent<M>): {
+        data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+            content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+                path: P;
+            } & M & {
+                data: RouteDataFunction<ParamsFromPath<P>, D>;
+                content: C;
+            }>;
+        };
+        content<const C extends ContentNode>(content: C): Expand<{
+            path: P;
+        } & M & {
+            content: C;
+        }>;
+    };
+    data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+        content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+            path: P;
+        } & {
+            data: RouteDataFunction<ParamsFromPath<P>, D>;
+            content: C;
+        }>;
+    };
+    content<const C extends ContentNode>(content: C): Expand<{
+        path: P;
+    } & {
+        content: C;
+    }>;
+};
+export declare function route<P extends RouteKey, M extends Record<string, unknown> = {}>(path: P, meta?: M & MustNotIncludePathDataContent<M>): {
+    meta<M2 extends Record<string, unknown>>(meta: M2 & MustNotIncludePathDataContent<M2>): {
+        data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+            content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+                path: P;
+            } & Omit<M, keyof M2> & M2 & {
+                data: RouteDataFunction<ParamsFromPath<P>, D>;
+                content: C;
+            }>;
+        };
+        content<const C extends ContentNode>(content: C): Expand<{
+            path: P;
+        } & Omit<M, keyof M2> & M2 & {
+            content: C;
+        }>;
+    };
+    data<D>(dataFunc: RouteDataFunction<ParamsFromPath<P>, D>): {
+        content<C extends RouteContentFunction<ParamsFromPath<P>, D> | ContentNode>(content: C): Expand<{
+            path: P;
+        } & M & {
+            data: RouteDataFunction<ParamsFromPath<P>, D>;
+            content: C;
+        }>;
+    };
+    content<const C extends ContentNode>(content: C): Expand<{
+        path: P;
+    } & M & {
+        content: C;
+    }>;
+};
+export {};
+//# sourceMappingURL=__fluentRouteBuilder.d.ts.map

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

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

package/dist/routing/__fluentRouteBuilder.js

@@ -0,0 +1,183 @@
+import { TungstenError } from 'tungsten';
+export function fluentRoutes(frs) {
+  const routes = frs.reduce((prev, route) => {
+    if (route.path !== '/' && route.path.endsWith('/')) {
+      throw new Error(`Invalid path ${route.path} - trailing slashes are not allowed`);
+    }
+    if (route.path in prev) {
+      throw new Error(`Duplicate path ${route.path}`);
+    }
+    prev[route.path] = route;
+    return prev;
+  }, {/*default: { path: 'default', content: null }*/});
+  return routes; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+}
+export function routeLegacy(path) {
+  const r = {
+    path
+  };
+  return {
+    meta(meta) {
+      if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`);
+      if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`);
+      if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`);
+      //Object.assign(r, meta)
+      const rm = {
+        path: r.path,
+        ...meta
+      };
+      return {
+        data(dataFunc) {
+          const rmd = {
+            ...rm,
+            data: dataFunc
+          };
+          return {
+            content(content) {
+              return {
+                ...rmd,
+                content
+              };
+            }
+          };
+        },
+        content(content) {
+          return {
+            ...rm,
+            content
+          };
+        }
+      };
+    },
+    data(dataFunc) {
+      // const rd = r as { // eslint-disable-line no-type-assertion/no-type-assertion
+      //     path: P
+      //     data: RouteDataFunction<Params<P>, D>
+      // }
+      // rd.data = dataFunc
+      const rd = {
+        path: r.path,
+        data: dataFunc
+      };
+      return {
+        content(content) {
+          return {
+            ...rd,
+            content
+          };
+        }
+      };
+    },
+    // does not accept a function by choice - but could be relaxed
+    content(content) {
+      return {
+        path: r.path,
+        content
+      };
+    }
+  };
+}
+export function route(path, meta) {
+  const r = {
+    path
+  }; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  if (meta) {
+    if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`);
+    if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`);
+    if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`);
+    Object.assign(r, meta);
+  }
+  return {
+    meta(meta) {
+      if ('path' in meta) throw new TungstenError(`meta may not include key 'path' in route '${r.path}'`);
+      if ('data' in meta) throw new TungstenError(`meta may not include key 'data' in route '${r.path}'`);
+      if ('content' in meta) throw new TungstenError(`meta may not include key 'content' in route '${r.path}'`);
+      //Object.assign(r, meta)
+      const rm = {
+        ...r,
+        ...meta
+      }; // with generics TS will use an intersection not an overriding merge here.
+      // We use Omit manually to model hte spread
+      return {
+        data(dataFunc) {
+          // const rmd = r as { path: P } & M & { // eslint-disable-line no-type-assertion/no-type-assertion
+          //     data: RouteDataFunction<Params<P>, D>
+          // }
+          // rmd.data = dataFunc
+          const rmd = {
+            ...rm,
+            data: dataFunc
+          };
+          return {
+            content(content) {
+              return {
+                ...rmd,
+                content
+              };
+            }
+          };
+        },
+        content(content) {
+          return {
+            ...rm,
+            content
+          };
+        }
+      };
+    },
+    data(dataFunc) {
+      // const rd = r as { // eslint-disable-line no-type-assertion/no-type-assertion
+      //     path: P
+      //     data: RouteDataFunction<ParamsFromPath<P>, D>
+      // }
+      // rd.data = dataFunc
+      const rd = {
+        ...r,
+        data: dataFunc
+      };
+      return {
+        content(content) {
+          return {
+            ...rd,
+            content
+          };
+        }
+      };
+    },
+    // does not accept a function by choice - but could be relaxed
+    content(content) {
+      // const rc = r as { path: P, content: C } // eslint-disable-line no-type-assertion/no-type-assertion
+      // rc.content = content
+      // return rc
+      return {
+        ...r,
+        content
+      };
+    }
+  };
+}
+// function data<D>(dataFunc: () => Promise<D>) {
+//     const r: Partial<RouteType<any, any>> = {
+//         data: dataFunc
+//     }
+//     return {
+//         content(content: ContentNode) {
+//             r.content = content
+//             return {
+//                 meta(meta: object) {
+//                 }
+//             }
+//         }
+//         meta
+//     }
+// }
+// export const fluentRoutes = {
+//     '/': {
+//         name: 'Browse',
+//         content: <Browse />,
+//     },
+//     '404': {
+//         hidden: true,
+//         content: <NotFound />,
+//     },
+// } as const satisfies Routes

package/dist/routing/__fluentRoutes.d.ts

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

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

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

package/dist/routing/__fluentRoutes.js

@@ -0,0 +1,59 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { fluentRoutes, route, routeLegacy } from "./__fluentRouteBuilder.js";
+import { jsx as _jsx } from "tungsten/jsx-runtime";
+function Browse() {
+  return null;
+}
+function HandlerRepro() {
+  return null;
+}
+function NotFound() {
+  return null;
+}
+// const r = fluentRoutes([
+//     route('/')
+//         .meta({ name: 'Browse' })
+//         .content(<Browse />),
+//     route('404').content(<NotFound />),
+//     route('/data')
+//         .data(() => Promise.resolve(5))
+//         .content((d) => <span>{d}</span>)
+// ])
+const r = fluentRoutes([route('/').meta({
+  name: 'Browse'
+}).content(_jsx(Browse, {})), routeLegacy('/repro').meta({
+  name: 'Handler repro',
+  hidden: true
+}).content(_jsx(HandlerRepro, {})), routeLegacy('404').meta({
+  hidden: true
+}).content(_jsx(NotFound, {}))]);
+const rrrr1 = route('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {}));
+const rrrr2 = routeLegacy('/repro').meta({
+  name: 'Handler repro',
+  hidden: true
+}).data(() => Promise.resolve(5)).content(_jsx(HandlerRepro, {}));
+const r2 = fluentRoutes([route('/', {
+  name: 'Browse'
+}).content(_jsx(Browse, {})), route('/repro', {
+  name: 'Handler repro',
+  hidden: true
+}).content(_jsx(HandlerRepro, {})), route('404', {
+  hidden: true
+}).content(_jsx(NotFound, {}))]);
+// export const routes = {
+//     '/': {
+//         name: 'Browse',
+//         content: <Browse />,
+//     },
+//     '/repro': {
+//         name: 'Handler repro',
+//         hidden: true,
+//         content: <HandlerRepro />,
+//     },
+//     '404': {
+//         hidden: true,
+//         content: <NotFound />,
+//     },
+// } as const satisfies Routes

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

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

package/dist/testing/host.d.ts.map

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

package/dist/testing/host.js

@@ -4,7 +4,7 @@ const isPromise = value => value instanceof Promise || typeof value === 'object'
 // The same list at runtime. Underscore-prefixed members are excluded by rule
 // (the framework's naming scheme), so only the plain-named ones are listed, and
 // frameworkMembersAreComplete below fails to compile if one is ever missed.
-const frameworkMemberNames = ['props', 'routeParams', 'routeData', 'parentComponent', 'childComponents', 'globalData', 'state', 'storeData', 'style', 'title', 'content', 'render', 'init', 'clientInit', 'serverInit', 'componentDidMount', 'componentDidHydrate', 'componentDidUpdate', 'componentDidRender', 'componentWillUnmount', 'componentDidUnmount', 'shouldStoreComponentUpdate', 'setState', 'triggerUpdate', 'delayed', 'pickProps', 'pickState', 'using', 'reactive'];
+const frameworkMemberNames = ['props', 'routeParams', 'routeData', 'parentComponent', 'childComponents', 'globalData', 'state', 'storeData', 'style', 'title', 'content', 'render', 'init', 'clientInit', 'serverInit', 'componentDidMount', 'componentDidHydrate', 'componentDidUpdate', 'componentDidRender', 'componentWillUnmount', 'componentDidUnmount', 'shouldStoreComponentUpdate', 'setState', 'triggerUpdate', 'pickProps', 'pickState', 'using', 'reactive', 'setTimeout', 'setInterval', 'clearTimeout', 'clearInterval'];
 const frameworkMembers = new Set(frameworkMemberNames);
 /**
  * Constructs a component outside of any app and drives it the way the framework
@@ -91,7 +91,6 @@ ComponentType, ...args) {
     if (contentFunction === undefined) {
       throw new Error(`host(): ${ComponentType.name} has no content or render function.`);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the base declares the stateful (props, state) shape for both
     const call = contentFunction;
     const result = simple ? call(component.props) : call(component.props, stateful.state);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- ContentOf recovers the concrete component's own return type

package/dist/testing/hydrateTestApp.js

@@ -109,8 +109,8 @@ class HydrateTestAppImplementation {
  */
 export async function hydrateTestApp(RootComponent, ...args) {
   await waitForEnvIfLoading();
-  const options = args[0]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-  const suppliedDocument = options?.document ?? globalThis.document; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  const options = args[0];
+  const suppliedDocument = options?.document ?? globalThis.document;
   if (suppliedDocument === undefined) {
     // eslint-disable-line @typescript-eslint/no-unnecessary-condition
     throw new Error('hydrateTestApp() requires options.document when no global document is available.');
@@ -134,7 +134,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
   const clientProps = options?.props ?? {}; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   const serverProps = options?.serverProps ?? clientProps;
   const location = options?.location ?? '/';
-  const globalData = options?.globalData ?? {}; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+  const globalData = options?.globalData ?? {};
   const matchedRouteInfo = {
     key: null,
     params: options?.routeParams ?? {},
@@ -167,9 +167,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
       stores,
       storeSubscriptions
     } = initStores(location, null, globalData, matchedRouteInfo);
-    const ssrInstance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes,
-    // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-    internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, {
+    const ssrInstance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, {
       document,
       window: document.defaultView,
       scheduler: ssrScheduler,
@@ -213,9 +211,7 @@ export async function hydrateTestApp(RootComponent, ...args) {
     scheduler,
     navigation: false
   };
-  const instance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes,
-  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-  internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, runtimeContext);
+  const instance = new Instance(location, instanceConfig, null, emptyRoutes, emptyRoutes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo, runtimeContext);
   try {
     for (const override of options?.stores ?? []) {
       const store = override.registration.getStore(instance.stores);

package/dist/update/guardedUpdate.d.ts

@@ -0,0 +1,9 @@
+import type { UpdateResult } from './UpdateResult.js';
+export type UpdateGuardHost = {
+    __unmountStarted: boolean;
+    __currentUpdate?: Promise<UpdateResult>;
+    __nextUpdate?: Promise<UpdateResult>;
+    __cancelledUpdateResult: () => UpdateResult;
+};
+export declare function guardedUpdate(host: UpdateGuardHost, run: () => Promise<UpdateResult>): Promise<UpdateResult>;
+//# sourceMappingURL=guardedUpdate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"guardedUpdate.d.ts","sourceRoot":"","sources":["../../src/update/guardedUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,MAAM,eAAe,GAAG;IAC1B,gBAAgB,EAAE,OAAO,CAAA;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IACvC,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IACpC,uBAAuB,EAAE,MAAM,YAAY,CAAA;CAC9C,CAAA;AAKD,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAiB5G"}

package/dist/update/guardedUpdate.js

@@ -0,0 +1,20 @@
+// One update per component at a time. A request while one is in flight gets a single rerun
+// after it, shared by every such request: writes landing mid-update coalesce, and no update
+// reconciles against a tree the in-flight one is about to replace (overlappingUpdate test).
+export function guardedUpdate(host, run) {
+  const current = host.__currentUpdate;
+  if (current !== undefined) {
+    host.__nextUpdate ??= current.then(rerun, rerun);
+    return host.__nextUpdate;
+  }
+  const update = run().finally(() => {
+    if (host.__currentUpdate === update) delete host.__currentUpdate;
+  });
+  host.__currentUpdate = update;
+  return update;
+  function rerun() {
+    delete host.__nextUpdate;
+    if (host.__unmountStarted) return host.__cancelledUpdateResult();
+    return guardedUpdate(host, run);
+  }
+}

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

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

package/dist/update/integrateUpdateVdom.js

@@ -1,6 +1,7 @@
 import { IsHTMLElement } from '../DomNodes.js';
 import { DomRegion } from '../DomRegion.js';
 import { DomPointer } from '../DomPointer.js';
+import { appHeadChildrenStart } from '../headChildren.js';
 import { ContentNodeComponentIsClassComponent, ContentNodeIsNonRendered, ContentNodeIsLiteral, ContentNodeIsHtml, ContentNodeIsComponent, ContentNodeIsArray, ContentNodeIsFragment, ContentNodeIsElement, ContentNodeElementHasValidKey } from '../ContentNode.js';
 import { StringIsHtmlEvent, htmlEvents } from '../htmlEvents.js';
 import { out, warn } from '../appOutput.js';
@@ -79,7 +80,7 @@ function debug(...texts) {
   //console.log(...texts)
   //console.log(getStackTrace().split('\n')[2])
 }
-const timing = false; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+const timing = false;
 // need to be adapted to work for func components?
 export async function integrateElementUpdateVdom(element, newContent) {
   let startTime = 0;
@@ -507,7 +508,8 @@ async function updateHtmlElement(tungstenElement, instance, newNode, oldNode, do
     newNode: newChildren,
     oldNode: oldChildren,
     domRegion: new DomRegion(domNode),
-    domPointer: new DomPointer(domNode, 0),
+    // the head's children start past what the server added to it
+    domPointer: new DomPointer(domNode, newNode[$type] === 'head' ? appHeadChildrenStart(domNode) : 0),
     parentNode: newNode
   });
   // Reapply the controlled value after reconciling the options. Updating the
@@ -583,7 +585,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 @typescript-eslint/no-unsafe-type-assertion -- indexing past the end gives undefined, which the DOM types do not model
+  const reference = domPointer.parent.childNodes[domPointer.index];
   if (reference !== domNode) {
     //console.log('document.activeElement', document.activeElement, domNode ==  document.activeElement,  domNode ===  document.activeElement)
     const ownerDocument = domNode.ownerDocument;

package/dist/zones/react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/zones/react.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,MAAM,IAC7C,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAC3B,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAA;AAEvC,KAAK,aAAa,GAAG;IACjB,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,OAAO,IAAI,IAAI,CAAA;CAClB,CAAA;AAED,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAA;AAE7F,MAAM,MAAM,gBAAgB,GAAG;IAC3B,KAAK,EAAE;QACH,SAAS,EAAE,GAAG,CAAA;QACd,aAAa,EAAE,kBAAkB,CAAA;KACpC,CAAA;IACD,MAAM,EAAE;QACJ,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,aAAa,CAAA;QACxC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,aAAa,CAAA;KAC/D,CAAA;IACD,MAAM,EAAE;QACJ,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAA;KAC5C,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,MAAM,IAAI;IAC/C,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACpC,KAAK,EAAE,KAAK,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,OAAO,EAAE,gBAAgB,CAAA;CAC5B,CAAA;AAED,qBAAa,SAAS,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,uBAAuB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/F,OAAO,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAqC;IAChF,SAAS,EAAE,aAAa,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,SAAS,UAAQ;IAEjB,OAAO,QAAa,OAAO,CAAC,WAAW,CAAC,CAsBvC;IAED,iBAAiB,QAAO,IAAI,CAG3B;IAED,kBAAkB,QAAO,IAAI,CAE5B;IAED,oBAAoB,QAAO,IAAI,CAM9B;IAED,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,WAAW;CAOtB"}
+{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/zones/react.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,MAAM,IAC7C,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAC3B,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,CAAA;AAEvC,KAAK,aAAa,GAAG;IACjB,MAAM,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,OAAO,IAAI,IAAI,CAAA;CAClB,CAAA;AAED,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,CAAA;AAE7F,MAAM,MAAM,gBAAgB,GAAG;IAC3B,KAAK,EAAE;QACH,SAAS,EAAE,GAAG,CAAA;QACd,aAAa,EAAE,kBAAkB,CAAA;KACpC,CAAA;IACD,MAAM,EAAE;QACJ,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,aAAa,CAAA;QACxC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,aAAa,CAAA;KAC/D,CAAA;IACD,MAAM,EAAE;QACJ,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAA;KAC5C,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,MAAM,IAAI;IAC/C,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACpC,KAAK,EAAE,KAAK,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,OAAO,EAAE,gBAAgB,CAAA;CAC5B,CAAA;AAED,qBAAa,SAAS,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,uBAAuB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/F,OAAO,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAyC;IACpF,SAAS,EAAE,aAAa,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAA;IAClD,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,SAAS,UAAQ;IAEjB,OAAO,QAAa,OAAO,CAAC,WAAW,CAAC,CAsBvC;IAED,iBAAiB,QAAO,IAAI,CAG3B;IAED,kBAAkB,QAAO,IAAI,CAE5B;IAED,oBAAoB,QAAO,IAAI,CAM9B;IAED,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,WAAW;CAOtB"}

package/dist/zones/react.js

@@ -2,13 +2,13 @@ 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 { createHtmlElementRef } 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);
-    _defineProperty(this, "hostRef", createElementRef());
+    _defineProperty(this, "hostRef", createHtmlElementRef());
     _defineProperty(this, "reactRoot", void 0);
     _defineProperty(this, "reactCreateElement", void 0);
     _defineProperty(this, "errorBoundary", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "",
   "type": "module",
   "bin": {
@@ -72,7 +72,8 @@
   "devDependencies": {
     "@babel/cli": "^7.29.7",
     "@babel/generator": "^7.29.1",
-    "@stylistic/eslint-plugin": "^3.1.0",
+    "@eslint/js": "^10.0.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
     "@types/babel-types": "^7.0.16",
     "@types/babel__generator": "^7.27.0",
     "@types/chai": "^4.3.20",
@@ -80,24 +81,20 @@
     "@types/react": "19.1.9",
     "@types/react-dom": "19.1.7",
     "@types/serialize-javascript": "^5.0.4",
-    "@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",
+    "eslint": "^10.10.0",
+    "eslint-plugin-unused-imports": "^4.4.1",
     "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.9",
-    "typescript": "^6.0.3"
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.70.0"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19.0.0",

package/types/env.d.ts

@@ -1,11 +1,11 @@
-
-/* eslint-disable no-var */
-
-
-
-// declare global {
-//     var tungstenPrivateEnv: TungstenPrivateEnv | undefined
-//     var tungstenPublicEnv: TungstenPublicEnv | undefined
-// }
-
-export {}
+
+ 
+
+
+
+// declare global {
+//     var tungstenPrivateEnv: TungstenPrivateEnv | undefined
+//     var tungstenPublicEnv: TungstenPublicEnv | undefined
+// }
+
+export {}

package/types/index.d.ts

@@ -1,11 +1,15 @@
 
-/* eslint-disable no-var */
+ 
 
 // the stylesheet module declarations live in a script file: this one is a module, and a
 // `declare module '*.css'` here would augment the app's own '*.css' declaration, which cannot add exports.
 // A reference, as an import of a script file is refused
 // eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="./assets.d.ts" />
+// The global JSX namespace, declared on purpose: it otherwise reached apps only through the
+// Bindable components' declaration files happening to import from jsx.d.ts
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="./jsx/jsx.d.ts" />
 // Disposable and Symbol.dispose appear in the shipped types (component using(), browser storage), and in
 // TS 6 that lib comes only with ESNext - so bring it in here rather than require it of every app's lib list
 /// <reference lib="esnext.disposable" />
@@ -34,14 +38,14 @@ declare global {
 //// Apps fill these by declaration merging in their env module: `interface TungstenPrivateEnv extends PrivateEnv {}`.
 //// Empty here on purpose: a base that extended the core env types would collide with an app whose schema
 //// makes a core field required (TS2320). Tungsten's own reads of the core fields come from src/env/Interfaces.ts
-/* eslint-disable @typescript-eslint/no-empty-object-type */
+ 
 declare global {
     interface TungstenPrivateEnv {}
     interface TungstenPublicEnv {}
     var tungstenPrivateEnv: TungstenPrivateEnv
     var tungstenPublicEnv: TungstenPublicEnv
 }
-/* eslint-enable @typescript-eslint/no-empty-object-type */
+ 
 
 //// In dev, cjsHelpers.ts installs a partial `process` on the browser global so that converted
 //// CommonJS packages can read process.env.NODE_ENV. It flags itself with __tungstenCjsShim so