aptechka 0.4.16 → 0.4.17

package/lib/morph/Link.d.ts

@@ -2,6 +2,6 @@ import { Morph } from './Morph';
 
 export declare class Link {
     #private;
-    constructor(element: HTMLAnchorElement, morph: Morph, base: string);
+    constructor(element: HTMLAnchorElement, morph: Morph);
     destroy(): void;
 }

package/lib/morph/Morph.d.ts

@@ -20,6 +20,12 @@ export declare class Morph {
     preprocessor?: MorphPreprocessor;
     postprocessor?: MorphPostprocessor;
     constructor(parameters?: MorphParameters);
+    normalizePath(path: string): {
+        leaf: string;
+        pathname: string;
+        parameters: string;
+        hash: string;
+    };
     beforeNavigationEvent(callback: MorphNavigationCallback): () => void;
     afterNavigationEvent(callback: MorphNavigationCallback): () => void;
     prefetch(path: string): Promise<Document>;

package/lib/morph/index.cjs

@@ -1 +1 @@
-"use strict";var st=(n,t)=>(t=Symbol[n])?t:Symbol.for("Symbol."+n);var _=(n,t,e)=>{if(!t.has(n))throw TypeError("Cannot "+e)};var s=(n,t,e)=>(_(n,t,"read from private field"),e?e.call(n):t.get(n)),r=(n,t,e)=>{if(t.has(n))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(n):t.set(n,e)},c=(n,t,e,o)=>(_(n,t,"write to private field"),o?o.call(n,e):t.set(n,e),e);var d=(n,t,e)=>(_(n,t,"access private method"),e);var T=(n,t,e)=>new Promise((o,i)=>{var a=l=>{try{f(e.next(l))}catch(m){i(m)}},w=l=>{try{f(e.throw(l))}catch(m){i(m)}},f=l=>l.done?o(l.value):Promise.resolve(l.value).then(a,w);f((e=e.apply(n,t)).next())});var it=(n,t,e)=>(t=n[st("asyncIterator")])?t.call(n):(n=n[st("iterator")](),t={},e=(o,i)=>(i=n[o])&&(t[o]=a=>new Promise((w,f,l)=>(a=i.call(n,a),l=a.done,Promise.resolve(a.value).then(m=>w({value:m,done:l}),f)))),e("next"),e("return"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const nt=require("../notifier/index.cjs"),ut=require("../browser-CpzFX2xg.cjs");require("../path-data-polyfill-CXsOR7Oc.cjs");var y,u,L,H,P,S;class dt{constructor(t,e,o){r(this,y,void 0);r(this,u,void 0);r(this,L,void 0);r(this,H,void 0);r(this,P,t=>{t.preventDefault(),s(this,y).navigate(s(this,L),s(this,H))});r(this,S,()=>{s(this,y).prefetch(s(this,L))});c(this,y,e),c(this,u,t),c(this,L,s(this,u).getAttribute("href")||"/"),c(this,H,s(this,u).getAttribute("data-history-action")||"push"),s(this,u).addEventListener("click",s(this,P)),s(this,L)===location.pathname.replace(o.slice(0,-1),"")&&s(this,u).classList.add("current"),s(this,u).hasAttribute("data-prefetch")&&s(this,u).addEventListener("pointerenter",s(this,S))}destroy(){s(this,u).removeEventListener("click",s(this,P)),s(this,u).removeEventListener("pointerenter",s(this,S)),s(this,u).classList.remove("current")}}y=new WeakMap,u=new WeakMap,L=new WeakMap,H=new WeakMap,P=new WeakMap,S=new WeakMap;var g,N,A,C,k,j,b,v,M,x,W,q,z,D,G,R,J,F,Q,B,rt,I,U,K;class ft{constructor(t){r(this,q);r(this,D);r(this,R);r(this,F);r(this,B);r(this,I);r(this,g,null);r(this,N,null);r(this,A,null);r(this,C,null);r(this,k,[]);r(this,j,new DOMParser);r(this,b,new Map);r(this,v,void 0);r(this,M,null);r(this,x,new nt.Notifier);r(this,W,new nt.Notifier);r(this,K,t=>{t.state&&this.navigate(t.state,"none")});ut.isBrowser&&(c(this,g,(t==null?void 0:t.base)||"/"),t!=null&&t.base?(c(this,g,t.base),t.base.endsWith("/")||c(this,g,s(this,g)+"/")):c(this,g,"/"),c(this,N,(t==null?void 0:t.waitForHeadToLoad)!==!1),c(this,A,(t==null?void 0:t.cachePages)!==!1),c(this,C,d(this,F,Q).call(this,document)),c(this,M,location.pathname),d(this,R,J).call(this),addEventListener("popstate",s(this,K)))}beforeNavigationEvent(t){return s(this,x).subscribe(t)}afterNavigationEvent(t){return s(this,W).subscribe(t)}prefetch(t){return T(this,null,function*(){const e=d(this,D,G).call(this,t);return d(this,q,z).call(this,e.pathname)})}navigate(t,e="push"){return T(this,null,function*(){var l;const o=d(this,D,G).call(this,t);let{pathname:i,hash:a,parameters:w}=o;if(s(this,v)===i||s(this,M)===i)return;c(this,v,i);const f=s(this,b).has(i);try{let m=!0;if(s(this,x).notify({pathname:i,isCached:f}),this.preprocessor)try{yield new Promise((h,p)=>{var E;(E=this.preprocessor)==null||E.call(this,{pathname:i,resolve:h,reject:p,isCached:f})})}catch(h){h?console.error(h):console.log("Route change canceled"),m=!1}if(!m||s(this,v)!==i)return;const V=s(this,b).get(i)||(yield d(this,q,z).call(this,i));if(s(this,v)!==i)return;const X=Array.from(document.head.children),Z=Array.from(V.head.cloneNode(!0).children),tt=d(this,B,rt).call(this,X,Z),ot=d(this,I,U).call(this,X,tt),O=d(this,I,U).call(this,Z,tt);ot.forEach(h=>{h.remove()}),O.forEach((h,p)=>{if(h.tagName==="SCRIPT"&&h.getAttribute("src")){const E=document.createElement("script");E.type="module",E.src=h.getAttribute("src"),O[p]=E}}),O.forEach((h,p)=>{document.head.appendChild(h)});const Y=O.filter(h=>h.tagName==="STYLE"||h.tagName==="SCRIPT"||h.tagName==="LINK");s(this,N)&&Y.length&&(yield new Promise(h=>T(this,null,function*(){let p=0;try{for(var E=it(Y),pt,Et,vt;pt=!(Et=yield E.next()).done;pt=!1){const lt=Et.value;lt.onload=()=>{p++,p===Y.length&&h()}}}catch(Et){vt=[Et]}finally{try{pt&&(Et=E.return)&&(yield Et.call(E))}finally{if(vt)throw vt[0]}}}))),c(this,M,i);const $=w||location.search,ht=a?a.startsWith("#")?a:"#"+a:"",ct=$?$.startsWith("?")?$:"?"+$:"",et=`${i}${ht}${ct}`;e==="push"?history.pushState(i,"",et):e==="replace"&&history.replaceState(i,"",et);const at=d(this,F,Q).call(this,V);s(this,C).forEach((h,p)=>{const E=at[p];h.innerHTML=E.innerHTML}),d(this,R,J).call(this),(l=this.postprocessor)==null||l.call(this,{pathname:i,isCached:f}),s(this,W).notify({pathname:i,isCached:f})}catch(m){console.error(m)}c(this,v,void 0)})}}g=new WeakMap,N=new WeakMap,A=new WeakMap,C=new WeakMap,k=new WeakMap,j=new WeakMap,b=new WeakMap,v=new WeakMap,M=new WeakMap,x=new WeakMap,W=new WeakMap,q=new WeakSet,z=function(t){return T(this,null,function*(){const e=s(this,b).get(t);if(e)return e;const i=yield(yield fetch(t)).text(),a=s(this,j).parseFromString(i,"text/html");return s(this,A)&&s(this,b).set(t,a),a})},D=new WeakSet,G=function(t){t=t.replace(s(this,g),""),t.startsWith("/")&&(t=t.slice(1));const e=t.split("#"),o=e[0].split("?"),i=s(this,g)+o[0],a=o==null?void 0:o[1],w=e==null?void 0:e[1];return{pathname:i,parameters:a,hash:w}},R=new WeakSet,J=function(){const t=[...document.documentElement.querySelectorAll("a")].filter(e=>{var o;return(o=e.getAttribute("href"))==null?void 0:o.startsWith("/")});s(this,k).forEach(e=>e.destroy()),c(this,k,t.map(e=>new dt(e,this,s(this,g))))},F=new WeakSet,Q=function(t){const e=t.querySelectorAll("[data-morph]");return e.length?[...e]:[t.body]},B=new WeakSet,rt=function(t,e){return t.filter(o=>e.find(i=>i.outerHTML===o.outerHTML))},I=new WeakSet,U=function(t,e){return t.filter(o=>!e.find(i=>i.outerHTML===o.outerHTML))},K=new WeakMap;exports.Morph=ft;
+"use strict";var tt=(n,t)=>(t=Symbol[n])?t:Symbol.for("Symbol."+n);var K=(n,t,e)=>{if(!t.has(n))throw TypeError("Cannot "+e)};var i=(n,t,e)=>(K(n,t,"read from private field"),e?e.call(n):t.get(n)),o=(n,t,e)=>{if(t.has(n))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(n):t.set(n,e)},c=(n,t,e,r)=>(K(n,t,"write to private field"),r?r.call(n,e):t.set(n,e),e);var m=(n,t,e)=>(K(n,t,"access private method"),e);var T=(n,t,e)=>new Promise((r,s)=>{var a=u=>{try{d(e.next(u))}catch(f){s(f)}},L=u=>{try{d(e.throw(u))}catch(f){s(f)}},d=u=>u.done?r(u.value):Promise.resolve(u.value).then(a,L);d((e=e.apply(n,t)).next())});var et=(n,t,e)=>(t=n[tt("asyncIterator")])?t.call(n):(n=n[tt("iterator")](),t={},e=(r,s)=>(s=n[r])&&(t[r]=a=>new Promise((L,d,u)=>(a=s.call(n,a),u=a.done,Promise.resolve(a.value).then(f=>L({value:f,done:u}),d)))),e("next"),e("return"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const it=require("../notifier/index.cjs"),at=require("../browser-CpzFX2xg.cjs");require("../path-data-polyfill-CXsOR7Oc.cjs");var y,l,w,H,S,P;class lt{constructor(t,e){o(this,y,void 0);o(this,l,void 0);o(this,w,void 0);o(this,H,void 0);o(this,S,t=>{t.preventDefault(),i(this,y).navigate(i(this,w),i(this,H))});o(this,P,()=>{i(this,y).prefetch(i(this,w)),i(this,l).removeEventListener("pointerenter",i(this,P))});c(this,y,e),c(this,l,t),c(this,w,i(this,l).getAttribute("href")||"/"),c(this,H,i(this,l).getAttribute("data-history-action")||"push"),i(this,l).addEventListener("click",i(this,S));const r=e.normalizePath(i(this,w)),s=e.normalizePath(location.pathname);r.pathname===s.pathname&&i(this,l).classList.add("current"),i(this,l).hasAttribute("data-prefetch")&&i(this,l).addEventListener("pointerenter",i(this,P))}destroy(){i(this,l).removeEventListener("click",i(this,S)),i(this,l).removeEventListener("pointerenter",i(this,P)),i(this,l).classList.remove("current")}}y=new WeakMap,l=new WeakMap,w=new WeakMap,H=new WeakMap,S=new WeakMap,P=new WeakMap;var p,N,A,C,k,O,b,E,M,W,x,q,Y,z,_,D,G,$,st,R,J,j;class ut{constructor(t){o(this,q);o(this,z);o(this,D);o(this,$);o(this,R);o(this,p,null);o(this,N,null);o(this,A,null);o(this,C,null);o(this,k,[]);o(this,O,new DOMParser);o(this,b,new Map);o(this,E,void 0);o(this,M,null);o(this,W,new it.Notifier);o(this,x,new it.Notifier);o(this,j,t=>{t.state&&this.navigate(t.state,"none")});at.isBrowser&&(c(this,p,(t==null?void 0:t.base)||"/"),t!=null&&t.base?(c(this,p,t.base),t.base.endsWith("/")||c(this,p,i(this,p)+"/")):c(this,p,"/"),c(this,N,(t==null?void 0:t.waitForHeadToLoad)!==!1),c(this,A,(t==null?void 0:t.cachePages)!==!1),c(this,C,m(this,D,G).call(this,document)),c(this,M,location.pathname),m(this,z,_).call(this),addEventListener("popstate",i(this,j)))}normalizePath(t){t=t.replace(i(this,p),""),t.startsWith("/")&&(t=t.slice(1));const e=t.split("#"),r=e[0].split("?"),s=r[0].endsWith("/")?r[0].slice(0,-1):r[0],a=i(this,p)+s,L=r==null?void 0:r[1],d=e==null?void 0:e[1];return{leaf:s,pathname:a,parameters:L,hash:d}}beforeNavigationEvent(t){return i(this,W).subscribe(t)}afterNavigationEvent(t){return i(this,x).subscribe(t)}prefetch(t){return T(this,null,function*(){const e=this.normalizePath(t);return m(this,q,Y).call(this,e.pathname)})}navigate(t,e="push"){return T(this,null,function*(){var u;const r=this.normalizePath(t);let{pathname:s,hash:a,parameters:L}=r;if(i(this,E)===s||i(this,M)===s)return;c(this,E,s);const d=i(this,b).has(s);try{let f=!0;if(i(this,W).notify({pathname:s,isCached:d}),this.preprocessor)try{yield new Promise((h,g)=>{var v;(v=this.preprocessor)==null||v.call(this,{pathname:s,resolve:h,reject:g,isCached:d})})}catch(h){h?console.error(h):console.log("Route change canceled"),f=!1}if(!f||i(this,E)!==s)return;const Q=i(this,b).get(s)||(yield m(this,q,Y).call(this,s));if(i(this,E)!==s)return;const U=Array.from(document.head.children),V=Array.from(Q.head.cloneNode(!0).children),X=m(this,$,st).call(this,U,V),nt=m(this,R,J).call(this,U,X),F=m(this,R,J).call(this,V,X);nt.forEach(h=>{h.remove()}),F.forEach((h,g)=>{if(h.tagName==="SCRIPT"&&h.getAttribute("src")){const v=document.createElement("script");v.type="module",v.src=h.getAttribute("src"),F[g]=v}}),F.forEach((h,g)=>{document.head.appendChild(h)});const B=F.filter(h=>h.tagName==="STYLE"||h.tagName==="SCRIPT"||h.tagName==="LINK");i(this,N)&&B.length&&(yield new Promise(h=>T(this,null,function*(){let g=0;try{for(var v=et(B),mt,gt,pt;mt=!(gt=yield v.next()).done;mt=!1){const ct=gt.value;ct.onload=()=>{g++,g===B.length&&h()}}}catch(gt){pt=[gt]}finally{try{mt&&(gt=v.return)&&(yield gt.call(v))}finally{if(pt)throw pt[0]}}}))),c(this,M,s);const I=L||location.search,rt=a?a.startsWith("#")?a:"#"+a:"",ot=I?I.startsWith("?")?I:"?"+I:"",Z=`${s}${rt}${ot}`;e==="push"?history.pushState(s,"",Z):e==="replace"&&history.replaceState(s,"",Z);const ht=m(this,D,G).call(this,Q);i(this,C).forEach((h,g)=>{const v=ht[g];h.innerHTML=v.innerHTML}),m(this,z,_).call(this),(u=this.postprocessor)==null||u.call(this,{pathname:s,isCached:d}),i(this,x).notify({pathname:s,isCached:d})}catch(f){console.error(f)}c(this,E,void 0)})}}p=new WeakMap,N=new WeakMap,A=new WeakMap,C=new WeakMap,k=new WeakMap,O=new WeakMap,b=new WeakMap,E=new WeakMap,M=new WeakMap,W=new WeakMap,x=new WeakMap,q=new WeakSet,Y=function(t){return T(this,null,function*(){const e=i(this,b).get(t);if(e)return e;const s=yield(yield fetch(t)).text(),a=i(this,O).parseFromString(s,"text/html");return i(this,A)&&i(this,b).set(t,a),a})},z=new WeakSet,_=function(){const t=[...document.documentElement.querySelectorAll("a")].filter(e=>{var r;return(r=e.getAttribute("href"))==null?void 0:r.startsWith("/")});i(this,k).forEach(e=>e.destroy()),c(this,k,t.map(e=>new lt(e,this)))},D=new WeakSet,G=function(t){const e=t.querySelectorAll("[data-morph]");return e.length?[...e]:[t.body]},$=new WeakSet,st=function(t,e){return t.filter(r=>e.find(s=>s.outerHTML===r.outerHTML))},R=new WeakSet,J=function(t,e){return t.filter(r=>!e.find(s=>s.outerHTML===r.outerHTML))},j=new WeakMap;exports.Morph=ut;

package/lib/morph/index.js

@@ -1,213 +1,214 @@
-var st = (n, t) => (t = Symbol[n]) ? t : Symbol.for("Symbol." + n);
-var z = (n, t, e) => {
+var tt = (n, t) => (t = Symbol[n]) ? t : Symbol.for("Symbol." + n);
+var Y = (n, t, e) => {
   if (!t.has(n))
     throw TypeError("Cannot " + e);
 };
-var s = (n, t, e) => (z(n, t, "read from private field"), e ? e.call(n) : t.get(n)), o = (n, t, e) => {
+var s = (n, t, e) => (Y(n, t, "read from private field"), e ? e.call(n) : t.get(n)), r = (n, t, e) => {
   if (t.has(n))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(n) : t.set(n, e);
-}, c = (n, t, e, r) => (z(n, t, "write to private field"), r ? r.call(n, e) : t.set(n, e), e);
-var f = (n, t, e) => (z(n, t, "access private method"), e);
-var T = (n, t, e) => new Promise((r, i) => {
-  var a = (l) => {
+}, a = (n, t, e, o) => (Y(n, t, "write to private field"), o ? o.call(n, e) : t.set(n, e), e);
+var m = (n, t, e) => (Y(n, t, "access private method"), e);
+var T = (n, t, e) => new Promise((o, i) => {
+  var c = (u) => {
     try {
-      d(e.next(l));
-    } catch (m) {
-      i(m);
+      f(e.next(u));
+    } catch (d) {
+      i(d);
     }
-  }, v = (l) => {
+  }, L = (u) => {
     try {
-      d(e.throw(l));
-    } catch (m) {
-      i(m);
+      f(e.throw(u));
+    } catch (d) {
+      i(d);
     }
-  }, d = (l) => l.done ? r(l.value) : Promise.resolve(l.value).then(a, v);
-  d((e = e.apply(n, t)).next());
+  }, f = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(c, L);
+  f((e = e.apply(n, t)).next());
 });
-var it = (n, t, e) => (t = n[st("asyncIterator")]) ? t.call(n) : (n = n[st("iterator")](), t = {}, e = (r, i) => (i = n[r]) && (t[r] = (a) => new Promise((v, d, l) => (a = i.call(n, a), l = a.done, Promise.resolve(a.value).then((m) => v({ value: m, done: l }), d)))), e("next"), e("return"), t);
-import { Notifier as nt } from "../notifier/index.js";
-import { i as ut } from "../browser-0zX67oeU.js";
+var et = (n, t, e) => (t = n[tt("asyncIterator")]) ? t.call(n) : (n = n[tt("iterator")](), t = {}, e = (o, i) => (i = n[o]) && (t[o] = (c) => new Promise((L, f, u) => (c = i.call(n, c), u = c.done, Promise.resolve(c.value).then((d) => L({ value: d, done: u }), f)))), e("next"), e("return"), t);
+import { Notifier as st } from "../notifier/index.js";
+import { i as ct } from "../browser-0zX67oeU.js";
 import "../path-data-polyfill-DgeDWYeI.js";
-var b, u, w, M, P, N;
-class ft {
-  constructor(t, e, r) {
-    o(this, b, void 0);
-    o(this, u, void 0);
-    o(this, w, void 0);
-    o(this, M, void 0);
-    o(this, P, (t) => {
+var b, l, w, M, N, P;
+class lt {
+  constructor(t, e) {
+    r(this, b, void 0);
+    r(this, l, void 0);
+    r(this, w, void 0);
+    r(this, M, void 0);
+    r(this, N, (t) => {
       t.preventDefault(), s(this, b).navigate(s(this, w), s(this, M));
     });
-    o(this, N, () => {
-      s(this, b).prefetch(s(this, w));
+    r(this, P, () => {
+      s(this, b).prefetch(s(this, w)), s(this, l).removeEventListener("pointerenter", s(this, P));
     });
-    c(this, b, e), c(this, u, t), c(this, w, s(this, u).getAttribute("href") || "/"), c(this, M, s(this, u).getAttribute(
+    a(this, b, e), a(this, l, t), a(this, w, s(this, l).getAttribute("href") || "/"), a(this, M, s(this, l).getAttribute(
       "data-history-action"
-    ) || "push"), s(this, u).addEventListener("click", s(this, P)), s(this, w) === location.pathname.replace(r.slice(0, -1), "") && s(this, u).classList.add("current"), s(this, u).hasAttribute("data-prefetch") && s(this, u).addEventListener("pointerenter", s(this, N));
+    ) || "push"), s(this, l).addEventListener("click", s(this, N));
+    const o = e.normalizePath(s(this, w)), i = e.normalizePath(location.pathname);
+    o.pathname === i.pathname && s(this, l).classList.add("current"), s(this, l).hasAttribute("data-prefetch") && s(this, l).addEventListener("pointerenter", s(this, P));
   }
   destroy() {
-    s(this, u).removeEventListener("click", s(this, P)), s(this, u).removeEventListener("pointerenter", s(this, N)), s(this, u).classList.remove("current");
+    s(this, l).removeEventListener("click", s(this, N)), s(this, l).removeEventListener("pointerenter", s(this, P)), s(this, l).classList.remove("current");
   }
 }
-b = new WeakMap(), u = new WeakMap(), w = new WeakMap(), M = new WeakMap(), P = new WeakMap(), N = new WeakMap();
-var p, S, A, C, k, B, y, L, H, x, W, D, G, R, J, F, Q, I, U, K, ot, $, V, Y;
-class Et {
+b = new WeakMap(), l = new WeakMap(), w = new WeakMap(), M = new WeakMap(), N = new WeakMap(), P = new WeakMap();
+var g, S, A, C, k, q, y, v, H, W, x, z, j, D, G, R, J, O, it, F, Q, B;
+class pt {
   constructor(t) {
-    o(this, D);
-    o(this, R);
-    o(this, F);
-    o(this, I);
-    o(this, K);
-    o(this, $);
-    o(this, p, null);
-    o(this, S, null);
-    o(this, A, null);
-    o(this, C, null);
-    o(this, k, []);
-    o(this, B, new DOMParser());
-    o(this, y, /* @__PURE__ */ new Map());
-    o(this, L, void 0);
-    o(this, H, null);
-    o(this, x, new nt());
-    o(this, W, new nt());
-    o(this, Y, (t) => {
+    r(this, z);
+    r(this, D);
+    r(this, R);
+    r(this, O);
+    r(this, F);
+    r(this, g, null);
+    r(this, S, null);
+    r(this, A, null);
+    r(this, C, null);
+    r(this, k, []);
+    r(this, q, new DOMParser());
+    r(this, y, /* @__PURE__ */ new Map());
+    r(this, v, void 0);
+    r(this, H, null);
+    r(this, W, new st());
+    r(this, x, new st());
+    r(this, B, (t) => {
       t.state && this.navigate(t.state, "none");
     });
-    ut && (c(this, p, (t == null ? void 0 : t.base) || "/"), t != null && t.base ? (c(this, p, t.base), t.base.endsWith("/") || c(this, p, s(this, p) + "/")) : c(this, p, "/"), c(this, S, (t == null ? void 0 : t.waitForHeadToLoad) !== !1), c(this, A, (t == null ? void 0 : t.cachePages) !== !1), c(this, C, f(this, I, U).call(this, document)), c(this, H, location.pathname), f(this, F, Q).call(this), addEventListener("popstate", s(this, Y)));
+    ct && (a(this, g, (t == null ? void 0 : t.base) || "/"), t != null && t.base ? (a(this, g, t.base), t.base.endsWith("/") || a(this, g, s(this, g) + "/")) : a(this, g, "/"), a(this, S, (t == null ? void 0 : t.waitForHeadToLoad) !== !1), a(this, A, (t == null ? void 0 : t.cachePages) !== !1), a(this, C, m(this, R, J).call(this, document)), a(this, H, location.pathname), m(this, D, G).call(this), addEventListener("popstate", s(this, B)));
+  }
+  normalizePath(t) {
+    t = t.replace(s(this, g), ""), t.startsWith("/") && (t = t.slice(1));
+    const e = t.split("#"), o = e[0].split("?"), i = o[0].endsWith("/") ? o[0].slice(0, -1) : o[0], c = s(this, g) + i, L = o == null ? void 0 : o[1], f = e == null ? void 0 : e[1];
+    return {
+      leaf: i,
+      pathname: c,
+      parameters: L,
+      hash: f
+    };
   }
   beforeNavigationEvent(t) {
-    return s(this, x).subscribe(t);
+    return s(this, W).subscribe(t);
   }
   afterNavigationEvent(t) {
-    return s(this, W).subscribe(t);
+    return s(this, x).subscribe(t);
   }
   prefetch(t) {
     return T(this, null, function* () {
-      const e = f(this, R, J).call(this, t);
-      return f(this, D, G).call(this, e.pathname);
+      const e = this.normalizePath(t);
+      return m(this, z, j).call(this, e.pathname);
     });
   }
   navigate(t, e = "push") {
     return T(this, null, function* () {
-      var l;
-      const r = f(this, R, J).call(this, t);
-      let { pathname: i, hash: a, parameters: v } = r;
-      if (s(this, L) === i || s(this, H) === i)
+      var u;
+      const o = this.normalizePath(t);
+      let { pathname: i, hash: c, parameters: L } = o;
+      if (s(this, v) === i || s(this, H) === i)
         return;
-      c(this, L, i);
-      const d = s(this, y).has(i);
+      a(this, v, i);
+      const f = s(this, y).has(i);
       try {
-        let m = !0;
-        if (s(this, x).notify({
+        let d = !0;
+        if (s(this, W).notify({
           pathname: i,
-          isCached: d
+          isCached: f
         }), this.preprocessor)
           try {
-            yield new Promise((h, g) => {
+            yield new Promise((h, p) => {
               var E;
-              (E = this.preprocessor) == null || E.call(this, { pathname: i, resolve: h, reject: g, isCached: d });
+              (E = this.preprocessor) == null || E.call(this, { pathname: i, resolve: h, reject: p, isCached: f });
             });
           } catch (h) {
-            h ? console.error(h) : console.log("Route change canceled"), m = !1;
+            h ? console.error(h) : console.log("Route change canceled"), d = !1;
           }
-        if (!m || s(this, L) !== i)
+        if (!d || s(this, v) !== i)
           return;
-        const X = s(this, y).get(i) || (yield f(this, D, G).call(this, i));
-        if (s(this, L) !== i)
+        const U = s(this, y).get(i) || (yield m(this, z, j).call(this, i));
+        if (s(this, v) !== i)
           return;
-        const Z = Array.from(document.head.children), _ = Array.from(
-          X.head.cloneNode(!0).children
-        ), tt = f(this, K, ot).call(this, Z, _), rt = f(this, $, V).call(this, Z, tt), q = f(this, $, V).call(this, _, tt);
-        rt.forEach((h) => {
+        const V = Array.from(document.head.children), X = Array.from(
+          U.head.cloneNode(!0).children
+        ), Z = m(this, O, it).call(this, V, X), nt = m(this, F, Q).call(this, V, Z), I = m(this, F, Q).call(this, X, Z);
+        nt.forEach((h) => {
           h.remove();
-        }), q.forEach((h, g) => {
+        }), I.forEach((h, p) => {
           if (h.tagName === "SCRIPT" && h.getAttribute("src")) {
             const E = document.createElement("script");
-            E.type = "module", E.src = h.getAttribute("src"), q[g] = E;
+            E.type = "module", E.src = h.getAttribute("src"), I[p] = E;
           }
-        }), q.forEach((h, g) => {
+        }), I.forEach((h, p) => {
           document.head.appendChild(h);
         });
-        const j = q.filter(
+        const K = I.filter(
           (h) => h.tagName === "STYLE" || h.tagName === "SCRIPT" || h.tagName === "LINK"
         );
-        s(this, S) && j.length && (yield new Promise((h) => T(this, null, function* () {
-          let g = 0;
+        s(this, S) && K.length && (yield new Promise((h) => T(this, null, function* () {
+          let p = 0;
           try {
-            for (var E = it(j), wt, yt, bt; wt = !(yt = yield E.next()).done; wt = !1) {
-              const lt = yt.value;
-              lt.onload = () => {
-                g++, g === j.length && h();
+            for (var E = et(K), vt, Lt, wt; vt = !(Lt = yield E.next()).done; vt = !1) {
+              const at = Lt.value;
+              at.onload = () => {
+                p++, p === K.length && h();
               };
             }
-          } catch (yt) {
-            bt = [yt];
+          } catch (Lt) {
+            wt = [Lt];
           } finally {
             try {
-              wt && (yt = E.return) && (yield yt.call(E));
+              vt && (Lt = E.return) && (yield Lt.call(E));
             } finally {
-              if (bt)
-                throw bt[0];
+              if (wt)
+                throw wt[0];
             }
           }
-        }))), c(this, H, i);
-        const O = v || location.search, ht = a ? a.startsWith("#") ? a : "#" + a : "", ct = O ? O.startsWith("?") ? O : "?" + O : "", et = `${i}${ht}${ct}`;
-        e === "push" ? history.pushState(i, "", et) : e === "replace" && history.replaceState(i, "", et);
-        const at = f(this, I, U).call(this, X);
-        s(this, C).forEach((h, g) => {
-          const E = at[g];
+        }))), a(this, H, i);
+        const $ = L || location.search, ot = c ? c.startsWith("#") ? c : "#" + c : "", rt = $ ? $.startsWith("?") ? $ : "?" + $ : "", _ = `${i}${ot}${rt}`;
+        e === "push" ? history.pushState(i, "", _) : e === "replace" && history.replaceState(i, "", _);
+        const ht = m(this, R, J).call(this, U);
+        s(this, C).forEach((h, p) => {
+          const E = ht[p];
           h.innerHTML = E.innerHTML;
-        }), f(this, F, Q).call(this), (l = this.postprocessor) == null || l.call(this, { pathname: i, isCached: d }), s(this, W).notify({ pathname: i, isCached: d });
-      } catch (m) {
-        console.error(m);
+        }), m(this, D, G).call(this), (u = this.postprocessor) == null || u.call(this, { pathname: i, isCached: f }), s(this, x).notify({ pathname: i, isCached: f });
+      } catch (d) {
+        console.error(d);
       }
-      c(this, L, void 0);
+      a(this, v, void 0);
     });
   }
 }
-p = new WeakMap(), S = new WeakMap(), A = new WeakMap(), C = new WeakMap(), k = new WeakMap(), B = new WeakMap(), y = new WeakMap(), L = new WeakMap(), H = new WeakMap(), x = new WeakMap(), W = new WeakMap(), D = new WeakSet(), G = function(t) {
+g = new WeakMap(), S = new WeakMap(), A = new WeakMap(), C = new WeakMap(), k = new WeakMap(), q = new WeakMap(), y = new WeakMap(), v = new WeakMap(), H = new WeakMap(), W = new WeakMap(), x = new WeakMap(), z = new WeakSet(), j = function(t) {
   return T(this, null, function* () {
     const e = s(this, y).get(t);
     if (e)
       return e;
-    const i = yield (yield fetch(t)).text(), a = s(this, B).parseFromString(i, "text/html");
-    return s(this, A) && s(this, y).set(t, a), a;
+    const i = yield (yield fetch(t)).text(), c = s(this, q).parseFromString(i, "text/html");
+    return s(this, A) && s(this, y).set(t, c), c;
   });
-}, R = new WeakSet(), J = function(t) {
-  t = t.replace(s(this, p), ""), t.startsWith("/") && (t = t.slice(1));
-  const e = t.split("#"), r = e[0].split("?"), i = s(this, p) + r[0], a = r == null ? void 0 : r[1], v = e == null ? void 0 : e[1];
-  return {
-    pathname: i,
-    parameters: a,
-    hash: v
-  };
-}, F = new WeakSet(), Q = function() {
+}, D = new WeakSet(), G = function() {
   const t = [
     ...document.documentElement.querySelectorAll("a")
   ].filter((e) => {
-    var r;
-    return (r = e.getAttribute("href")) == null ? void 0 : r.startsWith("/");
+    var o;
+    return (o = e.getAttribute("href")) == null ? void 0 : o.startsWith("/");
   });
-  s(this, k).forEach((e) => e.destroy()), c(this, k, t.map(
-    (e) => new ft(e, this, s(this, p))
-  ));
-}, I = new WeakSet(), U = function(t) {
+  s(this, k).forEach((e) => e.destroy()), a(this, k, t.map((e) => new lt(e, this)));
+}, R = new WeakSet(), J = function(t) {
   const e = t.querySelectorAll("[data-morph]");
   return e.length ? [...e] : [t.body];
-}, K = new WeakSet(), ot = function(t, e) {
+}, O = new WeakSet(), it = function(t, e) {
   return t.filter(
-    (r) => e.find(
-      (i) => i.outerHTML === r.outerHTML
+    (o) => e.find(
+      (i) => i.outerHTML === o.outerHTML
     )
   );
-}, $ = new WeakSet(), V = function(t, e) {
+}, F = new WeakSet(), Q = function(t, e) {
   return t.filter(
-    (r) => !e.find(
-      (i) => i.outerHTML === r.outerHTML
+    (o) => !e.find(
+      (i) => i.outerHTML === o.outerHTML
     )
   );
-}, Y = new WeakMap();
+}, B = new WeakMap();
 export {
-  Et as Morph
+  pt as Morph
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"