tungsten 0.1.60 → 0.1.62

package/dist/hydrate/hydrate.js

@@ -25,6 +25,7 @@ import { bindableHtmlElementsNumber, bindableHtmlElementsString } from "../compo
 import { checkedValueToBoolean } from "../checkedValueToBoolean.js";
 import { Default404 } from "../routing/Default404.js";
 import { initStores } from 'tungsten/Servers/initStores.js';
+import { MatchedRoute } from 'tungsten/indexInner.js';
 import { jsx as _jsx } from "tungsten/jsxRuntime.js";
 function debug(...texts) {
   //console.log(...texts)
@@ -67,14 +68,13 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
     await hydrateRootComponent(instance, RootComponent, domPointer, meta); // dom pointer at html?
     // FUTURE: await hydrateNode(content, element, domPointer, instance, meta)
   } else {
-    const {
-      params,
-      content: contentOrContentFunction,
-      data
-    } = matchedRouteInfo;
-    const content = typeof contentOrContentFunction === 'function' ? contentOrContentFunction(data, params, {}, globalData, location) : contentOrContentFunction;
-    console.log('hydration content:', content);
-    hydrateNode(content, null, domPointer, instance, meta);
+    await hydrateRootComponent(instance, MatchedRoute, domPointer, meta); // dom pointer at html?
+    // const { params, content: contentOrContentFunction, data } = matchedRouteInfo
+    // const content = (typeof contentOrContentFunction === 'function')
+    //     ? contentOrContentFunction(data, params, {}, globalData, location)
+    //     : contentOrContentFunction
+    // console.log('hydration content:', content)
+    // hydrateNode(content, null, domPointer, instance, meta)
   }
   instance.hydrationComplete = true;
   //// Can components update while hydrating is still taking place
@@ -195,15 +195,6 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
     //console.log('hydrating content', placeholderContent)
     const renderedPlaceholderContent = await hydrateNode(placeholderContent, element, domPointer, instance, meta);
     /*
-    1. Find existing nodes (opening comment, use meta to get closing comment)
-    2. Delete content nodes (between comments)
-    3. Init Element
-    4. Get initial content
-    5. Insert content
-    6. set DomPointer to end?
-    7. Return a rendered content node?
-    */
-    /*
     1. Init Element
     2. Find existing nodes (opening comment, use meta to get closing comment)
     3. Create DOM Region
@@ -215,13 +206,6 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
     9. set DomPointer to end?
     10. Return a rendered content node?
     */
