aptechka 0.4.18 → 0.4.19

package/lib/morph/index.cjs

@@ -1 +1 @@
-"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;
+"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)},a=(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 c=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(c,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]=c=>new Promise((L,d,u)=>(c=s.call(n,c),u=c.done,Promise.resolve(c.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"),ct=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))});a(this,y,e),a(this,l,t),a(this,w,i(this,l).getAttribute("href")||"/"),a(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);i(this,l).hasAttribute("data-include")?s.pathname.includes(r.pathname)&&i(this,l).classList.add("current"):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 g,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,g,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")});ct.isBrowser&&(a(this,g,(t==null?void 0:t.base)||"/"),t!=null&&t.base?(a(this,g,t.base),t.base.endsWith("/")||a(this,g,i(this,g)+"/")):a(this,g,"/"),a(this,N,(t==null?void 0:t.waitForHeadToLoad)!==!1),a(this,A,(t==null?void 0:t.cachePages)!==!1),a(this,C,m(this,D,G).call(this,document)),a(this,M,location.pathname),m(this,z,_).call(this),addEventListener("popstate",i(this,j)))}normalizePath(t){t=t.replace(i(this,g),""),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],c=i(this,g)+s,L=r==null?void 0:r[1],d=e==null?void 0:e[1];return{leaf:s,pathname:c,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:c,parameters:L}=r;if(i(this,E)===s||i(this,M)===s)return;a(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,p)=>{var v;(v=this.preprocessor)==null||v.call(this,{pathname:s,resolve:h,reject:p,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,p)=>{if(h.tagName==="SCRIPT"&&h.getAttribute("src")){const v=document.createElement("script");v.type="module",v.src=h.getAttribute("src"),F[p]=v}}),F.forEach((h,p)=>{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 p=0;try{for(var v=et(B),mt,pt,gt;mt=!(pt=yield v.next()).done;mt=!1){const at=pt.value;at.onload=()=>{p++,p===B.length&&h()}}}catch(pt){gt=[pt]}finally{try{mt&&(pt=v.return)&&(yield pt.call(v))}finally{if(gt)throw gt[0]}}}))),a(this,M,s);const I=L||location.search,rt=c?c.startsWith("#")?c:"#"+c:"",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,p)=>{const v=ht[p];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)}a(this,E,void 0)})}}g=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(),c=i(this,O).parseFromString(s,"text/html");return i(this,A)&&i(this,b).set(t,c),c})},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()),a(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

@@ -3,7 +3,7 @@ var Y = (n, t, e) => {
   if (!t.has(n))
     throw TypeError("Cannot " + e);
 };
-var s = (n, t, e) => (Y(n, t, "read from private field"), e ? e.call(n) : t.get(n)), r = (n, t, e) => {
+var s = (n, t, e) => (Y(n, t, "read from private field"), e ? e.call(n) : t.get(n)), h = (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);
@@ -12,79 +12,79 @@ 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 {
-      f(e.next(u));
-    } catch (d) {
-      i(d);
+      d(e.next(u));
+    } catch (f) {
+      i(f);
     }
-  }, L = (u) => {
+  }, v = (u) => {
     try {
-      f(e.throw(u));
-    } catch (d) {
-      i(d);
+      d(e.throw(u));
+    } catch (f) {
+      i(f);
     }
-  }, f = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(c, L);
-  f((e = e.apply(n, t)).next());
+  }, d = (u) => u.done ? o(u.value) : Promise.resolve(u.value).then(c, v);
+  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 = (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);
+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((v, d, u) => (c = i.call(n, c), u = c.done, Promise.resolve(c.value).then((f) => v({ value: f, done: u }), d)))), 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, l, w, M, N, P;
+var y, l, w, M, A, 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));
+    h(this, y, void 0);
+    h(this, l, void 0);
+    h(this, w, void 0);
+    h(this, M, void 0);
+    h(this, A, (t) => {
+      t.preventDefault(), s(this, y).navigate(s(this, w), s(this, M));
     });
-    r(this, P, () => {
-      s(this, b).prefetch(s(this, w)), s(this, l).removeEventListener("pointerenter", s(this, P));
+    h(this, P, () => {
+      s(this, y).prefetch(s(this, w)), s(this, l).removeEventListener("pointerenter", s(this, P));
     });
-    a(this, b, e), a(this, l, t), a(this, w, s(this, l).getAttribute("href") || "/"), a(this, M, s(this, l).getAttribute(
+    a(this, y, 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, l).addEventListener("click", s(this, N));
+    ) || "push"), s(this, l).addEventListener("click", s(this, A));
     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));
+    s(this, l).hasAttribute("data-include") ? i.pathname.includes(o.pathname) && s(this, l).classList.add("current") : 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, l).removeEventListener("click", s(this, N)), s(this, l).removeEventListener("pointerenter", s(this, P)), s(this, l).classList.remove("current");
+    s(this, l).removeEventListener("click", s(this, A)), s(this, l).removeEventListener("pointerenter", s(this, P)), s(this, l).classList.remove("current");
   }
 }
