foldkit 0.8.0-canary.0 → 0.9.0-canary.1

package/dist/runtime/addNavigationEventListeners.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addNavigationEventListeners.d.ts","sourceRoot":"","sources":["../../src/runtime/addNavigationEventListeners.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAgB,MAAM,QAAQ,CAAA;AAI3D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAGzC,eAAO,MAAM,2BAA2B,GAAI,OAAO,EACjD,cAAc,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAClC,eAAe,aAAa,CAAC,OAAO,CAAC,SAKtC,CAAA"}
+{"version":3,"file":"addNavigationEventListeners.d.ts","sourceRoot":"","sources":["../../src/runtime/addNavigationEventListeners.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAU,MAAM,QAAQ,CAAA;AAI9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAGzC,eAAO,MAAM,2BAA2B,GAAI,OAAO,EACjD,cAAc,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAClC,eAAe,aAAa,CAAC,OAAO,CAAC,SAKtC,CAAA"}

package/dist/runtime/addNavigationEventListeners.js

@@ -1,4 +1,4 @@
-import { Array, Option, Queue, String, pipe } from 'effect';
+import { Option, Queue, String } from 'effect';
 import { OptionExt, StringExt } from '../effectExtensions';
 import { External, Internal } from './urlRequest';
 export const addNavigationEventListeners = (messageQueue, browserConfig) => {
@@ -8,73 +8,51 @@ export const addNavigationEventListeners = (messageQueue, browserConfig) => {
 };
 const addPopStateListener = (messageQueue, browserConfig) => {
     const onPopState = () => {
-        const search = StringExt.stripPrefixNonEmpty('?')(window.location.search);
-        const hash = StringExt.stripPrefixNonEmpty('#')(window.location.hash);
-        const newUrl = {
-            protocol: window.location.protocol,
-            host: window.location.host,
-            port: OptionExt.fromString(window.location.port),
-            pathname: window.location.pathname,
-            search,
-            hash,
-        };
-        Queue.unsafeOffer(messageQueue, browserConfig.onUrlChange(newUrl));
+        Queue.unsafeOffer(messageQueue, browserConfig.onUrlChange(locationToUrl()));
     };
     window.addEventListener('popstate', onPopState);
 };
 const addLinkClickListener = (messageQueue, browserConfig) => {
     const onLinkClick = (event) => {
         const target = event.target;
-        if (!target || !('closest' in target))
+        if (!target || !('closest' in target)) {
             return;
+        }
         /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-        const link = target.closest('a');
-        if (!link)
+        const maybeLink = Option.fromNullable(target.closest('a'));
+        if (Option.isNone(maybeLink)) {
             return;
-        const href = link.getAttribute('href');
-        if (!href)
+        }
+        const { href } = maybeLink.value;
+        if (String.isEmpty(href)) {
             return;
-        if (href.startsWith('http://') || href.startsWith('https://') || href.startsWith('//')) {
+        }
+        event.preventDefault();
+        const linkUrl = new URL(href);
+        const currentUrl = new URL(window.location.href);
+        if (linkUrl.origin !== currentUrl.origin) {
             Queue.unsafeOffer(messageQueue, browserConfig.onUrlRequest(External.make({ href })));
             return;
         }
-        const url = pipe(href, String.split('?'), (parts) => {
-            event.preventDefault();
-            const path = Array.headNonEmpty(parts);
-            const searchAndHash = Array.tailNonEmpty(parts);
-            const pathname = pipe(path, String.split('#'), Array.headNonEmpty) || '/';
-            const searchPart = Array.head(searchAndHash).pipe(Option.match({
-                onNone: () => '',
-                onSome: (s) => s,
-            }));
-            const search = pipe(searchPart, String.split('#'), Array.headNonEmpty, OptionExt.fromString);
-            const hash = pipe(href, String.split('#'), (hashParts) => Array.isNonEmptyArray(hashParts) && hashParts.length > 1 ? hashParts[1] : '', OptionExt.fromString);
-            return {
-                protocol: window.location.protocol,
-                host: window.location.host,
-                port: OptionExt.fromString(window.location.port),
-                pathname,
-                search,
-                hash,
-            };
-        });
-        Queue.unsafeOffer(messageQueue, browserConfig.onUrlRequest(Internal.make({ url })));
+        Queue.unsafeOffer(messageQueue, browserConfig.onUrlRequest(Internal.make({ url: urlToFoldkitUrl(linkUrl) })));
     };
     document.addEventListener('click', onLinkClick);
 };
 const addProgrammaticNavigationListener = (messageQueue, browserConfig) => {
     const onProgrammaticNavigation = () => {
-        const search = StringExt.stripPrefixNonEmpty('?')(window.location.search);
-        const hash = StringExt.stripPrefixNonEmpty('#')(window.location.hash);
-        const newUrl = {
-            protocol: window.location.protocol,
-            host: window.location.host,
-            port: OptionExt.fromString(window.location.port),
-            pathname: window.location.pathname,
-            search,
-            hash,
-        };
-        Queue.unsafeOffer(messageQueue, browserConfig.onUrlChange(newUrl));
+        Queue.unsafeOffer(messageQueue, browserConfig.onUrlChange(locationToUrl()));
     };
     window.addEventListener('foldkit:urlchange', onProgrammaticNavigation);
 };
+const urlToFoldkitUrl = (url) => {
+    const { protocol, hostname, port, pathname, search, hash } = url;
+    return {
+        protocol,
+        host: hostname,
+        port: OptionExt.fromString(port),
+        pathname,
+        search: StringExt.stripPrefixNonEmpty('?')(search),
+        hash: StringExt.stripPrefixNonEmpty('#')(hash),
+    };
+};
+const locationToUrl = () => urlToFoldkitUrl(new URL(window.location.href));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foldkit",
-  "version": "0.8.0-canary.0",
+  "version": "0.9.0-canary.1",
   "description": "Elm-inspired UI framework powered by Effect",
   "type": "module",
   "main": "./dist/index.js",