-    //const placeholderContent = (typeof render === 'object') ? render.placeholder : null
-    //const placeholderContent = await hydrateNodeComponent(node, parentElement, domPointer, instance, meta)
-    // replace the server content with the new content
-    //renderedContent = await hydrateNode(content, element, domPointer, instance, meta)
-    //const renderedContent = await hydrateNode(content, element, domPointer, instance, meta)
-    //domPointer.increment(contentLength)
-    //console.log('Client Render Pointer El', domPointer.get())
     const closingNode = domPointer.get();
     if (closingNode.nodeType !== Node.COMMENT_NODE) {
       throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
@@ -235,26 +219,9 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
     if (element.__domRegion.lastElement) debug('last el children', element.__domRegion.lastElement.childNodes);
     //console.log('hydrated', element.constructor.name, 'with content', renderedContent)
     element.__currentContent = renderedPlaceholderContent;
-    //console.log('__domRegion', element.__domRegion)
-    //console.log('__domRegion clone', { ...element.__domRegion })
-    //console.log('__currentContent', element.__currentContent)
-    //console.log('__currentContent clone', { ...element.__currentContent })
-    //const initialClientContent = await element.__initialContent()
-    //console.log('initialClientContent', initialContent)
+    console.log('client side comp is initializing with', initialContent);
     const updateResult = await integrateElementUpdateVdom(element, initialContent);
-    // dom region should still be valid?
-    //element.__domRegion
     element.__currentContent = updateResult.renderedContent;
-    // const renderedNode = renderClassComponent({
-    //     parent: parentElement,
-    //     instance,
-    //     node,
-    //     element,
-    //     content: initialContent,
-    //     domPointer,
-    //     openingComment,
-    //     closingComment
-    // })
     element.__didHydrate();
     return makeRenderedContentNodeClassComponent(node, element, openingComment, closingComment);
   } else {

package/dist/indexInner.d.ts

@@ -1,3 +1,4 @@
+export * from './TungstenApp.jsx';
 export { TungstenSimpleComponent, TungstenSimpleComponent as SimpleComponent, // static component
 TungstenStatefulComponent, TungstenStatefulComponent as StatefulComponent, // stateful component
 TungstenBaseSimpleStoreComponent, TungstenBaseSimpleStoreComponent as BaseSimpleStoreComponent, TungstenBaseStatefulStoreComponent, TungstenBaseStatefulStoreComponent as BaseStatefulStoreComponent, } from './Components.jsx';
@@ -12,6 +13,10 @@ export * from './components/bindable/BindableInputTyped.jsx';
 export * from './components/bindable/BindableRadio.jsx';
 export * from './components/bindable/BindableSelect.jsx';
 export * from './components/bindable/BindableTextarea.jsx';
+export * from './components/GoToComponent.jsx';
+export * from './components/Lazy.js';
+export * from './components/Link.jsx';
+export * from './nbsp.js';
 export * from './browserStorage.js';
 export { createElement } from './createElement.js';
 export * from './createRef.js';
@@ -19,7 +24,6 @@ export { foreach } from './foreach.js';
 export * from './helpers/index.js';
 export * from './hooks/index.js';
 export * from './hydrate/hydrate.js';
-export * from './components/GoToComponent.jsx';
 export * from './jsxRuntime.js';
 export * from './env/parseEnv.js';
 export * from './makeServerRpc.js';
@@ -28,8 +32,6 @@ export { isClient } from './isClient.js';
 export { isServer } from './isServer.js';
 export { isDev } from './isDev.js';
 export { isProd } from './isProd.js';
-export * from './components/Lazy.js';
-export * from './components/Link.jsx';
 export { logAndReturn } from './logAndReturn.js';
 export * from './requests/index.js';
 export { registerGlobalData, type GlobalData, type GlobalDataFunction } from './routing/registerGlobalData.js';

package/dist/indexInner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"indexInner.d.ts","sourceRoot":"","sources":["../src/indexInner.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,uBAAuB,EAAE,uBAAuB,IAAI,eAAe,EAAE,mBAAmB;AACxF,yBAAyB,EAAE,yBAAyB,IAAI,iBAAiB,EAAE,qBAAqB;AAEhG,gCAAgC,EAAE,gCAAgC,IAAI,wBAAwB,EAC9F,kCAAkC,EAAE,kCAAkC,IAAI,0BAA0B,GACvG,MAAM,kBAAkB,CAAA;AAEzB,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA;AAC1B,cAAc,uBAAuB,CAAA;AACrC,cAAc,4CAA4C,CAAA;AAC1D,cAAc,yCAAyC,CAAA;AACvD,cAAc,8CAA8C,CAAA;AAC5D,cAAc,yCAAyC,CAAA;AACvD,cAAc,0CAA0C,CAAA;AACxD,cAAc,4CAA4C,CAAA;AAC1D,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,cAAc,gBAAgB,CAAA;AAG9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iBAAiB,CAAA;AAE/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,kBAAkB,EAAE,KAAK,UAAU,EAAE,KAAK,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAC9G,cAAc,4BAA4B,CAAA;AAC1C,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,8BAA8B,CAAA;AAC5C,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,6BAA6B,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,cAAc,gBAAgB,CAAA;AAI9B,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC/C,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAA;AAC5F,YAAY,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AACnF,cAAc,kBAAkB,CAAA;AAEhC,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5D,YAAY,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,YAAY,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AACnC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACvD,YAAY,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,YAAY,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,IAAI,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAClF,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC/D,YAAY,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACvD,YAAY,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,YAAY,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAC3E,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,YAAY,EACR,0BAA0B,EAAE,0BAA0B,IAAI,SAAS,EACnE,gCAAgC,EAAE,gCAAgC,IAAI,eAAe,EACrF,cAAc,EACjB,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,mBAAmB,mBAAmB,CAAA"}
+{"version":3,"file":"indexInner.d.ts","sourceRoot":"","sources":["../src/indexInner.ts"],"names":[],"mappings":"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"}

package/dist/indexInner.js

@@ -1,4 +1,5 @@
 // core
+export * from "./TungstenApp.js";
 export { TungstenSimpleComponent, TungstenSimpleComponent as SimpleComponent,
 // static component
 TungstenStatefulComponent, TungstenStatefulComponent as StatefulComponent,
@@ -17,6 +18,10 @@ export * from "./components/bindable/BindableInputTyped.js";
 export * from "./components/bindable/BindableRadio.js";
 export * from "./components/bindable/BindableSelect.js";
 export * from "./components/bindable/BindableTextarea.js";
+export * from "./components/GoToComponent.js";
+export * from "./components/Lazy.js";
+export * from "./components/Link.js";
+export * from "./nbsp.js";
 export * from "./browserStorage.js";
 export { createElement } from "./createElement.js";
 export * from "./createRef.js";
@@ -26,7 +31,6 @@ export { foreach } from "./foreach.js";
 export * from "./helpers/index.js";
 export * from "./hooks/index.js";
 export * from "./hydrate/hydrate.js";
-export * from "./components/GoToComponent.js";
 export * from "./jsxRuntime.js";
 //export { tungstenPrivateEnv, tungstenPublicEnv } from './env/env.js'
 export * from "./env/parseEnv.js";
@@ -36,8 +40,6 @@ export { isClient } from "./isClient.js";
 export { isServer } from "./isServer.js";
 export { isDev } from "./isDev.js";
 export { isProd } from "./isProd.js";
-export * from "./components/Lazy.js";
-export * from "./components/Link.js";
 export { logAndReturn } from "./logAndReturn.js";
 //export * from './RenderRoutes.js' // maybe we won't use render routes, instead Router and Route
 export * from "./requests/index.js";

package/dist/jsxRuntime.d.ts

@@ -6,5 +6,5 @@ export * from './contentNodeSymbols.js';
 export declare const Fragment: 60107;
 export type JsxNodeType = string | AnyComponentType | typeof Fragment;
 export declare function jsx(type: JsxNodeType | string | number | boolean | null | undefined, props: TungstenComponentGenericProps, key: KeyAttr): ContentNode;
-export declare const jsxs: typeof jsx;
+export declare const jsxs: (...args: Parameters<typeof jsx>) => ContentNode;
 //# sourceMappingURL=jsxRuntime.d.ts.map

package/dist/jsxRuntime.d.ts.map

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

package/dist/jsxRuntime.js

@@ -4,6 +4,7 @@ import { $key, $props, $type } from "./contentNodeSymbols.js";
 import { packageNameCapitalized } from "./settings.js";
 import { throwError } from "./throwError.js";
 export * from "./contentNodeSymbols.js";
+//import { inspect } from 'util'
 export const Fragment = 0xeacb; // code taken from react for fragments
 // (?outdated?) this doesn't seem to handle string/number/undefined correctly
 function classNameArrayToString(array) {
@@ -18,10 +19,10 @@ function ComponentIsClassComponent(c) {
 }
 // jsx func to turn a jsx element into a tree node
 export function jsx(type, props, key) {
-  console.log('--jsx--');
-  console.log('type', type);
-  console.log('type', props);
-  console.log('key', key);
+  // console.log('--jsx--')
+  // console.log('type', type)
+  // console.log('type', JSON.stringify(props))
+  // console.log('key', key)
   // merge together class and className, into className
   // and convert any arrays to strings in the process
   if (Array.isArray(props.className)) props.className = classNameArrayToString(props.className);
@@ -86,4 +87,7 @@ export function jsx(type, props, key) {
 }
 // jsxs is used when children is an array instead of a single object
 // just use the same function for both
-export const jsxs = jsx;
+export const jsxs = function (...args) {
+  //console.log('jsxs')
+  return jsx(...args);
+};

package/dist/makeServerRpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeServerRpc.d.ts","sourceRoot":"","sources":["../src/makeServerRpc.ts"],"names":[],"mappings":"AAaA,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,CAAA;AAC7C,KAAK,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;AA4C1C,eAAO,MAAM,sBAAsB,GAAY,CAAC,SAAS,WAAW,kBAAkB,CAAC,KAAG,CAGzF,CAAA;AAED,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAA;AAG1C,eAAO,MAAM,oBAAoB,GAAY,CAAC,iBAAiB,aAAa,CAAC,CAAC,CAAC,kBAAkB,cAAc,CAAC,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CAMpI,CAAA"}
+{"version":3,"file":"makeServerRpc.d.ts","sourceRoot":"","sources":["../src/makeServerRpc.ts"],"names":[],"mappings":"AAaA,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,CAAA;AAC7C,KAAK,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;AA4C1C,eAAO,MAAM,sBAAsB,GAAY,CAAC,SAAS,WAAW,EAAE,gBAAgB,CAAC,KAAG,CAGzF,CAAA;AAED,KAAK,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAA;AAG1C,eAAO,MAAM,oBAAoB,GAAY,CAAC,EAAE,eAAe,aAAa,CAAC,CAAC,CAAC,EAAE,gBAAgB,cAAc,CAAC,CAAC,CAAC,KAAG,cAAc,CAAC,CAAC,CAMpI,CAAA"}

package/dist/nbsp.d.ts

@@ -0,0 +1,3 @@
+export declare const nbsp: import("./ContentNode.js").ContentNode;
+export declare const space: import("./ContentNode.js").ContentNode;
+//# sourceMappingURL=nbsp.d.ts.map

package/dist/nbsp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nbsp.d.ts","sourceRoot":"","sources":["../src/nbsp.tsx"],"names":[],"mappings":"AAGA,eAAO,MAAM,IAAI,wCAAc,CAAA;AAC/B,eAAO,MAAM,KAAK,wCAAc,CAAA"}

package/dist/nbsp.js

@@ -0,0 +1,8 @@
+import { Fragment as _Fragment, jsx as _jsx } from "tungsten/jsxRuntime.js";
+//export function Space() { return ' ' }
+export const nbsp = _jsx(_Fragment, {
+  children: "\xA0"
+});
+export const space = _jsx(_Fragment, {
+  children: nbsp
+});

package/dist/routing/MatchedRoute.d.ts

@@ -1,6 +1,11 @@
+import type { CSSProperties } from '../../types/jsx/html.js';
 import { TungstenSimpleInternalStoreComponent } from '../Components.jsx';
+import { ContentNode } from '../ContentNode.js';
 export type MatchedRouteProps = {
     className?: string;
+    css?: string;
+    children?: ContentNode;
+    style?: CSSProperties;
 };
 export declare class MatchedRoute extends TungstenSimpleInternalStoreComponent<MatchedRouteProps> {
     init: () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"MatchedRoute.d.ts","sourceRoot":"","sources":["../../src/routing/MatchedRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAA;AAKxE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AACD,qBAAa,YAAa,SAAQ,oCAAoC,CAAC,iBAAiB,CAAC;IACrF,IAAI,aAA4C;IAChD,OAAO,qQAaN;CACJ"}
+{"version":3,"file":"MatchedRoute.d.ts","sourceRoot":"","sources":["../../src/routing/MatchedRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAA;AAIvE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,KAAK,CAAC,EAAE,aAAa,CAAA;CACxB,CAAA;AACD,qBAAa,YAAa,SAAQ,oCAAoC,CAAC,iBAAiB,CAAC;IACrF,IAAI,aAA4C;IAChD,OAAO,qQAaN;CACJ"}

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;AAskBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E;AA8TD,KAAK,2BAA2B,GAAG;IAC/B,MAAM,EAAE,eAAe,CAAA;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,uBAAuB,CAAC;IAE9B,UAAU,EAAE,UAAU,CAAA;CACzB,CAAA;AACD,wBAAsB,uBAAuB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,2BAA2B,GAC3G,OAAO,CAAC,4BAA4B,CAAC,CAU1C"}
+{"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;AAqkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E;AAgUD,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

@@ -130,6 +130,7 @@ async function applyUpdate({
   //console.log('domPointer.index', domPointer.index)
   debug('existing node', oldNode);
   if (ContentNodeIsNonRendered(newNode)) {
+    console.log('DD delete node because current node is non rendered');
     debug('DD delete node because current node is non rendered');
     deleteNodeIfRendered(oldNode);
     return makeRenderedContentNodeNonRendered();
@@ -249,6 +250,7 @@ async function applyUpdate({
         // trim
         for (const oldChild of tempOldChildren) {
           if (oldChild) {
+            console.log('deleting old child', oldChild);
             deleteNodeIfRendered(oldChild);
           }
         }
@@ -280,12 +282,14 @@ async function applyUpdate({
           i++;
         }
         while (i < oldNode.length) {
+          console.log('deleting old child 2', oldNode[i]);
           deleteNodeIfRendered(oldNode[i]);
           i++;
         }
         return renderedNodes;
       }
     } else {
+      console.log('DD delete node because current node is array and existing node is not', oldNode);
       debug('DD delete node because current node is array and existing node is not');
       deleteNodeIfRendered(oldNode);
       // insert
@@ -320,7 +324,7 @@ async function applyUpdate({
       debug(`!!!!dom pointer index is`, domPointer.index, 'after updating literal  node');
       return makeRenderedContentNodeLiteral(newNode, oldNode.domNode);
     } else {
-      //console.log('deleting old node and creating literal')
+      console.log('DD delete node because current node is literal and existing node is not', oldNode);
       debug('DD delete node because current node is literal and existing node is not');
       deleteNodeIfRendered(oldNode);
       // insert text node
@@ -372,15 +376,6 @@ async function applyUpdate({
       return renderedHtmlElement;
     }
   } else if (ContentNodeIsComponent(newNode)) {
-    //console.log('comparing component node', newNode, 'to', oldNode)
-    //console.log('Comp A', WideRenderedContentNodeIsComponent(oldNode))
-    //if (WideRenderedContentNodeIsComponent(oldNode)) {
-    //console.log('Comp B', newNode[$type] === oldNode[$type])
-    //console.log('Comp C', oldNode[$key] !== undefined)
-    //console.log('Comp D', newNode[$key] !== undefined)
-    //console.log('Comp E', (oldNode[$key] !== undefined && newNode[$key] !== undefined))
-    //console.log('Comp F', oldNode[$key] === newNode[$key])SW
-    //}
     //console.log('Comp A', WideRenderedContentNodeIsComponent(oldNode))
     if (WideRenderedContentNodeIsComponent(oldNode) && newNode[$type] === oldNode[$type] && (oldNode[$key] !== undefined && newNode[$key] !== undefined || oldNode[$key] === newNode[$key])) {
       //console.log('updating tu el', newNode, oldNode[$key], newNode[$key])
@@ -394,8 +389,8 @@ async function applyUpdate({
       });
     } else {
       //console.log('deleting and replacing node', oldNode)
-      //console.log('new Comp El', newNode)
-      debug('deletin node and creating component', newNode[$type].constructor.name, oldNode);
+      console.log('deleting node and creating component', newNode[$type].constructor.name, oldNode);
+      debug('deleting node and creating component', newNode[$type].constructor.name, oldNode);
       deleteNodeIfRendered(oldNode);
       // insert new
       //console.log('Creating tung comp in applyUpdate')
@@ -489,6 +484,7 @@ function moveDomNode(domNode, domPointer) {
   domPointer.increment();
 }
 function deleteNodeIfRendered(node) {
+  //console.log('-deleteNodeIfRendered', node)
   debug('-deleteNodeIfRendered', node);
   if (node !== $contentNull && !RenderedContentNodeIsNonRendered(node)) {
     //node
@@ -753,6 +749,8 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
       htmlEl.appendChild(el.cloneNode(true));
     }
   }
+  //console.log('creating hmtl node', node[$type])
+  //console.log('has ref?', 'ref' in node[$props])
   if ('ref' in node[$props]) {
     node[$props].ref.current = htmlEl;
   }

package/dist/update/integrateUpdateVdomPrebuild.d.ts

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

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

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