-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;
+y = new WeakMap(), l = new WeakMap(), w = new WeakMap(), M = new WeakMap(), A = new WeakMap(), P = new WeakMap();
+var g, N, S, C, k, q, b, L, H, W, x, z, j, D, G, R, J, O, it, F, Q, B;
 class pt {
   constructor(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) => {
+    h(this, z);
+    h(this, D);
+    h(this, R);
+    h(this, O);
+    h(this, F);
+    h(this, g, null);
+    h(this, N, null);
+    h(this, S, null);
+    h(this, C, null);
+    h(this, k, []);
+    h(this, q, new DOMParser());
+    h(this, b, /* @__PURE__ */ new Map());
+    h(this, L, void 0);
+    h(this, H, null);
+    h(this, W, new st());
+    h(this, x, new st());
+    h(this, B, (t) => {
       t.state && this.navigate(t.state, "none");
     });
-    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)));
+    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, N, (t == null ? void 0 : t.waitForHeadToLoad) !== !1), a(this, S, (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];
+    const e = t.split("#"), o = e[0].split("?"), i = o[0].endsWith("/") ? o[0].slice(0, -1) : o[0], c = s(this, g) + i, v = o == null ? void 0 : o[1], d = e == null ? void 0 : e[1];
     return {
       leaf: i,
       pathname: c,
-      parameters: L,
-      hash: f
+      parameters: v,
+      hash: d
     };
   }
   beforeNavigationEvent(t) {
@@ -103,87 +103,87 @@ class pt {
     return T(this, null, function* () {
       var u;
       const o = this.normalizePath(t);
-      let { pathname: i, hash: c, parameters: L } = o;
-      if (s(this, v) === i || s(this, H) === i)
+      let { pathname: i, hash: c, parameters: v } = o;
+      if (s(this, L) === i || s(this, H) === i)
         return;
-      a(this, v, i);
-      const f = s(this, y).has(i);
+      a(this, L, i);
+      const d = s(this, b).has(i);
       try {
-        let d = !0;
+        let f = !0;
         if (s(this, W).notify({
           pathname: i,
-          isCached: f
+          isCached: d
         }), this.preprocessor)
           try {
-            yield new Promise((h, p) => {
+            yield new Promise((r, p) => {
               var E;
-              (E = this.preprocessor) == null || E.call(this, { pathname: i, resolve: h, reject: p, isCached: f });
+              (E = this.preprocessor) == null || E.call(this, { pathname: i, resolve: r, reject: p, isCached: d });
             });
-          } catch (h) {
-            h ? console.error(h) : console.log("Route change canceled"), d = !1;
+          } catch (r) {
+            r ? console.error(r) : console.log("Route change canceled"), f = !1;
           }
-        if (!d || s(this, v) !== i)
+        if (!f || s(this, L) !== i)
           return;
-        const U = s(this, y).get(i) || (yield m(this, z, j).call(this, i));
-        if (s(this, v) !== i)
+        const U = s(this, b).get(i) || (yield m(this, z, j).call(this, i));
+        if (s(this, L) !== i)
           return;
         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();
-        }), I.forEach((h, p) => {
-          if (h.tagName === "SCRIPT" && h.getAttribute("src")) {
+        nt.forEach((r) => {
+          r.remove();
+        }), I.forEach((r, p) => {
+          if (r.tagName === "SCRIPT" && r.getAttribute("src")) {
             const E = document.createElement("script");
-            E.type = "module", E.src = h.getAttribute("src"), I[p] = E;
+            E.type = "module", E.src = r.getAttribute("src"), I[p] = E;
           }
-        }), I.forEach((h, p) => {
-          document.head.appendChild(h);
+        }), I.forEach((r, p) => {
+          document.head.appendChild(r);
         });
         const K = I.filter(
-          (h) => h.tagName === "STYLE" || h.tagName === "SCRIPT" || h.tagName === "LINK"
+          (r) => r.tagName === "STYLE" || r.tagName === "SCRIPT" || r.tagName === "LINK"
         );
-        s(this, S) && K.length && (yield new Promise((h) => T(this, null, function* () {
+        s(this, N) && K.length && (yield new Promise((r) => T(this, null, function* () {
           let p = 0;
           try {
-            for (var E = et(K), vt, Lt, wt; vt = !(Lt = yield E.next()).done; vt = !1) {
-              const at = Lt.value;
+            for (var E = et(K), Lt, vt, wt; Lt = !(vt = yield E.next()).done; Lt = !1) {
+              const at = vt.value;
               at.onload = () => {
-                p++, p === K.length && h();
+                p++, p === K.length && r();
               };
             }
-          } catch (Lt) {
-            wt = [Lt];
+          } catch (vt) {
+            wt = [vt];
           } finally {
             try {
-              vt && (Lt = E.return) && (yield Lt.call(E));
+              Lt && (vt = E.return) && (yield vt.call(E));
             } finally {
               if (wt)
                 throw wt[0];
             }
           }
         }))), a(this, H, i);
-        const $ = L || location.search, ot = c ? c.startsWith("#") ? c : "#" + c : "", rt = $ ? $.startsWith("?") ? $ : "?" + $ : "", _ = `${i}${ot}${rt}`;
+        const $ = v || location.search, ot = c ? c.startsWith("#") ? c : "#" + c : "", ht = $ ? $.startsWith("?") ? $ : "?" + $ : "", _ = `${i}${ot}${ht}`;
         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;
-        }), 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);
+        const rt = m(this, R, J).call(this, U);
+        s(this, C).forEach((r, p) => {
+          const E = rt[p];
+          r.innerHTML = E.innerHTML;
+        }), m(this, D, G).call(this), (u = this.postprocessor) == null || u.call(this, { pathname: i, isCached: d }), s(this, x).notify({ pathname: i, isCached: d });
+      } catch (f) {
+        console.error(f);
       }
-      a(this, v, void 0);
+      a(this, L, void 0);
     });
   }
 }
-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) {
+g = new WeakMap(), N = new WeakMap(), S = new WeakMap(), C = new WeakMap(), k = new WeakMap(), q = new WeakMap(), b = new WeakMap(), L = 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);
+    const e = s(this, b).get(t);
     if (e)
       return e;
     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;
+    return s(this, S) && s(this, b).set(t, c), c;
   });
 }, D = new WeakSet(), G = function() {
   const t = [

package/package.json

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