saloe 0.0.82 → 0.0.84

package/dist/html.cjs.js

@@ -38,8 +38,8 @@ const stream = ({ head, body, scripts, env, status, args }) => {
   ];
   return worker.stream({ callbacks, headers, status });
 };
-const awaitHtml = async ({ pending, success, error }) => {
-  const id = Math.floor(Math.random() * 1e9);
+const awaitHtml = async ({ id, pending, success, error }) => {
+  id = id ?? Math.floor(Math.random() * 1e9);
   const pendingId = `pending_${id}`;
   const pendingRoutePathname = `/~/components/${pendingId}`;
   const route = async () => {
@@ -57,7 +57,6 @@ const awaitHtml = async ({ pending, success, error }) => {
       ],
       headers
     });
-    router.removeRoute({ pathname: pendingRoutePathname });
     return streamResult;
   };
   router.addRoute({

package/dist/html.es.js

@@ -3,7 +3,7 @@ var __defProp = Object.defineProperty;
 var __template = (cooked, raw) => __freeze(__defProp(cooked, "raw", { value: __freeze(raw || cooked.slice()) }));
 var _a;
 import { stream as stream$1 } from "./worker.es.js";
-import { addRoute, removeRoute } from "./router.es.js";
+import { addRoute } from "./router.es.js";
 import { getScope, getEnv } from "./util.es.js";
 const html = (s, ...args) => {
   var _a2;
@@ -36,8 +36,8 @@ const stream = ({ head, body, scripts, env, status, args }) => {
   ];
   return stream$1({ callbacks, headers, status });
 };
-const awaitHtml = async ({ pending, success, error }) => {
-  const id = Math.floor(Math.random() * 1e9);
+const awaitHtml = async ({ id, pending, success, error }) => {
+  id = id ?? Math.floor(Math.random() * 1e9);
   const pendingId = `pending_${id}`;
   const pendingRoutePathname = `/~/components/${pendingId}`;
   const route = async () => {
@@ -55,7 +55,6 @@ const awaitHtml = async ({ pending, success, error }) => {
       ],
       headers
     });
-    removeRoute({ pathname: pendingRoutePathname });
     return streamResult;
   };
   addRoute({

package/dist/listener.cjs.js

@@ -173,8 +173,6 @@ const listener = ({
         const srcElement = getSrcElement({ srcElement: e == null ? void 0 : e.srcElement, eventName });
         const isAnchorClicked = isAnchorBeingClicked({ srcElement, eventName });
         if (isAnchorClicked) e.preventDefault();
-        console.log("--- document.body ~ srcElement =", srcElement);
-        console.log("--- document.body ~ eventName =", eventName);
         const listeners = await fetchListeners({ srcElement, eventName, e });
         const afterExecuteListeners = isAnchorClicked ? () => {
           clickDefaultAnchor({ srcElement });

package/dist/listener.es.js

@@ -171,8 +171,6 @@ const listener = ({
         const srcElement = getSrcElement({ srcElement: e == null ? void 0 : e.srcElement, eventName });
         const isAnchorClicked = isAnchorBeingClicked({ srcElement, eventName });
         if (isAnchorClicked) e.preventDefault();
-        console.log("--- document.body ~ srcElement =", srcElement);
-        console.log("--- document.body ~ eventName =", eventName);
         const listeners = await fetchListeners({ srcElement, eventName, e });
         const afterExecuteListeners = isAnchorClicked ? () => {
           clickDefaultAnchor({ srcElement });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "saloe",
-    "version": "0.0.82",
+    "version": "0.0.84",
     "description": "Tools for making web development easy and efficient",
     "type": "module",
     "scripts": {

package/src/html.js

@@ -37,9 +37,9 @@ const stream = ({ head, body, scripts, env, status, args }) => {
     return streamAsWorker({ callbacks, headers, status })
 }
 
-const awaitHtml = async ({ pending, success, error }) => {
-    const id = Math.floor(Math.random() * 1_000_000_000)
-
+const awaitHtml = async ({ id, pending, success, error }) => {
+    id = id ?? Math.floor(Math.random() * 1_000_000_000)
+    
     const pendingId = `pending_${id}`
     const pendingRoutePathname = `/~/components/${pendingId}`
 
@@ -64,7 +64,7 @@ const awaitHtml = async ({ pending, success, error }) => {
             headers, 
         })
 
-        removeRoute({ pathname: pendingRoutePathname })
+        // removeRoute({ pathname: pendingRoutePathname })
 
         return streamResult
     }

package/src/listener.js

@@ -16,24 +16,12 @@ const listener = ({
         'invalid',
     ]
 
-    // const addListener = ({ srcElement, eventName, listeners }) => {
-    //     srcElement?.addEventListener(eventName, (e) => {
-    //         executeListeners({ e, srcElement, listeners })
-    //     })
-    // }
-
     const addListener = ({ srcElement, eventName, listeners, afterExecuteListeners }) => {
         srcElement?.addEventListener(eventName, (e) => {
             executeListeners({ e, srcElement, listeners, afterExecuteListeners })
         })
     }
 
-    // const executeListeners = async ({ e, srcElement, listeners }) => {
-    //     listeners?.forEach((listener) => {
-    //         if (listener) listener({ e, srcElement })
-    //     })
-    // }
-
     const executeListeners = async ({ e, srcElement, listeners, afterExecuteListeners }) => {        
         await Promise.all(
             (listeners ?? []).map((listener) => {
@@ -241,29 +229,6 @@ const listener = ({
         return newSrcElement
     }
 
-    // const fireAnchorClickListener = () => {
-    //     const anchors = document.querySelectorAll('a[on-click]')
-    //     anchors?.forEach(async (anchor) => {
-    //         const srcElement = anchor
-    //         const eventName = 'click'
-    //         const listeners = await fetchListeners({ srcElement, eventName })
-
-    //         anchor.addEventListener(eventName, (e) => {`
-    //             e.preventDefault()
-                
-    //             // executeListeners({ e, srcElement, listeners })
-
-    //             console.log('--- anchor ~ srcElement =', srcElement)
-    //             console.log('--- anchor ~ eventName =', eventName)
-
-    //             // const newAnchor = cloneSrcElement({ srcElement })
-    //             // newAnchor.click()
-    //         })
-
-    //         if (srcElement?.removeAttribute) srcElement.removeAttribute(`on-${eventName}`)
-    //     })
-    // }
-
     const isAnchorBeingClicked = ({ srcElement, eventName }) => {
         return srcElement?.tagName === 'A' && eventName === 'click'
     }
@@ -280,16 +245,8 @@ const listener = ({
                 const isAnchorClicked = isAnchorBeingClicked({ srcElement, eventName })
                 
                 if (isAnchorClicked) e.preventDefault()
-                
-                console.log('--- document.body ~ srcElement =', srcElement)
-                console.log('--- document.body ~ eventName =', eventName)
 
                 const listeners = await fetchListeners({ srcElement, eventName, e })
-                
-                // executeListeners({ e, srcElement, listeners })
-                // addListener({ srcElement, eventName, listeners })
-                // if (srcElement?.removeAttribute) srcElement.removeAttribute(`on-${eventName}`)
-
                 const afterExecuteListeners = isAnchorClicked 
                     ? () => { clickDefaultAnchor({ srcElement }) } 
                     : null 
@@ -309,7 +266,6 @@ const listener = ({
             await addScripts()
             fireLoadListener()
             fireObserverListeners()
-            // fireAnchorClickListener()
         })
 
         document.body.saloeListen = function () {