xpine 0.0.28 → 0.0.29

package/dist/src/static/spa.js

@@ -40,16 +40,26 @@ async function getNewPageContent(href) {
     const dom = parser.parseFromString(text, "text/html");
     diffHead(dom);
     const newScripts = removeBodyScripts(dom);
-    const clonedPersistentNodes = getPersistentNodesFromDocument(dom);
-    const body = dom.body.innerHTML;
-    document.body.innerHTML = body;
-    for (const clonedNode of clonedPersistentNodes) {
-      const newNode = document.body.querySelector(`[data-persistent="${clonedNode?.getAttribute("data-persistent")}"]`);
-      newNode.replaceWith(clonedNode);
+    const { persistentArea, persistentElements } = replacePersistentNodesOnDocument(dom);
+    const documentRoot = document.body.querySelector("#xpine-root");
+    const domRoot = dom?.body?.querySelector("#xpine-root");
+    if (!documentRoot || !domRoot) {
+      throw {
+        message: "Every page must be wrapped in an #xpine-root tag",
+        documentRoot,
+        domRoot
+      };
     }
+    documentRoot?.replaceWith(domRoot);
+    for (const el of persistentElements) {
+      const newNode = document.body.querySelector(`[data-persistent="${el?.getAttribute("data-persistent")}"]`);
+      newNode.replaceWith(el);
+    }
+    persistentArea.remove();
     replaceAttributesOnDocumentBody(dom);
     replaceDocumentContentsWithLinkResponse();
-    for (const script of newScripts) document.body.appendChild(script);
+    const newDocumentRoot = document.body.querySelector("#xpine-root");
+    for (const script of newScripts) newDocumentRoot.appendChild(script);
     const event = new CustomEvent("spa:updatePageContent", {
       detail: {
         href
@@ -100,7 +110,7 @@ function removeBodyScripts(dom) {
     const element = document.createElement("script");
     portAttributesToElement(script, element);
     element.innerHTML = script.innerHTML;
-    dom.body.removeChild(script);
+    script.remove();
     newElements.push(element);
   }
   return newElements;
@@ -110,13 +120,25 @@ function portAttributesToElement(oldEl, newEl) {
     newEl.setAttribute(attribute.name, attribute.nodeValue);
   }
 }
-function getPersistentNodesFromDocument(dom) {
-  const persistentNodesFromDom = [...dom.querySelectorAll("[data-persistent]")].map((el) => el.getAttribute("data-persistent"));
+function replacePersistentNodesOnDocument(dom) {
+  const persistentArea = document.createElement("div");
+  persistentArea.style.display = "none";
+  document.body.appendChild(persistentArea);
+  const domPersistentNodes = [...dom.querySelectorAll("[data-persistent]")];
+  const persistentNodesFromDom = domPersistentNodes.map((el) => el.getAttribute("data-persistent"));
   const persistentNodesFromBody = [...document.body.querySelectorAll("[data-persistent]")];
-  const validPersistentNodes = persistentNodesFromBody.filter((el) => {
-    return persistentNodesFromDom.includes(el.getAttribute("data-persistent"));
+  const persistentElements = [];
+  persistentNodesFromBody.forEach((el) => {
+    const persistentAttribute = el.getAttribute("data-persistent");
+    if (!persistentNodesFromDom.includes(persistentAttribute)) return false;
+    dom.querySelector(`[data-persistent="${persistentAttribute}"]`).innerHTML = "";
+    persistentArea.appendChild(el);
+    persistentElements.push(el);
   });
-  return validPersistentNodes.map((el) => el.cloneNode(true));
+  return {
+    persistentElements,
+    persistentArea
+  };
 }
 function replaceAttributesOnDocumentBody(dom) {
   while (document.body.attributes.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",

package/dist/src/util/hooks/onInit.d.ts

@@ -1,3 +0,0 @@
-import { ConfigFile } from "../../../types";
-export default function createOnInit(onInit: ConfigFile['onInit']): () => Promise<void>;
-//# sourceMappingURL=onInit.d.ts.map

package/dist/src/util/hooks/onInit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"onInit.d.ts","sourceRoot":"","sources":["../../../../src/util/hooks/onInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,uBAOhE"}