aptechka 0.41.6 → 0.41.7

package/lib/morph/index.cjs

@@ -1 +1 @@
-"use strict";var ot=(n,t)=>(t=Symbol[n])?t:Symbol.for("Symbol."+n),ht=n=>{throw TypeError(n)};var Q=(n,t,i)=>t.has(n)||ht("Cannot "+i);var e=(n,t,i)=>(Q(n,t,"read from private field"),i?i.call(n):t.get(n)),o=(n,t,i)=>t.has(n)?ht("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(n):t.set(n,i),c=(n,t,i,s)=>(Q(n,t,"write to private field"),s?s.call(n,i):t.set(n,i),i),A=(n,t,i)=>(Q(n,t,"access private method"),i);var z=(n,t,i)=>new Promise((s,l)=>{var u=f=>{try{g(i.next(f))}catch(b){l(b)}},a=f=>{try{g(i.throw(f))}catch(b){l(b)}},g=f=>f.done?s(f.value):Promise.resolve(f.value).then(u,a);g((i=i.apply(n,t)).next())});var ct=(n,t,i)=>(t=n[ot("asyncIterator")])?t.call(n):(n=n[ot("iterator")](),t={},i=(s,l)=>(l=n[s])&&(t[s]=u=>new Promise((a,g,f)=>(u=l.call(n,u),f=u.done,Promise.resolve(u.value).then(b=>a({value:b,done:f}),g)))),i("next"),i("return"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const pt=require("../browser-CpzFX2xg.cjs"),K=require("../events-KVanG9sR.cjs"),V=require("../url-BiHPIsKq.cjs"),dt=require("../loading/index.cjs");var T,h,p,q,x,H,D,k;class lt{constructor(t,i){o(this,T);o(this,h);o(this,p);o(this,q);o(this,x);o(this,H);o(this,D,t=>{t.preventDefault(),e(this,T).links.forEach(i=>{var s;e(this,p)===e(i,p)||(s=e(i,H))!=null&&s.includes(e(this,p))?e(i,h).classList.add("clicked"):e(i,h).classList.remove("clicked")}),e(this,T).navigate(e(this,p),{historyAction:e(this,q),state:e(this,x)})});o(this,k,()=>{e(this,T).prefetch(e(this,p)),e(this,h).removeEventListener("pointerenter",e(this,k))});var u,a;c(this,T,i),c(this,h,t),c(this,p,e(this,h).getAttribute("href")||"/"),c(this,q,e(this,h).getAttribute("data-history-action")||"push"),c(this,x,e(this,h).getAttribute("data-state")||void 0),e(this,h).addEventListener("click",e(this,D));const s=i.normalizePath(e(this,p)),l=i.normalizePath(location.pathname);c(this,H,(u=e(this,h).getAttribute("data-match-paths"))==null?void 0:u.split(",").map(g=>i.normalizePath(g.trim()).pathname)),e(this,h).hasAttribute("data-include")?l.pathname.includes(s.pathname)&&e(this,h).classList.add("current"):s.pathname===l.pathname||(a=e(this,H))!=null&&a.includes(l.pathname)?(e(this,h).classList.add("current"),e(this,h).classList.add("clicked")):e(this,h).classList.remove("clicked"),e(this,h).hasAttribute("data-prefetch")&&e(this,h).addEventListener("pointerenter",e(this,k))}get element(){return e(this,h)}destroy(){e(this,h).removeEventListener("click",e(this,D)),e(this,h).removeEventListener("pointerenter",e(this,k)),e(this,h).classList.remove("current")}}T=new WeakMap,h=new WeakMap,p=new WeakMap,q=new WeakMap,x=new WeakMap,H=new WeakMap,D=new WeakMap,k=new WeakMap;var I,O,R,S,E,Y,M,P,L,_,B,v,m,U,X,ut,Z,G;class Lt{constructor(t){o(this,m);o(this,I,null);o(this,O,null);o(this,R,null);o(this,S,null);o(this,E,[]);o(this,Y,new DOMParser);o(this,M,new Map);o(this,P);o(this,L,null);o(this,_);o(this,B);o(this,v,[]);o(this,G,t=>{t.state&&this.navigate(t.state,{historyAction:"none"})});if(pt.isBrowser){c(this,I,V.normalizeBase(t==null?void 0:t.base)),c(this,O,(t==null?void 0:t.waitForHeadToLoad)!==!1),c(this,R,(t==null?void 0:t.cachePages)!==!1),c(this,S,A(this,m,X).call(this,document.body));const i=this.normalizePath(location.pathname);c(this,L,i.pathname),document.documentElement.setAttribute("data-current-pathname",e(this,L)),document.documentElement.setAttribute("data-current-leaf",i.leaf),this.findLinks(),addEventListener("popstate",e(this,G)),V.changeHistory("replace",e(this,L),i.parameters,i.hash),e(this,S).map(s=>[...s.children]).flat().forEach(s=>{s instanceof HTMLElement&&s.classList.add("current")})}}get currentPathname(){return e(this,L)}get previousPathname(){return e(this,_)}get currentState(){return e(this,B)}get links(){return e(this,E)}normalizePath(t){return V.splitPath(t,e(this,I))}prefetch(t){return z(this,null,function*(){const i=this.normalizePath(t);return A(this,m,U).call(this,i.pathname)})}navigate(l){return z(this,arguments,function*(t,{historyAction:i="push",state:s}={}){var $;if(e(this,v).length)return;const u=this.normalizePath(t);let{pathname:a,hash:g,parameters:f,leaf:b}=u;if(e(this,P)===a||e(this,L)===a)return;c(this,B,s),c(this,P,a);const N=e(this,M).has(a);try{dt.loading.add("__morph");let F=!0;if(K.dispatchEvent(document,"morphBeforeNavigation",{detail:{pathname:a,isCached:N,state:s}}),this.preprocessor)try{yield new Promise((r,w)=>{var y;(y=this.preprocessor)==null||y.call(this,{pathname:a,resolve:r,reject:w,isCached:N,state:s})})}catch(r){r?console.error(r):console.log("Route change canceled"),F=!1}if(!F||e(this,P)!==a)return;const tt=e(this,M).get(a)||(yield A(this,m,U).call(this,a));if(e(this,P)!==a)return;const et=Array.from(document.head.children),it=Array.from(tt.head.cloneNode(!0).children),st=A(this,m,ut).call(this,et,it),mt=A(this,m,Z).call(this,et,st),W=A(this,m,Z).call(this,it,st);W.forEach((r,w)=>{if(r.tagName==="SCRIPT"&&r.getAttribute("src")){const y=document.createElement("script");y.type="module",y.src=r.getAttribute("src"),W[w]=y}}),W.forEach(r=>{document.head.appendChild(r)});const J=W.filter(r=>(r.tagName==="STYLE"||r.tagName==="SCRIPT"||r.tagName==="LINK")&&r.getAttribute("rel")!=="canonical");e(this,O)&&J.length&&(yield new Promise(r=>z(this,null,function*(){let w=0;try{for(var y=ct(J),nt,C,rt;nt=!(C=yield y.next()).done;nt=!1){const j=C.value;j.onload=()=>{w++,w===J.length&&r()}}}catch(C){rt=[C]}finally{try{nt&&(C=y.return)&&(yield C.call(y))}finally{if(rt)throw rt[0]}}}))),mt.forEach(r=>{r.hasAttribute("data-permanent")||r.remove()}),c(this,_,e(this,L)),c(this,L,a),V.changeHistory(i,a,f,g);const ft=A(this,m,X).call(this,tt.body.cloneNode(!0));e(this,v).forEach(r=>clearTimeout(r)),c(this,v,[]),e(this,S).forEach((r,w)=>{const y=ft[w],nt=getComputedStyle(r).getPropertyValue("--morph-duration"),C=[...y.childNodes];if(nt){const rt=[...r.childNodes];rt.forEach(d=>{d instanceof HTMLElement&&d.classList.add("old")}),C.forEach(d=>{d instanceof HTMLElement&&d.classList.add("new")}),r.append(...C),setTimeout(()=>{C.forEach(d=>{d instanceof HTMLElement&&d.classList.add("in")})},10);const j={element:r,pathname:a,isCached:N,state:s};K.dispatchEvent(document,"morphBeforeElementOut",{detail:j});const at=setTimeout(()=>{rt.forEach(d=>d.remove()),C.forEach(d=>{d instanceof HTMLElement&&(d.classList.remove("new","in"),d.classList.add("current"))}),K.dispatchEvent(document,"morphAfterElementOut",{detail:j}),c(this,v,e(this,v).filter(d=>d!==at))},(parseFloat(nt)||0)*1e3+10);e(this,v).push(at)}else r.innerHTML="",r.append(...C)}),this.findLinks(),document.documentElement.setAttribute("data-current-pathname",a),document.documentElement.setAttribute("data-current-leaf",b),($=this.postprocessor)==null||$.call(this,{pathname:a,isCached:N,state:s}),K.dispatchEvent(document,"morphAfterNavigation",{detail:{pathname:a,isCached:N,state:s}}),dt.loading.complete("__morph")}catch(F){console.error(F)}c(this,P,void 0)})}addLink(t){e(this,E).push(new lt(t,this))}addLinks(t){t.forEach(i=>{this.addLink(i)})}removeLink(t){c(this,E,e(this,E).filter(i=>i.element===t?(i.destroy(),!1):!0))}findLinks(){const t=[...document.documentElement.querySelectorAll("a")].filter(i=>{var s;return((s=i.getAttribute("href"))==null?void 0:s.startsWith("/"))&&!i.hasAttribute("download")&&!i.hasAttribute("data-morph-skip")});e(this,E).forEach(i=>i.destroy()),c(this,E,t.map(i=>new lt(i,this)))}}I=new WeakMap,O=new WeakMap,R=new WeakMap,S=new WeakMap,E=new WeakMap,Y=new WeakMap,M=new WeakMap,P=new WeakMap,L=new WeakMap,_=new WeakMap,B=new WeakMap,v=new WeakMap,m=new WeakSet,U=function(t){return z(this,null,function*(){const i=e(this,M).get(t);if(i)return i;const l=yield(yield fetch(t)).text(),u=e(this,Y).parseFromString(l,"text/html");return e(this,R)&&e(this,M).set(t,u),u})},X=function(t){const i=[...t.querySelectorAll("[data-morph]")];return i.length?i:[t]},ut=function(t,i){return t.filter(s=>i.find(l=>l.outerHTML===s.outerHTML))},Z=function(t,i){return t.filter(s=>!i.find(l=>l.outerHTML===s.outerHTML))},G=new WeakMap;exports.Morph=Lt;
+"use strict";var ot=(n,t)=>(t=Symbol[n])?t:Symbol.for("Symbol."+n),ht=n=>{throw TypeError(n)};var Q=(n,t,i)=>t.has(n)||ht("Cannot "+i);var e=(n,t,i)=>(Q(n,t,"read from private field"),i?i.call(n):t.get(n)),o=(n,t,i)=>t.has(n)?ht("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(n):t.set(n,i),c=(n,t,i,s)=>(Q(n,t,"write to private field"),s?s.call(n,i):t.set(n,i),i),A=(n,t,i)=>(Q(n,t,"access private method"),i);var z=(n,t,i)=>new Promise((s,l)=>{var u=f=>{try{g(i.next(f))}catch(b){l(b)}},a=f=>{try{g(i.throw(f))}catch(b){l(b)}},g=f=>f.done?s(f.value):Promise.resolve(f.value).then(u,a);g((i=i.apply(n,t)).next())});var ct=(n,t,i)=>(t=n[ot("asyncIterator")])?t.call(n):(n=n[ot("iterator")](),t={},i=(s,l)=>(l=n[s])&&(t[s]=u=>new Promise((a,g,f)=>(u=l.call(n,u),f=u.done,Promise.resolve(u.value).then(b=>a({value:b,done:f}),g)))),i("next"),i("return"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const pt=require("../browser-CpzFX2xg.cjs"),K=require("../events-KVanG9sR.cjs"),V=require("../url-BiHPIsKq.cjs"),dt=require("../loading/index.cjs");var T,h,p,q,x,H,D,k;class lt{constructor(t,i){o(this,T);o(this,h);o(this,p);o(this,q);o(this,x);o(this,H);o(this,D,t=>{t.preventDefault(),e(this,T).links.forEach(i=>{var s;e(this,p)===e(i,p)||(s=e(i,H))!=null&&s.includes(e(this,p))?e(i,h).classList.add("clicked"):e(i,h).classList.remove("clicked")}),e(this,T).navigate(e(this,p),{historyAction:e(this,q),state:e(this,x)})});o(this,k,()=>{e(this,T).prefetch(e(this,p)),e(this,h).removeEventListener("pointerenter",e(this,k))});var u,a;c(this,T,i),c(this,h,t),c(this,p,e(this,h).getAttribute("href")||"/"),c(this,q,e(this,h).getAttribute("data-history-action")||"push"),c(this,x,e(this,h).getAttribute("data-state")||void 0),e(this,h).addEventListener("click",e(this,D));const s=i.normalizePath(e(this,p)),l=i.normalizePath(location.pathname);c(this,H,(u=e(this,h).getAttribute("data-match-paths"))==null?void 0:u.split(",").map(g=>i.normalizePath(g.trim()).pathname)),e(this,h).hasAttribute("data-include")?l.pathname.includes(s.pathname)&&e(this,h).classList.add("current"):s.pathname===l.pathname||(a=e(this,H))!=null&&a.includes(l.pathname)?(e(this,h).classList.add("current"),e(this,h).classList.add("clicked")):e(this,h).classList.remove("clicked"),e(this,h).hasAttribute("data-prefetch")&&e(this,h).addEventListener("pointerenter",e(this,k))}get element(){return e(this,h)}destroy(){e(this,h).removeEventListener("click",e(this,D)),e(this,h).removeEventListener("pointerenter",e(this,k)),e(this,h).classList.remove("current")}}T=new WeakMap,h=new WeakMap,p=new WeakMap,q=new WeakMap,x=new WeakMap,H=new WeakMap,D=new WeakMap,k=new WeakMap;var I,O,R,S,E,Y,M,P,L,_,B,v,m,U,X,ut,Z,G;class Lt{constructor(t){o(this,m);o(this,I,null);o(this,O,null);o(this,R,null);o(this,S,null);o(this,E,[]);o(this,Y,new DOMParser);o(this,M,new Map);o(this,P);o(this,L,null);o(this,_);o(this,B);o(this,v,[]);o(this,G,t=>{t.state&&this.navigate(t.state,{historyAction:"none"})});if(pt.isBrowser){c(this,I,V.normalizeBase(t==null?void 0:t.base)),c(this,O,(t==null?void 0:t.waitForHeadToLoad)!==!1),c(this,R,(t==null?void 0:t.cachePages)!==!1),c(this,S,A(this,m,X).call(this,document.body));const i=this.normalizePath(location.pathname);c(this,L,i.pathname),document.documentElement.setAttribute("data-current-pathname",e(this,L)),document.documentElement.setAttribute("data-current-leaf",i.leaf),this.findLinks(),addEventListener("popstate",e(this,G)),V.changeHistory("replace",e(this,L),i.parameters,i.hash),e(this,S).map(s=>[...s.children]).flat().forEach(s=>{s instanceof HTMLElement&&s.classList.add("current")})}}get currentPathname(){return e(this,L)}get previousPathname(){return e(this,_)}get currentState(){return e(this,B)}get links(){return e(this,E)}normalizePath(t){return V.splitPath(t,e(this,I))}prefetch(t){return z(this,null,function*(){const i=this.normalizePath(t);return A(this,m,U).call(this,i.pathname)})}navigate(l){return z(this,arguments,function*(t,{historyAction:i="push",state:s}={}){var $;if(e(this,v).length)return;const u=this.normalizePath(t);let{pathname:a,hash:g,parameters:f,leaf:b}=u;if(e(this,P)===a||e(this,L)===a)return;c(this,B,s),c(this,P,a);const N=e(this,M).has(a);try{dt.loading.add("__morph");let F=!0;if(K.dispatchEvent(document,"morphBeforeNavigation",{detail:{pathname:a,isCached:N,state:s}}),this.preprocessor)try{yield new Promise((r,w)=>{var y;(y=this.preprocessor)==null||y.call(this,{pathname:a,resolve:r,reject:w,isCached:N,state:s})})}catch(r){r?console.error(r):console.log("Route change canceled"),F=!1}if(!F||e(this,P)!==a)return;const tt=e(this,M).get(a)||(yield A(this,m,U).call(this,a));if(e(this,P)!==a)return;const et=Array.from(document.head.children),it=Array.from(tt.head.cloneNode(!0).children),st=A(this,m,ut).call(this,et,it),mt=A(this,m,Z).call(this,et,st),W=A(this,m,Z).call(this,it,st);W.forEach((r,w)=>{if(r.tagName==="SCRIPT"&&r.getAttribute("src")){const y=document.createElement("script");y.type="module",y.src=r.getAttribute("src"),W[w]=y}}),W.forEach(r=>{document.head.appendChild(r)});const J=W.filter(r=>(r.tagName==="STYLE"||r.tagName==="SCRIPT"||r.tagName==="LINK")&&r.getAttribute("rel")!=="canonical");e(this,O)&&J.length&&(yield new Promise(r=>z(this,null,function*(){let w=0;try{for(var y=ct(J),nt,C,rt;nt=!(C=yield y.next()).done;nt=!1){const j=C.value;j.onload=()=>{w++,w===J.length&&r()}}}catch(C){rt=[C]}finally{try{nt&&(C=y.return)&&(yield C.call(y))}finally{if(rt)throw rt[0]}}}))),mt.forEach(r=>{r.hasAttribute("data-permanent")||r.remove()}),c(this,_,e(this,L)),c(this,L,a),V.changeHistory(i,a,f,g);const ft=A(this,m,X).call(this,tt.body.cloneNode(!0));e(this,v).forEach(r=>clearTimeout(r)),c(this,v,[]),e(this,S).forEach((r,w)=>{const y=ft[w],nt=getComputedStyle(r).getPropertyValue("--morph-duration"),C=[...y.childNodes];if(nt){const rt=[...r.childNodes];rt.forEach(d=>{d instanceof HTMLElement&&d.classList.add("old")}),C.forEach(d=>{d instanceof HTMLElement&&d.classList.add("new")}),r.append(...C),setTimeout(()=>{C.forEach(d=>{d instanceof HTMLElement&&d.classList.add("in")})},10);const j={element:r,pathname:a,isCached:N,state:s};K.dispatchEvent(document,"morphBeforeElementOut",{detail:j});const at=setTimeout(()=>{rt.forEach(d=>d.remove()),C.forEach(d=>{d instanceof HTMLElement&&(d.classList.remove("new","in"),d.classList.add("current"))}),K.dispatchEvent(document,"morphAfterElementOut",{detail:j}),c(this,v,e(this,v).filter(d=>d!==at))},(parseFloat(nt)||0)*1e3+10);e(this,v).push(at)}else r.innerHTML="",r.append(...C)}),this.findLinks(),document.documentElement.setAttribute("data-current-pathname",a),document.documentElement.setAttribute("data-current-leaf",b),($=this.postprocessor)==null||$.call(this,{pathname:a,isCached:N,state:s}),K.dispatchEvent(document,"morphAfterNavigation",{detail:{pathname:a,isCached:N,state:s}}),dt.loading.complete("__morph")}catch(F){console.error(F)}c(this,P,void 0)})}addLink(t){e(this,E).push(new lt(t,this))}addLinks(t){t.forEach(i=>{this.addLink(i)})}removeLink(t){c(this,E,e(this,E).filter(i=>i.element===t?(i.destroy(),!1):!0))}findLinks(){const t=[...document.documentElement.querySelectorAll("a")].filter(i=>{var s;return((s=i.getAttribute("href"))==null?void 0:s.startsWith("/"))&&!i.hasAttribute("download")&&!i.hasAttribute("data-morph-skip")&&!i.closest("[data-morph-skip]")});e(this,E).forEach(i=>i.destroy()),c(this,E,t.map(i=>new lt(i,this)))}}I=new WeakMap,O=new WeakMap,R=new WeakMap,S=new WeakMap,E=new WeakMap,Y=new WeakMap,M=new WeakMap,P=new WeakMap,L=new WeakMap,_=new WeakMap,B=new WeakMap,v=new WeakMap,m=new WeakSet,U=function(t){return z(this,null,function*(){const i=e(this,M).get(t);if(i)return i;const l=yield(yield fetch(t)).text(),u=e(this,Y).parseFromString(l,"text/html");return e(this,R)&&e(this,M).set(t,u),u})},X=function(t){const i=[...t.querySelectorAll("[data-morph]")];return i.length?i:[t]},ut=function(t,i){return t.filter(s=>i.find(l=>l.outerHTML===s.outerHTML))},Z=function(t,i){return t.filter(s=>!i.find(l=>l.outerHTML===s.outerHTML))},G=new WeakMap;exports.Morph=Lt;

package/lib/morph/index.js

@@ -1,66 +1,66 @@
 var rt = (n, t) => (t = Symbol[n]) ? t : Symbol.for("Symbol." + n), ot = (n) => {
   throw TypeError(n);
 };
-var J = (n, t, i) => t.has(n) || ot("Cannot " + i);
-var e = (n, t, i) => (J(n, t, "read from private field"), i ? i.call(n) : t.get(n)), o = (n, t, i) => t.has(n) ? ot("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, i), c = (n, t, i, s) => (J(n, t, "write to private field"), s ? s.call(n, i) : t.set(n, i), i), P = (n, t, i) => (J(n, t, "access private method"), i);
-var z = (n, t, i) => new Promise((s, l) => {
+var J = (n, t, s) => t.has(n) || ot("Cannot " + s);
+var e = (n, t, s) => (J(n, t, "read from private field"), s ? s.call(n) : t.get(n)), o = (n, t, s) => t.has(n) ? ot("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, s), c = (n, t, s, i) => (J(n, t, "write to private field"), i ? i.call(n, s) : t.set(n, s), s), P = (n, t, s) => (J(n, t, "access private method"), s);
+var z = (n, t, s) => new Promise((i, l) => {
   var u = (f) => {
     try {
-      E(i.next(f));
+      E(s.next(f));
     } catch (b) {
       l(b);
     }
   }, r = (f) => {
     try {
-      E(i.throw(f));
+      E(s.throw(f));
     } catch (b) {
       l(b);
     }
-  }, E = (f) => f.done ? s(f.value) : Promise.resolve(f.value).then(u, r);
-  E((i = i.apply(n, t)).next());
+  }, E = (f) => f.done ? i(f.value) : Promise.resolve(f.value).then(u, r);
+  E((s = s.apply(n, t)).next());
 });
-var ht = (n, t, i) => (t = n[rt("asyncIterator")]) ? t.call(n) : (n = n[rt("iterator")](), t = {}, i = (s, l) => (l = n[s]) && (t[s] = (u) => new Promise((r, E, f) => (u = l.call(n, u), f = u.done, Promise.resolve(u.value).then((b) => r({ value: b, done: f }), E)))), i("next"), i("return"), t);
+var ht = (n, t, s) => (t = n[rt("asyncIterator")]) ? t.call(n) : (n = n[rt("iterator")](), t = {}, s = (i, l) => (l = n[i]) && (t[i] = (u) => new Promise((r, E, f) => (u = l.call(n, u), f = u.done, Promise.resolve(u.value).then((b) => r({ value: b, done: f }), E)))), s("next"), s("return"), t);
 import { i as pt } from "../browser-0zX67oeU.js";
 import { d as V } from "../events-CsVF98U6.js";
 import { n as Lt, c as ct, s as Et } from "../url-B5eH5z6S.js";
 import { loading as dt } from "../loading/index.js";
-var T, h, p, x, D, M, I, k;
+var T, h, p, x, D, H, I, M;
 class lt {
-  constructor(t, i) {
+  constructor(t, s) {
     o(this, T);
     o(this, h);
     o(this, p);
     o(this, x);
     o(this, D);
-    o(this, M);
+    o(this, H);
     o(this, I, (t) => {
-      t.preventDefault(), e(this, T).links.forEach((i) => {
-        var s;
-        e(this, p) === e(i, p) || (s = e(i, M)) != null && s.includes(e(this, p)) ? e(i, h).classList.add("clicked") : e(i, h).classList.remove("clicked");
+      t.preventDefault(), e(this, T).links.forEach((s) => {
+        var i;
+        e(this, p) === e(s, p) || (i = e(s, H)) != null && i.includes(e(this, p)) ? e(s, h).classList.add("clicked") : e(s, h).classList.remove("clicked");
       }), e(this, T).navigate(e(this, p), {
         historyAction: e(this, x),
         state: e(this, D)
       });
     });
-    o(this, k, () => {
-      e(this, T).prefetch(e(this, p)), e(this, h).removeEventListener("pointerenter", e(this, k));
+    o(this, M, () => {
+      e(this, T).prefetch(e(this, p)), e(this, h).removeEventListener("pointerenter", e(this, M));
     });
     var u, r;
-    c(this, T, i), c(this, h, t), c(this, p, e(this, h).getAttribute("href") || "/"), c(this, x, e(this, h).getAttribute(
+    c(this, T, s), c(this, h, t), c(this, p, e(this, h).getAttribute("href") || "/"), c(this, x, e(this, h).getAttribute(
       "data-history-action"
     ) || "push"), c(this, D, e(this, h).getAttribute("data-state") || void 0), e(this, h).addEventListener("click", e(this, I));
-    const s = i.normalizePath(e(this, p)), l = i.normalizePath(location.pathname);
-    c(this, M, (u = e(this, h).getAttribute("data-match-paths")) == null ? void 0 : u.split(",").map((E) => i.normalizePath(E.trim()).pathname)), e(this, h).hasAttribute("data-include") ? l.pathname.includes(s.pathname) && e(this, h).classList.add("current") : s.pathname === l.pathname || (r = e(this, M)) != null && r.includes(l.pathname) ? (e(this, h).classList.add("current"), e(this, h).classList.add("clicked")) : e(this, h).classList.remove("clicked"), e(this, h).hasAttribute("data-prefetch") && e(this, h).addEventListener("pointerenter", e(this, k));
+    const i = s.normalizePath(e(this, p)), l = s.normalizePath(location.pathname);
+    c(this, H, (u = e(this, h).getAttribute("data-match-paths")) == null ? void 0 : u.split(",").map((E) => s.normalizePath(E.trim()).pathname)), e(this, h).hasAttribute("data-include") ? l.pathname.includes(i.pathname) && e(this, h).classList.add("current") : i.pathname === l.pathname || (r = e(this, H)) != null && r.includes(l.pathname) ? (e(this, h).classList.add("current"), e(this, h).classList.add("clicked")) : e(this, h).classList.remove("clicked"), e(this, h).hasAttribute("data-prefetch") && e(this, h).addEventListener("pointerenter", e(this, M));
   }
   get element() {
     return e(this, h);
   }
   destroy() {
-    e(this, h).removeEventListener("click", e(this, I)), e(this, h).removeEventListener("pointerenter", e(this, k)), e(this, h).classList.remove("current");
+    e(this, h).removeEventListener("click", e(this, I)), e(this, h).removeEventListener("pointerenter", e(this, M)), e(this, h).classList.remove("current");
   }
 }
-T = new WeakMap(), h = new WeakMap(), p = new WeakMap(), x = new WeakMap(), D = new WeakMap(), M = new WeakMap(), I = new WeakMap(), k = new WeakMap();
-var R, B, F, N, g, Y, H, y, L, O, _, v, m, Q, U, ut, X, j;
+T = new WeakMap(), h = new WeakMap(), p = new WeakMap(), x = new WeakMap(), D = new WeakMap(), H = new WeakMap(), I = new WeakMap(), M = new WeakMap();
+var R, B, F, N, g, Y, k, y, L, O, _, v, m, Q, U, ut, X, j;
 class yt {
   constructor(t) {
     o(this, m);
@@ -70,7 +70,7 @@ class yt {
     o(this, N, null);
     o(this, g, []);
     o(this, Y, new DOMParser());
-    o(this, H, /* @__PURE__ */ new Map());
+    o(this, k, /* @__PURE__ */ new Map());
     o(this, y);
     o(this, L, null);
     o(this, O);
@@ -81,20 +81,20 @@ class yt {
     });
     if (pt) {
       c(this, R, Lt(t == null ? void 0 : t.base)), c(this, B, (t == null ? void 0 : t.waitForHeadToLoad) !== !1), c(this, F, (t == null ? void 0 : t.cachePages) !== !1), c(this, N, P(this, m, U).call(this, document.body));
-      const i = this.normalizePath(location.pathname);
-      c(this, L, i.pathname), document.documentElement.setAttribute(
+      const s = this.normalizePath(location.pathname);
+      c(this, L, s.pathname), document.documentElement.setAttribute(
         "data-current-pathname",
         e(this, L)
       ), document.documentElement.setAttribute(
         "data-current-leaf",
-        i.leaf
+        s.leaf
       ), this.findLinks(), addEventListener("popstate", e(this, j)), ct(
         "replace",
         e(this, L),
-        i.parameters,
-        i.hash
-      ), e(this, N).map((s) => [...s.children]).flat().forEach((s) => {
-        s instanceof HTMLElement && s.classList.add("current");
+        s.parameters,
+        s.hash
+      ), e(this, N).map((i) => [...i.children]).flat().forEach((i) => {
+        i instanceof HTMLElement && i.classList.add("current");
       });
     }
   }
@@ -115,12 +115,12 @@ class yt {
   }
   prefetch(t) {
     return z(this, null, function* () {
-      const i = this.normalizePath(t);
-      return P(this, m, Q).call(this, i.pathname);
+      const s = this.normalizePath(t);
+      return P(this, m, Q).call(this, s.pathname);
     });
   }
   navigate(l) {
-    return z(this, arguments, function* (t, { historyAction: i = "push", state: s } = {}) {
+    return z(this, arguments, function* (t, { historyAction: s = "push", state: i } = {}) {
       var Z;
       if (e(this, v).length)
         return;
@@ -128,8 +128,8 @@ class yt {
       let { pathname: r, hash: E, parameters: f, leaf: b } = u;
       if (e(this, y) === r || e(this, L) === r)
         return;
-      c(this, _, s), c(this, y, r);
-      const C = e(this, H).has(r);
+      c(this, _, i), c(this, y, r);
+      const C = e(this, k).has(r);
       try {
         dt.add("__morph");
         let q = !0;
@@ -137,25 +137,25 @@ class yt {
           detail: {
             pathname: r,
             isCached: C,
-            state: s
+            state: i
           }
         }), this.preprocessor)
           try {
             yield new Promise((a, A) => {
               var w;
-              (w = this.preprocessor) == null || w.call(this, { pathname: r, resolve: a, reject: A, isCached: C, state: s });
+              (w = this.preprocessor) == null || w.call(this, { pathname: r, resolve: a, reject: A, isCached: C, state: i });
             });
           } catch (a) {
             a ? console.error(a) : console.log("Route change canceled"), q = !1;
           }
         if (!q || e(this, y) !== r)
           return;
-        const $ = e(this, H).get(r) || (yield P(this, m, Q).call(this, r));
+        const $ = e(this, k).get(r) || (yield P(this, m, Q).call(this, r));
         if (e(this, y) !== r)
           return;
         const tt = Array.from(document.head.children), et = Array.from(
           $.head.cloneNode(!0).children
-        ), it = P(this, m, ut).call(this, tt, et), mt = P(this, m, X).call(this, tt, it), W = P(this, m, X).call(this, et, it);
+        ), st = P(this, m, ut).call(this, tt, et), mt = P(this, m, X).call(this, tt, st), W = P(this, m, X).call(this, et, st);
         W.forEach((a, A) => {
           if (a.tagName === "SCRIPT" && a.getAttribute("src")) {
             const w = document.createElement("script");
@@ -170,7 +170,7 @@ class yt {
         e(this, B) && G.length && (yield new Promise((a) => z(this, null, function* () {
           let A = 0;
           try {
-            for (var w = ht(G), st, S, nt; st = !(S = yield w.next()).done; st = !1) {
+            for (var w = ht(G), it, S, nt; it = !(S = yield w.next()).done; it = !1) {
               const K = S.value;
               K.onload = () => {
                 A++, A === G.length && a();
@@ -180,7 +180,7 @@ class yt {
             nt = [S];
           } finally {
             try {
-              st && (S = w.return) && (yield S.call(w));
+              it && (S = w.return) && (yield S.call(w));
             } finally {
               if (nt)
                 throw nt[0];
@@ -188,11 +188,11 @@ class yt {
           }
         }))), mt.forEach((a) => {
           a.hasAttribute("data-permanent") || a.remove();
-        }), c(this, O, e(this, L)), c(this, L, r), ct(i, r, f, E);
+        }), c(this, O, e(this, L)), c(this, L, r), ct(s, r, f, E);
         const ft = P(this, m, U).call(this, $.body.cloneNode(!0));
         e(this, v).forEach((a) => clearTimeout(a)), c(this, v, []), e(this, N).forEach((a, A) => {
-          const w = ft[A], st = getComputedStyle(a).getPropertyValue("--morph-duration"), S = [...w.childNodes];
-          if (st) {
+          const w = ft[A], it = getComputedStyle(a).getPropertyValue("--morph-duration"), S = [...w.childNodes];
+          if (it) {
             const nt = [...a.childNodes];
             nt.forEach((d) => {
               d instanceof HTMLElement && d.classList.add("old");
@@ -207,7 +207,7 @@ class yt {
               element: a,
               pathname: r,
               isCached: C,
-              state: s
+              state: i
             };
             V(document, "morphBeforeElementOut", {
               detail: K
@@ -218,15 +218,15 @@ class yt {
               }), V(document, "morphAfterElementOut", {
                 detail: K
               }), c(this, v, e(this, v).filter((d) => d !== at));
-            }, (parseFloat(st) || 0) * 1e3 + 10);
+            }, (parseFloat(it) || 0) * 1e3 + 10);
             e(this, v).push(at);
           } else
             a.innerHTML = "", a.append(...S);
-        }), this.findLinks(), document.documentElement.setAttribute("data-current-pathname", r), document.documentElement.setAttribute("data-current-leaf", b), (Z = this.postprocessor) == null || Z.call(this, { pathname: r, isCached: C, state: s }), V(document, "morphAfterNavigation", {
+        }), this.findLinks(), document.documentElement.setAttribute("data-current-pathname", r), document.documentElement.setAttribute("data-current-leaf", b), (Z = this.postprocessor) == null || Z.call(this, { pathname: r, isCached: C, state: i }), V(document, "morphAfterNavigation", {
           detail: {
             pathname: r,
             isCached: C,
-            state: s
+            state: i
           }
         }), dt.complete("__morph");
       } catch (q) {
@@ -239,46 +239,46 @@ class yt {
     e(this, g).push(new lt(t, this));
   }
   addLinks(t) {
-    t.forEach((i) => {
-      this.addLink(i);
+    t.forEach((s) => {
+      this.addLink(s);
     });
   }
   removeLink(t) {
-    c(this, g, e(this, g).filter((i) => i.element === t ? (i.destroy(), !1) : !0));
+    c(this, g, e(this, g).filter((s) => s.element === t ? (s.destroy(), !1) : !0));
   }
   findLinks() {
     const t = [
       ...document.documentElement.querySelectorAll("a")
     ].filter(
-      (i) => {
-        var s;
-        return ((s = i.getAttribute("href")) == null ? void 0 : s.startsWith("/")) && !i.hasAttribute("download") && !i.hasAttribute("data-morph-skip");
+      (s) => {
+        var i;
+        return ((i = s.getAttribute("href")) == null ? void 0 : i.startsWith("/")) && !s.hasAttribute("download") && !s.hasAttribute("data-morph-skip") && !s.closest("[data-morph-skip]");
       }
     );
-    e(this, g).forEach((i) => i.destroy()), c(this, g, t.map((i) => new lt(i, this)));
+    e(this, g).forEach((s) => s.destroy()), c(this, g, t.map((s) => new lt(s, this)));
   }
 }
-R = new WeakMap(), B = new WeakMap(), F = new WeakMap(), N = new WeakMap(), g = new WeakMap(), Y = new WeakMap(), H = new WeakMap(), y = new WeakMap(), L = new WeakMap(), O = new WeakMap(), _ = new WeakMap(), v = new WeakMap(), m = new WeakSet(), Q = function(t) {
+R = new WeakMap(), B = new WeakMap(), F = new WeakMap(), N = new WeakMap(), g = new WeakMap(), Y = new WeakMap(), k = new WeakMap(), y = new WeakMap(), L = new WeakMap(), O = new WeakMap(), _ = new WeakMap(), v = new WeakMap(), m = new WeakSet(), Q = function(t) {
   return z(this, null, function* () {
-    const i = e(this, H).get(t);
-    if (i)
-      return i;
+    const s = e(this, k).get(t);
+    if (s)
+      return s;
     const l = yield (yield fetch(t)).text(), u = e(this, Y).parseFromString(l, "text/html");
-    return e(this, F) && e(this, H).set(t, u), u;
+    return e(this, F) && e(this, k).set(t, u), u;
   });
 }, U = function(t) {
-  const i = [...t.querySelectorAll("[data-morph]")];
-  return i.length ? i : [t];
-}, ut = function(t, i) {
+  const s = [...t.querySelectorAll("[data-morph]")];
+  return s.length ? s : [t];
+}, ut = function(t, s) {
   return t.filter(
-    (s) => i.find(
-      (l) => l.outerHTML === s.outerHTML
+    (i) => s.find(
+      (l) => l.outerHTML === i.outerHTML
     )
   );
-}, X = function(t, i) {
+}, X = function(t, s) {
   return t.filter(
-    (s) => !i.find(
-      (l) => l.outerHTML === s.outerHTML
+    (i) => !s.find(
+      (l) => l.outerHTML === i.outerHTML
     )
   );
 }, j = new WeakMap();

package/package.json

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