xpine 0.0.28 → 0.0.30

package/dist/index.js

@@ -121,10 +121,12 @@ function createContext(value) {
     },
     runArrayQueue() {
       Object.keys(arrayQueue).forEach((key) => {
-        arrayQueue[key].sort((a, b) => {
-          return (a?.position ?? Infinity) - (b.position ?? Infinity);
-        });
-        for (const item of arrayQueue[key]) {
+        const dates = arrayQueue[key].filter((item) => item?.position instanceof Date);
+        const numbers = arrayQueue[key].filter((item) => typeof item?.position === "number" || !item?.position);
+        const sortedDates = dates.toSorted((a, b) => b?.position.getTime() - a?.position.getTime());
+        const sortedNumbers = numbers.toSorted((a, b) => (a?.position ?? Infinity) - (b.position ?? Infinity));
+        const output = sortedNumbers.concat(sortedDates);
+        for (const item of output) {
           this.set(key, item.value, []);
         }
       });

package/dist/src/context.d.ts

@@ -4,7 +4,7 @@ export type State<StateProps> = {
     set: (id: string, callback: SetContext<StateProps>, defaultValue?: any) => void;
     clear: () => void;
     getAll: () => any;
-    addToArray: (id: string, value: any, position?: number) => void;
+    addToArray: (id: string, value: any, position?: number | Date) => void;
     getArrayQueue: () => any;
     runArrayQueue: () => void;
 };

package/dist/src/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,CAAC;AAE9D,MAAM,MAAM,KAAK,CAAC,UAAU,IAAI;IAC9B,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,UAAU,CAAC;IAChC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChF,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,CAAC;IAClB,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,aAAa,EAAE,MAAM,GAAG,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAA;AAED,KAAK,WAAW,CAAC,IAAI,IAAI;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAA;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CA8CjE;AAED,eAAO,MAAM,OAAO,YAAoB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,kBACjC,GAAG,SAYnC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,CAAC;AAE9D,MAAM,MAAM,KAAK,CAAC,UAAU,IAAI;IAC9B,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,UAAU,CAAC;IAChC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChF,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,CAAC;IAClB,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACvE,aAAa,EAAE,MAAM,GAAG,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAA;AAED,KAAK,WAAW,CAAC,IAAI,IAAI;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAA;AAQD,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAmDjE;AAED,eAAO,MAAM,OAAO,YAAoB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,kBACjC,GAAG,SAYnC"}

package/dist/src/scripts/xpine-build.js

@@ -116,10 +116,12 @@ function createContext(value) {
     },
     runArrayQueue() {
       Object.keys(arrayQueue).forEach((key) => {
-        arrayQueue[key].sort((a, b) => {
-          return (a?.position ?? Infinity) - (b.position ?? Infinity);
-        });
-        for (const item of arrayQueue[key]) {
+        const dates = arrayQueue[key].filter((item) => item?.position instanceof Date);
+        const numbers = arrayQueue[key].filter((item) => typeof item?.position === "number" || !item?.position);
+        const sortedDates = dates.toSorted((a, b) => b?.position.getTime() - a?.position.getTime());
+        const sortedNumbers = numbers.toSorted((a, b) => (a?.position ?? Infinity) - (b.position ?? Infinity));
+        const output = sortedNumbers.concat(sortedDates);
+        for (const item of output) {
           this.set(key, item.value, []);
         }
       });

package/dist/src/scripts/xpine-dev.js

@@ -123,10 +123,12 @@ function createContext(value) {
     },
     runArrayQueue() {
       Object.keys(arrayQueue).forEach((key) => {
-        arrayQueue[key].sort((a, b) => {
-          return (a?.position ?? Infinity) - (b.position ?? Infinity);
-        });
-        for (const item of arrayQueue[key]) {
+        const dates = arrayQueue[key].filter((item) => item?.position instanceof Date);
+        const numbers = arrayQueue[key].filter((item) => typeof item?.position === "number" || !item?.position);
+        const sortedDates = dates.toSorted((a, b) => b?.position.getTime() - a?.position.getTime());
+        const sortedNumbers = numbers.toSorted((a, b) => (a?.position ?? Infinity) - (b.position ?? Infinity));
+        const output = sortedNumbers.concat(sortedDates);
+        for (const item of output) {
           this.set(key, item.value, []);
         }
       });

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.30",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",

package/test-results/.last-run.json

@@ -0,0 +1,4 @@
+{
+  "status": "failed",
+  "failedTests": []
+}

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"}