tungsten 0.1.55 → 0.1.58

package/dist/Instance/Instance.d.ts

@@ -25,6 +25,7 @@ export declare class Instance {
     defaultTitle: string;
     globalData: GlobalData;
     matchedRouteInfo: MatchedRouteInfo;
+    persistentHeadChildren: HTMLElement[];
     navigating: boolean;
     constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes, routes: Routes, internalStore: TrueStore<InternalStoreSchema>, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: GlobalData, matchedRouteInfo: MatchedRouteInfo);
     getRoutes: () => Routes;

package/dist/Instance/Instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAGlF,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IA+BtC,SAAS,eAER;IACD,cAAc,aAAc,MAAM,UAMjC;IACD,IAAI,aAAoB,QAAQ,mBAyB/B;IASD,eAAe,iBAAkB,MAAM,UAEtC;IACD,QAAQ,UAAW,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAGlF,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,aAAc,MAAM,UAMjC;IACD,IAAI,aAAoB,QAAQ,mBAyB/B;IASD,eAAe,iBAAkB,MAAM,UAEtC;IACD,QAAQ,UAAW,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}

package/dist/Instance/Instance.js

@@ -31,6 +31,7 @@ export class Instance {
     _defineProperty(this, "defaultTitle", '');
     _defineProperty(this, "globalData", void 0);
     _defineProperty(this, "matchedRouteInfo", void 0);
+    _defineProperty(this, "persistentHeadChildren", void 0);
     _defineProperty(this, "navigating", false);
     _defineProperty(this, "getRoutes", () => {
       return typeof this.appRoutes === 'function' ? this.appRoutes(this.reqRes) : this.appRoutes;
@@ -98,6 +99,7 @@ export class Instance {
     this.globalData = globalData;
     this.matchedRouteInfo = _matchedRouteInfo;
     this.config = instanceConfig; // createInstanceConfig(appConfig)
+    this.persistentHeadChildren = [];
     //if (AppClass === null) throwError('Instance', 'AppClass is null, did you register an '
     if (isClient) {
       window.addEventListener('popstate', event => {

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;AAKnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAalE,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AA0B/G,KAAK,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;AAOhE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,wBAAwB,EAAE,UAAU,CAAA;IACxC,IAAI,+BAA+B,EAAE,uBAAuB,CAAA;IAE5D,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACvC;AAGD,wBAAsB,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,yBAAyB,EAAE,cAAc,EAAE,cAAc,iBAwC3H"}
+{"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;AAIxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAmBlE,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAuB/G,KAAK,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;AAOhE,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,wBAAwB,EAAE,UAAU,CAAA;IACxC,IAAI,+BAA+B,EAAE,uBAAuB,CAAA;IAE5D,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACvC;AAGD,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,EACxC,cAAc,EAAE,cAAc,iBAyCjC"}

package/dist/hydrate/hydrate.js

@@ -28,7 +28,7 @@ function debug(...texts) {
   //console.log(...texts)
   //console.log(getStackTrace().split('\n')[2])
 }
-function makeDfaultHydrateMeta() {
+function makeDefaultHydrateMeta() {
   return {
     insideForm: false
   };
@@ -60,7 +60,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
     instance.routeData = __tungsten_route_data__;
   }
   //await hydrateRootComponent( instance, RootComponent, new DomPointer(document, 0) ) // dom pointer at doctype?
-  await hydrateRootComponent(instance, RootComponent, new DomPointer(document, 1), makeDfaultHydrateMeta()); // dom pointer at html?
+  await hydrateRootComponent(instance, RootComponent, new DomPointer(document, 1), makeDefaultHydrateMeta()); // dom pointer at html?
   instance.hydrationComplete = true;
   //// Can components update while hydrating is still taking place
   //// -- probably yes
@@ -305,6 +305,19 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     if (node.nodeType !== 1 || node.nodeName.toLocaleLowerCase() !== 'head') {
       throwError('hydrateNodeSingle', `expected to find a head node, instead found nodeType ${node.nodeType}, nodeName ${node.nodeName}`);
     }
+    // collect persistent head nodes
+    const persistentHeadChildren = [];
+    const domChildren = node.childNodes;
+    for (const child of domChildren) {
+      if (child.nodeType === 1) {
+        const el = child;
+        if (el.hasAttribute('data--t-persist')) {
+          persistentHeadChildren.push(el.cloneNode(true));
+        }
+      }
+    }
+    //const domChildrenPointer = new DomPointer(node as HTMLHeadElement)
+    instance.persistentHeadChildren = persistentHeadChildren;
     debug('head node - skipping, because we add a lot to this during initial render, breaking matching');
     domPointer.increment();
     return {
@@ -321,7 +334,7 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     if (node[$type] === 'form') {
       debug('FOUND A FORM', meta.insideForm);
       if (meta.insideForm) {
-        throwError('hydrateNodeSingle', 'tried to hydrate a <form> within another <form>. Forms are not allowed within forms. Browsers may strip out inner forms.');
+        throwError('hydrateNodeSingle', 'tried to hydrate a <form> within another <form>. Forms are not allowed within forms.' + 'Browsers may strip out inner forms.');
       }
       meta.insideForm = true;
     }
@@ -333,12 +346,12 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
       debug('domPointer.parent.childNodes', [...domPointer.parent.childNodes]);
       debug('domNode', domNode);
       debug('expected:', node[$type]);
-      throw new TungstenError(`${packageNameCapitalized} hydrateNode() error - DOM node at position where HTML element was expected is not an HTMLElement.` + ` Found: ${domNode}`);
+      throw new TungstenError(`${packageNameCapitalized} hydrateNode() error` + ` - DOM node at position where HTML element was expected is not an HTMLElement.` + ` Found: ${domNode}`);
     }
     debug('domNode', domNode);
     if (domNode.tagName.toLowerCase() !== node[$type]) {
       debug('mismatched html el type');
-      throw new TungstenError(`${packageNameCapitalized} hydrateNode() error - existing DOM node tagName does not match expected tag name.` + ` Expected <${node[$type]}>, found <${domNode.tagName.toLowerCase()}>.`);
+      throw new TungstenError(`${packageNameCapitalized} hydrateNode() error` + ` - existing DOM node tagName does not match expected tag name.` + ` Expected <${node[$type]}>, found <${domNode.tagName.toLowerCase()}>.`);
     }
     debug('save refs');
     // if (node[$props].ref) {
@@ -616,7 +629,7 @@ function processAttributes(node) {
       const [bindObject, bindKey] = props[key];
       props.checked = bindObject[bindKey] === node[$props].value;
       const handler = event => {
-        console.log('bound radio changed 2');
+        //console.log('bound radio changed 2')
         bindObject[bindKey] = event.target.value;
       };
       if (eventName in props) {

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

@@ -1 +1 @@
-{"version":3,"file":"processHead.d.ts","sourceRoot":"","sources":["../../src/render/processHead.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAK7C,OAAO,EAAE,oBAAoB,EAAqB,MAAM,qBAAqB,CAAA;AAS7E,wBAAgB,WAAW,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,QAAQ,EAAE,QAAQ,QAkGrB"}
+{"version":3,"file":"processHead.d.ts","sourceRoot":"","sources":["../../src/render/processHead.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAK7C,OAAO,EAAE,oBAAoB,EAAqB,MAAM,qBAAqB,CAAA;AAO7E,wBAAgB,WAAW,CACvB,QAAQ,EAAE,oBAAoB,EAC9B,QAAQ,EAAE,QAAQ,QAoGrB"}

package/dist/render/processHead.js

@@ -20,6 +20,7 @@ export function processHead(headNode, headData) {
     [$type]: 'link',
     [$props]: {
       'data--t-internal': undefined,
+      'data--t-persist': true,
       rel: 'stylesheet',
       href: `${siteBasePath}/${componentCssFolder}/${componentCssFile}`
     }
@@ -83,6 +84,7 @@ export function processHead(headNode, headData) {
     [$type]: 'meta',
     [$props]: {
       'data--t-internal': undefined,
+      'data--t-persist': true,
       'http-equiv': 'Content-Type',
       content: 'text/html; charset=utf-8'
     }

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

@@ -1 +1 @@
-{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,WAAW,EAAwC,eAAe,EAIrE,MAAM,mBAAmB,CAAA;AAQ1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAejD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAShD,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;AASD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAgGtH;AAgiBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E"}
+{"version":3,"file":"integrateUpdateVdom.d.ts","sourceRoot":"","sources":["../../src/update/integrateUpdateVdom.ts"],"names":[],"mappings":"AAWA,OAAO,EACH,WAAW,EAAwC,eAAe,EAIrE,MAAM,mBAAmB,CAAA;AAQ1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAejD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAShD,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;AASD,wBAAsB,0BAA0B,CAC5C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,GAC/C,OAAO,CAAC,YAAY,CAAC,CAgGvB;AAgiBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,QAkK7E"}

package/dist/update/integrateUpdateVdom.js

@@ -717,6 +717,11 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
   debug('-createHtmlElement', node);
   const htmlEl = document.createElement(node[$type]);
   addAttributes(node, htmlEl);
+  if (node[$type] === 'head') {
+    for (const el of instance.persistentHeadChildren) {
+      htmlEl.appendChild(el.cloneNode(true));
+    }
+  }
   debug('dom parent', domPointer.parent);
   debug('dom parent children length', domPointer.parent.childNodes.length);
   debug('domPointer.index', domPointer.index);
@@ -736,7 +741,7 @@ async function createHtmlElement(tungstenElement, instance, node, domPointer, pa
     tungstenElement: tungstenElement,
     instance,
     newNode: node[$props].children,
-    domPointer: new DomPointer(htmlEl, 0),
+    domPointer: new DomPointer(htmlEl, htmlEl.childNodes.length),
     parentNode: node
   });
   return {

package/package.json

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