saloe 0.0.11 → 0.0.13

package/demos/demo-listener/dist/input.js

@@ -0,0 +1,5 @@
+const input = ({ e, srcElement }) => {
+    console.log('--- value =', srcElement?.value)
+}
+
+export { input }

package/demos/demo-listener/dist/load.js

@@ -0,0 +1,14 @@
+// import { setCookie, getCookie } from 'saloe/cookie'
+
+
+const load = ({ e, srcElement }) => {
+    console.log('--- load')
+
+    // const key = 'test'
+    // setCookie({ key, value: '1234' })
+
+    // const value = getCookie({ key })
+    // console.log('--- value =', value)
+}
+
+export { load }

package/demos/demo-listener/dist/submit.js

@@ -0,0 +1,6 @@
+const submit = ({ e, srcElement }) => {
+    e.preventDefault()
+    console.log('--- submit 2')
+}
+
+export { submit }

package/demos/demo-listener/package.json

@@ -23,7 +23,7 @@
   "license": "ISC",
   "devDependencies": {
     "@cloudflare/kv-asset-handler": "^0.3.4",
-    "saloe": "^0.0.8",
+    "saloe": "^0.0.12",
     "vite": "^5.4.3"
   }
 }

package/demos/demo-listener/public/click.js

@@ -0,0 +1,7 @@
+const click = ({ e, srcElement }) => {
+    console.log('--- clicked!')
+}
+
+export {
+    click,
+}

package/demos/demo-listener/public/submit.js

@@ -1,6 +1,6 @@
 const submit = ({ e, srcElement }) => {
     e.preventDefault()
-    console.log('--- submit 2')
+    console.log('--- srcElement =', srcElement)
 }
 
 export { submit }

package/demos/demo-listener/server.js

@@ -7,7 +7,9 @@ import { getScriptListener } from 'saloe/listener'
 import manifestJSON from '__STATIC_CONTENT_MANIFEST'
 
 
-const isRedirectableCallback = ({ pathname }) => {
+const isRedirectableCallback = ({ request }) => {
+    const url = new URL(request?.url)
+    const { pathname } = url
     return pathname !== '/' && pathname.endsWith('/')
 }
 
@@ -48,6 +50,8 @@ const isServerOnlyCallback = ({ request }) => {
                         />
                         <button type="submit">Submit!</button>     
                     </form>
+                    <br/>
+                    <button on-click="click">Click</button>
                 `,
                 scripts: () => html`
                     ${getScriptListener()}
@@ -65,10 +69,14 @@ const isServerOnlyCallback = ({ request }) => {
 const handleFetch = async ({ request, env, ctx }) => {
     const url = new URL(request.url)
     const { origin, pathname } = url
+    console.log('--- origin =', origin)
+    console.log('--- pathname =', pathname)
 
     const pattern = findPatternFromUrl({ url })
+    console.log('--- pattern =', pattern)
 
-    const redirectResult = getRedirectResponse({ origin, pathname, isRedirectableCallback })
+    const redirectResult = getRedirectResponse({ origin, request, isRedirectableCallback })
+    console.log('--- redirectResult =', redirectResult)
     if (redirectResult?.response) return redirectResult.response
 
     const forbiddenResult = getForbiddenResponse({ origin, request, isForbiddenCallback })

package/dist/listener.cjs.js

@@ -14,7 +14,8 @@ const listener = () => {
     "blur",
     "change",
     "focus",
-    "invalid"
+    "invalid",
+    ...EVENTS_FIRE_DOCUMENT_BODY_LISTENERS
   ];
   const addListener = ({ srcElement, event, listeners }) => {
     srcElement == null ? void 0 : srcElement.addEventListener(event, (e) => {

package/dist/listener.es.js

@@ -12,7 +12,8 @@ const listener = () => {
     "blur",
     "change",
     "focus",
-    "invalid"
+    "invalid",
+    ...EVENTS_FIRE_DOCUMENT_BODY_LISTENERS
   ];
   const addListener = ({ srcElement, event, listeners }) => {
     srcElement == null ? void 0 : srcElement.addEventListener(event, (e) => {

package/dist/vite.cjs.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const fs = require("fs");
 const path = require("path");
-var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 const listFiles = async ({ path: path$1 }) => {
   let allFiles = [];
   try {
@@ -52,8 +51,8 @@ console.log(A${acumIndex})
     })
   );
 };
-const getURLPath = ({ path: path2 }) => new URL(`${path2}`, typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.src || new URL("vite.cjs.js", document.baseURI).href).pathname;
-const getInputPaths = async ({ sources }) => {
+const getURLPath = ({ path: path2, metaUrl }) => new URL(`${path2}`, metaUrl).pathname;
+const getInputPaths = async ({ sources, metaUrl }) => {
   var _a;
   try {
     const componentsInfos = await getImportCode({ sources });
@@ -70,14 +69,14 @@ const getInputPaths = async ({ sources }) => {
             if ((componentFilePath == null ? void 0 : componentFilePath.endsWith(".js")) && !(componentFilePath == null ? void 0 : componentFilePath.includes("/actions/"))) return acc;
             const fileName = (_a3 = componentFilePath == null ? void 0 : componentFilePath.split("/")) == null ? void 0 : _a3.pop();
             const componentName = fileName == null ? void 0 : fileName.replace(/\.[^.]+$/, "");
-            acc[componentName] = getURLPath({ path: componentFilePath });
+            acc[componentName] = getURLPath({ path: componentFilePath, metaUrl });
             return acc;
           }, {})
         };
         return acc1;
       }, {}),
-      actionsFilePath: getURLPath({ path: actionsFilePath })
-      // 'sw.worker': getURLPath({ path: '/src/sw.worker.js' }),
+      actionsFilePath: getURLPath({ path: actionsFilePath, metaUrl })
+      // 'sw.worker': getURLPath({ path: '/src/sw.worker.js', metaUrl }),
     };
     return paths;
   } catch (err) {

package/dist/vite.es.js

@@ -49,8 +49,8 @@ console.log(A${acumIndex})
     })
   );
 };
-const getURLPath = ({ path }) => new URL(`${path}`, import.meta.url).pathname;
-const getInputPaths = async ({ sources }) => {
+const getURLPath = ({ path, metaUrl }) => new URL(`${path}`, metaUrl).pathname;
+const getInputPaths = async ({ sources, metaUrl }) => {
   var _a;
   try {
     const componentsInfos = await getImportCode({ sources });
@@ -67,14 +67,14 @@ const getInputPaths = async ({ sources }) => {
             if ((componentFilePath == null ? void 0 : componentFilePath.endsWith(".js")) && !(componentFilePath == null ? void 0 : componentFilePath.includes("/actions/"))) return acc;
             const fileName = (_a3 = componentFilePath == null ? void 0 : componentFilePath.split("/")) == null ? void 0 : _a3.pop();
             const componentName = fileName == null ? void 0 : fileName.replace(/\.[^.]+$/, "");
-            acc[componentName] = getURLPath({ path: componentFilePath });
+            acc[componentName] = getURLPath({ path: componentFilePath, metaUrl });
             return acc;
           }, {})
         };
         return acc1;
       }, {}),
-      actionsFilePath: getURLPath({ path: actionsFilePath })
-      // 'sw.worker': getURLPath({ path: '/src/sw.worker.js' }),
+      actionsFilePath: getURLPath({ path: actionsFilePath, metaUrl })
+      // 'sw.worker': getURLPath({ path: '/src/sw.worker.js', metaUrl }),
     };
     return paths;
   } catch (err) {

package/package.json

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

package/src/listener.js

@@ -15,6 +15,7 @@ const listener = () => {
         'change',
         'focus',
         'invalid',
+        ...EVENTS_FIRE_DOCUMENT_BODY_LISTENERS,
     ]
 
     const addListener = ({ srcElement, event, listeners }) => {

package/src/vite.js

@@ -69,9 +69,9 @@ const getImportCode = async ({ sources }) => {
 }
 
 
-const getURLPath = ({ path }) => new URL(`${path}`, import.meta.url).pathname
+const getURLPath = ({ path, metaUrl }) => new URL(`${path}`, metaUrl).pathname
 
-const getInputPaths = async ({ sources }) => {
+const getInputPaths = async ({ sources, metaUrl }) => {
     try {
         const componentsInfos = await getImportCode({ sources })
 
@@ -88,14 +88,14 @@ const getInputPaths = async ({ sources }) => {
                         if (componentFilePath?.endsWith('.js') && !componentFilePath?.includes('/actions/')) return acc
                         const fileName = componentFilePath?.split('/')?.pop()
                         const componentName = fileName?.replace(/\.[^.]+$/, '')
-                        acc[componentName] = getURLPath({ path: componentFilePath })
+                        acc[componentName] = getURLPath({ path: componentFilePath, metaUrl })
                         return acc
                     }, {})
                 }
                 return acc1
             }, {}),
-            actionsFilePath: getURLPath({ path: actionsFilePath }),
-            // 'sw.worker': getURLPath({ path: '/src/sw.worker.js' }),
+            actionsFilePath: getURLPath({ path: actionsFilePath, metaUrl }),
+            // 'sw.worker': getURLPath({ path: '/src/sw.worker.js', metaUrl }),
         }
 
         return paths