aptechka 0.5.44 → 0.7.0

package/lib/router/Router.d.ts

@@ -1,7 +1,9 @@
+import { splitPath, ChangeHistoryAction } from '../utils';
 import { Route, RouteModule } from './Route';
+import { Link } from './Link';
 
 export interface RouterPreprocessorEntry {
-    pathname: string;
+    path: ReturnType<typeof splitPath>;
     resolve: () => void;
     reject: () => void;
 }
@@ -14,7 +16,6 @@ export interface RouterAfterNavigationEntry {
     pathname: string;
 }
 export type RouterAfterNavigationCallback = (entry: RouterAfterNavigationEntry) => void;
-export type RouterHistoryAction = 'push' | 'replace' | 'none';
 export interface RouterParameters {
     rootElement?: HTMLElement;
     base?: string;
@@ -28,7 +29,14 @@ export declare class Router {
     get currentPathname(): string;
     get candidatePathname(): string | undefined;
     get routes(): Route[];
+    get links(): Link[];
     navigationEvent(callback: RouterAfterNavigationCallback): () => void;
     defineRoute(pattern: string, module: RouteModule): void;
-    navigate(pathname: string, action?: RouterHistoryAction): Promise<void>;
+    navigate(path: string, action?: ChangeHistoryAction): Promise<void>;
+    normalizePath(path: string): {
+        leaf: string;
+        pathname: string;
+        parameters: string;
+        hash: string;
+    };
 }

package/lib/router/index.cjs

@@ -1 +1 @@
-"use strict";var X=(n,t)=>(t=Symbol[n])?t:Symbol.for("Symbol."+n);var z=(n,t,s)=>{if(!t.has(n))throw TypeError("Cannot "+s)};var e=(n,t,s)=>(z(n,t,"read from private field"),s?s.call(n):t.get(n)),r=(n,t,s)=>{if(t.has(n))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(n):t.set(n,s)},o=(n,t,s,i)=>(z(n,t,"write to private field"),i?i.call(n,s):t.set(n,s),s);var F=(n,t,s)=>(z(n,t,"access private method"),s);var B=(n,t,s)=>new Promise((i,u)=>{var h=f=>{try{d(s.next(f))}catch(T){u(T)}},a=f=>{try{d(s.throw(f))}catch(T){u(T)}},d=f=>f.done?i(f.value):Promise.resolve(f.value).then(h,a);d((s=s.apply(n,t)).next())});var G=(n,t,s)=>(t=n[X("asyncIterator")])?t.call(n):(n=n[X("iterator")](),t={},s=(i,u)=>(u=n[i])&&(t[i]=h=>new Promise((a,d,f)=>(h=u.call(n,h),f=h.done,Promise.resolve(h.value).then(T=>a({value:T,done:f}),d)))),s("next"),s("return"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const tt=require("urlpattern-polyfill"),et=require("../notifier/index.cjs"),Z=require("../browser-CpzFX2xg.cjs"),st=require("../function-MthRj-GJ.cjs"),it=require("../object-CCiXnER2.cjs");var b,O,R,m,l,v,S,p,P,y,I,_;class nt{constructor(t,s){r(this,I);r(this,b,void 0);r(this,O,void 0);r(this,R,void 0);r(this,m,void 0);r(this,l,void 0);r(this,v,void 0);r(this,S,void 0);r(this,p,null);r(this,P,[]);r(this,y,[]);o(this,b,t),o(this,O,s),o(this,R,new URLPattern({pathname:e(this,b)})),o(this,m,null),o(this,l,null),o(this,v,!1),o(this,S,null),Z.isBrowser&&o(this,p,new MutationObserver(i=>{i[0].addedNodes.forEach(h=>{e(this,m)?e(this,y).push(h):e(this,P).push(h)})}))}get pattern(){return e(this,b)}get urlPattern(){return e(this,R)}get isActive(){return e(this,v)}get element(){return e(this,l)}get nest(){return e(this,S)}testPathname(t){return this.urlPattern.test({pathname:t})}render(t,s){return B(this,null,function*(){var i,u;if(e(this,p).observe(document.head,{childList:!0,subtree:!0}),e(this,m))e(this,P).forEach(h=>{document.head.appendChild(h)});else{const h=yield e(this,O).call(this);if(o(this,y,[...e(this,P)]),typeof h.default=="function"&&(o(this,m,h.default),it.isESClass(h.default))){const a="e-"+((i=e(this,m))==null?void 0:i.name.toLowerCase());customElements.get(a)||customElements.define(a,h.default)}}if(yield F(this,I,_).call(this),e(this,m)){const h=e(this,R).exec({pathname:s}),a=(h==null?void 0:h.pathname.groups)||{},d=Object.fromEntries(new URLSearchParams(location.search)),f={pathnameParams:a,searchParams:d};o(this,l,new(e(this,m))(f)),t.appendChild(e(this,l)),o(this,S,e(this,l).querySelector("[data-nest]")||((u=e(this,l).shadowRoot)==null?void 0:u.querySelector("[data-nest]"))||e(this,l).shadowRoot||e(this,l)),o(this,v,!0)}e(this,p).disconnect()})}close(){var t;e(this,p).disconnect(),(t=e(this,l))==null||t.remove(),o(this,v,!1),e(this,y).forEach(s=>document.head.removeChild(s)),o(this,y,[])}getAnchorElements(){var s;let t=[];return e(this,l)&&(t=[...e(this,l).querySelectorAll("a")]),(s=e(this,l))!=null&&s.shadowRoot&&(t=[...t,...e(this,l).shadowRoot.querySelectorAll("a")]),t}}b=new WeakMap,O=new WeakMap,R=new WeakMap,m=new WeakMap,l=new WeakMap,v=new WeakMap,S=new WeakMap,p=new WeakMap,P=new WeakMap,y=new WeakMap,I=new WeakSet,_=function(){return B(this,null,function*(){const t=e(this,P).filter(a=>a instanceof HTMLElement?a.tagName==="STYLE"||a.tagName==="SCRIPT"||a.tagName==="LINK":!1);try{for(var s=G(t),i,u,h;i=!(u=yield s.next()).done;i=!1){const a=u.value;yield new Promise(d=>{a.onload=()=>{d()}})}}catch(u){h=[u]}finally{try{i&&(u=s.return)&&(yield u.call(s))}finally{if(h)throw h[0]}}})};var H,g,A,U,j;class rt{constructor(t,s){r(this,H,void 0);r(this,g,void 0);r(this,A,void 0);r(this,U,void 0);r(this,j,t=>{t.preventDefault(),e(this,H).navigate(e(this,A),e(this,U))});o(this,H,t),o(this,g,s),o(this,A,e(this,g).getAttribute("href")||"/"),o(this,U,e(this,g).getAttribute("data-history-action")||"push"),e(this,g).addEventListener("click",e(this,j)),location.pathname===e(this,A)&&e(this,g).classList.add("current")}destroy(){e(this,g).removeEventListener("click",e(this,j)),e(this,g).classList.remove("current")}}H=new WeakMap,g=new WeakMap,A=new WeakMap,U=new WeakMap,j=new WeakMap;globalThis.URLPattern=tt.URLPattern;var k,q,w,N,M,E,C,x,D,K,$,W;const Y=class Y{constructor(t){r(this,K);r(this,k,null);r(this,q,void 0);r(this,w,[]);r(this,N,null);r(this,M,[]);r(this,E,void 0);r(this,C,null);r(this,x,new et.Notifier);r(this,D,st.debounce(()=>{const t=s=>s.split("/").length;o(this,w,e(this,w).sort((s,i)=>t(s.pattern)-t(i.pattern))),this.navigate(location.pathname.replace(e(this,q),""))},0));r(this,W,t=>{t.state&&this.navigate(t.state,"none")});o(this,q,(t==null?void 0:t.base)||""),Y.active=this,Z.isBrowser&&(o(this,k,(t==null?void 0:t.rootElement)||document.body),addEventListener("popstate",e(this,W)))}get currentPathname(){return e(this,C)}get candidatePathname(){return e(this,E)}get routes(){return e(this,w)}navigationEvent(t){return e(this,x).subscribe(t)}defineRoute(t,s){const i=new nt(t,s);e(this,w).push(i),e(this,D).call(this)}navigate(t,s="push"){return B(this,null,function*(){var f,Q;if(e(this,E)===t||e(this,C)===t)return;Y.active=this,o(this,E,t);const i=e(this,w).filter(c=>c.isActive),u=e(this,w).filter(c=>!i.includes(c)&&c.testPathname(t)),h=i.filter(c=>!c.testPathname(t)),a=i.filter(c=>c.testPathname(t));let d=!0;if(this.preprocessor)try{yield new Promise((c,L)=>{var V;(V=this.preprocessor)==null||V.call(this,{pathname:t,resolve:c,reject:L})})}catch(c){c?console.error(c):console.log("Route change canceled"),d=!1}if(d&&e(this,E)===t){o(this,N,a[a.length-1]),h.forEach(L=>{L.close()}),o(this,C,t);try{for(var T=G(u),at,ct,lt;at=!(ct=yield T.next()).done;at=!1){const L=ct.value;yield L.render(((f=e(this,N))==null?void 0:f.nest)||e(this,k),t),o(this,N,L)}}catch(ct){lt=[ct]}finally{try{at&&(ct=T.return)&&(yield ct.call(T))}finally{if(lt)throw lt[0]}}const c=e(this,q)+t+location.search;s==="push"?history.pushState(c,"",c):s==="replace"&&history.replaceState(c,"",c),F(this,K,$).call(this),(Q=this.postprocessor)==null||Q.call(this,{pathname:t}),e(this,x).notify({pathname:t})}})}};k=new WeakMap,q=new WeakMap,w=new WeakMap,N=new WeakMap,M=new WeakMap,E=new WeakMap,C=new WeakMap,x=new WeakMap,D=new WeakMap,K=new WeakSet,$=function(){const t=e(this,w).filter(i=>i.isActive),s=Array.from(new Set([...e(this,k).querySelectorAll("a"),...t.map(i=>i.getAnchorElements()).flat()].filter(i=>{var u;return(u=i.getAttribute("href"))==null?void 0:u.startsWith("/")})));e(this,M).forEach(i=>{i.destroy()}),o(this,M,s.map(i=>new rt(this,i)))},W=new WeakMap;let J=Y;exports.Router=J;
+"use strict";var tt=(a,e)=>(e=Symbol[a])?e:Symbol.for("Symbol."+a);var Y=(a,e,s)=>{if(!e.has(a))throw TypeError("Cannot "+s)};var t=(a,e,s)=>(Y(a,e,"read from private field"),s?s.call(a):e.get(a)),h=(a,e,s)=>{if(e.has(a))throw TypeError("Cannot add the same private member more than once");e instanceof WeakSet?e.add(a):e.set(a,s)},n=(a,e,s,i)=>(Y(a,e,"write to private field"),i?i.call(a,s):e.set(a,s),s);var F=(a,e,s)=>(Y(a,e,"access private method"),s);var M=(a,e,s)=>new Promise((i,r)=>{var o=u=>{try{f(s.next(u))}catch(v){r(v)}},c=u=>{try{f(s.throw(u))}catch(v){r(v)}},f=u=>u.done?i(u.value):Promise.resolve(u.value).then(o,c);f((s=s.apply(a,e)).next())});var G=(a,e,s)=>(e=a[tt("asyncIterator")])?e.call(a):(a=a[tt("iterator")](),e={},s=(i,r)=>(r=a[i])&&(e[i]=o=>new Promise((c,f,u)=>(o=r.call(a,o),u=o.done,Promise.resolve(o.value).then(v=>c({value:v,done:u}),f)))),s("next"),s("return"),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const rt=require("urlpattern-polyfill"),ot=require("../notifier/index.cjs"),st=require("../browser-CpzFX2xg.cjs"),ct=require("../function-MthRj-GJ.cjs"),J=require("../url-C3dWnJQg.cjs"),lt=require("../instantiate-Db5gGSYG.cjs"),et=require("../object-CCiXnER2.cjs");var R,O,A,p,d,w,S,L,b,E,x,it;class ut{constructor(e,s){h(this,x);h(this,R,void 0);h(this,O,void 0);h(this,A,void 0);h(this,p,void 0);h(this,d,void 0);h(this,w,void 0);h(this,S,void 0);h(this,L,null);h(this,b,[]);h(this,E,[]);n(this,R,e),n(this,O,s),n(this,A,new URLPattern({pathname:t(this,R)})),n(this,p,null),n(this,d,null),n(this,w,!1),n(this,S,null),st.isBrowser&&n(this,L,new MutationObserver(i=>{i[0].addedNodes.forEach(o=>{t(this,p)?t(this,E).push(o):t(this,b).push(o)})}))}get pattern(){return t(this,R)}get urlPattern(){return t(this,A)}get isActive(){return t(this,w)}get element(){return t(this,d)}get nest(){return t(this,S)}testPathname(e){return this.urlPattern.test({pathname:e})}render(e,s){return M(this,null,function*(){var i,r;if(t(this,L).observe(document.head,{childList:!0,subtree:!0}),t(this,p))t(this,b).forEach(o=>{document.head.appendChild(o)});else{const o=yield t(this,O).call(this);if(n(this,E,[...t(this,b)]),typeof o.default=="function"&&(n(this,p,o.default),et.isESClass(o.default))){const c="e-"+((i=t(this,p))==null?void 0:i.name.toLowerCase());customElements.get(c)||customElements.define(c,o.default)}}if(yield F(this,x,it).call(this),t(this,p)){const o=t(this,A).exec({pathname:s}),c=(o==null?void 0:o.pathname.groups)||{},f=Object.fromEntries(new URLSearchParams(location.search)),u={pathnameParams:c,searchParams:f};et.isESClass(t(this,p))?n(this,d,new(t(this,p))(u)):n(this,d,lt.instantiate(t(this,p),{attributes:u})),e.appendChild(t(this,d)),n(this,S,t(this,d).querySelector("[data-nest]")||((r=t(this,d).shadowRoot)==null?void 0:r.querySelector("[data-nest]"))||t(this,d).shadowRoot||t(this,d)),n(this,w,!0)}t(this,L).disconnect()})}close(){var e;t(this,L).disconnect(),(e=t(this,d))==null||e.remove(),n(this,w,!1),t(this,E).forEach(s=>document.head.removeChild(s)),n(this,E,[])}getAnchorElements(){var s;let e=[];return t(this,d)&&(e=[...t(this,d).querySelectorAll("a")]),(s=t(this,d))!=null&&s.shadowRoot&&(e=[...e,...t(this,d).shadowRoot.querySelectorAll("a")]),e}}R=new WeakMap,O=new WeakMap,A=new WeakMap,p=new WeakMap,d=new WeakMap,w=new WeakMap,S=new WeakMap,L=new WeakMap,b=new WeakMap,E=new WeakMap,x=new WeakSet,it=function(){return M(this,null,function*(){const e=t(this,b).filter(c=>c instanceof HTMLElement?c.tagName==="STYLE"||c.tagName==="SCRIPT"||c.tagName==="LINK":!1);try{for(var s=G(e),i,r,o;i=!(r=yield s.next()).done;i=!1){const c=r.value;yield new Promise(f=>{c.onload=()=>{f()}})}}catch(r){o=[r]}finally{try{i&&(r=s.return)&&(yield r.call(s))}finally{if(o)throw o[0]}}})};var k,m,P,U,q,j;class dt{constructor(e,s){h(this,k,void 0);h(this,m,void 0);h(this,P,void 0);h(this,U,void 0);h(this,q,void 0);h(this,j,e=>{e.preventDefault(),t(this,k).links.forEach(s=>{var i;t(this,P)===t(s,P)||(i=t(s,q))!=null&&i.includes(t(this,P))?t(s,m).classList.add("clicked"):t(s,m).classList.remove("clicked")}),t(this,k).navigate(t(this,P),t(this,U))});var o,c;n(this,k,e),n(this,m,s),n(this,P,t(this,m).getAttribute("href")||"/"),n(this,U,t(this,m).getAttribute("data-history-action")||"push"),t(this,m).addEventListener("click",t(this,j));const i=e.normalizePath(t(this,P)),r=e.normalizePath(location.pathname);n(this,q,(o=t(this,m).getAttribute("data-match-paths"))==null?void 0:o.split(",").map(f=>e.normalizePath(f.trim()).pathname)),t(this,m).hasAttribute("data-include")?r.pathname.includes(i.pathname)&&t(this,m).classList.add("current"):i.pathname===r.pathname||(c=t(this,q))!=null&&c.includes(r.pathname)?(t(this,m).classList.add("current"),t(this,m).classList.add("clicked")):t(this,m).classList.remove("clicked")}destroy(){t(this,m).removeEventListener("click",t(this,j)),t(this,m).classList.remove("current")}}k=new WeakMap,m=new WeakMap,P=new WeakMap,U=new WeakMap,q=new WeakMap,j=new WeakMap;globalThis.URLPattern=rt.URLPattern;var C,N,g,z,T,y,H,B,I,D,nt,K;const W=class W{constructor(e){h(this,D);h(this,C,null);h(this,N,null);h(this,g,[]);h(this,z,null);h(this,T,[]);h(this,y,void 0);h(this,H,null);h(this,B,new ot.Notifier);h(this,I,ct.debounce(()=>{const e=s=>s.split("/").length;n(this,g,t(this,g).sort((s,i)=>e(s.pattern)-e(i.pattern))),this.navigate(location.pathname)},0));h(this,K,e=>{e.state&&this.navigate(e.state,"none")});st.isBrowser&&(e!=null&&e.base?n(this,N,J.normalizeBase(e.base)):n(this,N,"/"),W.active=this,n(this,C,(e==null?void 0:e.rootElement)||document.body),addEventListener("popstate",t(this,K)))}get currentPathname(){return t(this,H)}get candidatePathname(){return t(this,y)}get routes(){return t(this,g)}get links(){return t(this,T)}navigationEvent(e){return t(this,B).subscribe(e)}defineRoute(e,s){const i=new ut(e,s);t(this,g).push(i),t(this,I).call(this)}navigate(e,s="push"){return M(this,null,function*(){var Z,_;const i=this.normalizePath(e);let{pathname:r,hash:o,parameters:c,leaf:f}=i;if(t(this,y)===r||t(this,H)===r)return;W.active=this,n(this,y,r);const u=t(this,g).filter(l=>l.isActive),v=t(this,g).filter(l=>!u.includes(l)&&l.testPathname(f)),at=u.filter(l=>!l.testPathname(f)),V=u.filter(l=>l.testPathname(f));let X=!0;if(this.preprocessor)try{yield new Promise((l,ht)=>{var $;($=this.preprocessor)==null||$.call(this,{path:i,resolve:l,reject:ht})})}catch(l){l?console.error(l):console.log("Route change canceled"),X=!1}if(X&&t(this,y)===r){n(this,z,V[V.length-1]),at.forEach(l=>{l.close()}),n(this,H,r);try{for(var pt=G(v),gt,Pt,vt;gt=!(Pt=yield pt.next()).done;gt=!1){const l=Pt.value;yield l.render(((Z=t(this,z))==null?void 0:Z.nest)||t(this,C),r),n(this,z,l)}}catch(Pt){vt=[Pt]}finally{try{gt&&(Pt=pt.return)&&(yield Pt.call(pt))}finally{if(vt)throw vt[0]}}J.changeHistory(s,r,c,o),F(this,D,nt).call(this),(_=this.postprocessor)==null||_.call(this,{pathname:r}),t(this,B).notify({pathname:r})}})}normalizePath(e){return J.splitPath(e,t(this,N))}};C=new WeakMap,N=new WeakMap,g=new WeakMap,z=new WeakMap,T=new WeakMap,y=new WeakMap,H=new WeakMap,B=new WeakMap,I=new WeakMap,D=new WeakSet,nt=function(){const e=t(this,g).filter(i=>i.isActive),s=Array.from(new Set([...t(this,C).querySelectorAll("a"),...e.map(i=>i.getAnchorElements()).flat()].filter(i=>{var r;return(r=i.getAttribute("href"))==null?void 0:r.startsWith("/")})));t(this,T).forEach(i=>{i.destroy()}),n(this,T,s.map(i=>new dt(this,i)))},K=new WeakMap;let Q=W;exports.Router=Q;

package/lib/router/index.d.ts

@@ -1,2 +1,2 @@
-export { Router, type RouterPreprocessorEntry, type RouterPreprocessor, type RouterPostprocessor, type RouterAfterNavigationCallback, type RouterHistoryAction, type RouterParameters, } from './Router';
+export { Router, type RouterPreprocessorEntry, type RouterPreprocessor, type RouterPostprocessor, type RouterAfterNavigationCallback, type RouterParameters, } from './Router';
 export { type RouteModule, type RouteParameters, type RouteURLParams, } from './Route';

package/lib/router/index.js

@@ -1,256 +1,276 @@
-var Q = (n, t) => (t = Symbol[n]) ? t : Symbol.for("Symbol." + n);
-var $ = (n, t, s) => {
-  if (!t.has(n))
+var Z = (n, e) => (e = Symbol[n]) ? e : Symbol.for("Symbol." + n);
+var Y = (n, e, s) => {
+  if (!e.has(n))
     throw TypeError("Cannot " + s);
 };
-var e = (n, t, s) => ($(n, t, "read from private field"), s ? s.call(n) : t.get(n)), r = (n, t, s) => {
-  if (t.has(n))
+var t = (n, e, s) => (Y(n, e, "read from private field"), s ? s.call(n) : e.get(n)), h = (n, e, s) => {
+  if (e.has(n))
     throw TypeError("Cannot add the same private member more than once");
-  t instanceof WeakSet ? t.add(n) : t.set(n, s);
-}, o = (n, t, s, i) => ($(n, t, "write to private field"), i ? i.call(n, s) : t.set(n, s), s);
-var z = (n, t, s) => ($(n, t, "access private method"), s);
-var j = (n, t, s) => new Promise((i, u) => {
-  var h = (f) => {
+  e instanceof WeakSet ? e.add(n) : e.set(n, s);
+}, a = (n, e, s, i) => (Y(n, e, "write to private field"), i ? i.call(n, s) : e.set(n, s), s);
+var $ = (n, e, s) => (Y(n, e, "access private method"), s);
+var I = (n, e, s) => new Promise((i, r) => {
+  var o = (u) => {
     try {
-      d(s.next(f));
-    } catch (T) {
-      u(T);
+      f(s.next(u));
+    } catch (v) {
+      r(v);
     }
-  }, a = (f) => {
+  }, c = (u) => {
     try {
-      d(s.throw(f));
-    } catch (T) {
-      u(T);
+      f(s.throw(u));
+    } catch (v) {
+      r(v);
     }
-  }, d = (f) => f.done ? i(f.value) : Promise.resolve(f.value).then(h, a);
-  d((s = s.apply(n, t)).next());
+  }, f = (u) => u.done ? i(u.value) : Promise.resolve(u.value).then(o, c);
+  f((s = s.apply(n, e)).next());
 });
-var F = (n, t, s) => (t = n[Q("asyncIterator")]) ? t.call(n) : (n = n[Q("iterator")](), t = {}, s = (i, u) => (u = n[i]) && (t[i] = (h) => new Promise((a, d, f) => (h = u.call(n, h), f = h.done, Promise.resolve(h.value).then((T) => a({ value: T, done: f }), d)))), s("next"), s("return"), t);
-import { URLPattern as tt } from "urlpattern-polyfill";
-import { Notifier as et } from "../notifier/index.js";
-import { i as X } from "../browser-0zX67oeU.js";
-import { d as st } from "../function-C10DGppn.js";
-import { i as it } from "../object-D6MVWB4l.js";
-var R, U, b, m, l, w, A, v, P, E, B, Z;
-class nt {
-  constructor(t, s) {
-    r(this, B);
-    r(this, R, void 0);
-    r(this, U, void 0);
-    r(this, b, void 0);
-    r(this, m, void 0);
-    r(this, l, void 0);
-    r(this, w, void 0);
-    r(this, A, void 0);
-    r(this, v, null);
-    r(this, P, []);
-    r(this, E, []);
-    o(this, R, t), o(this, U, s), o(this, b, new URLPattern({ pathname: e(this, R) })), o(this, m, null), o(this, l, null), o(this, w, !1), o(this, A, null), X && o(this, v, new MutationObserver((i) => {
-      i[0].addedNodes.forEach((h) => {
-        e(this, m) ? e(this, E).push(h) : e(this, P).push(h);
+var F = (n, e, s) => (e = n[Z("asyncIterator")]) ? e.call(n) : (n = n[Z("iterator")](), e = {}, s = (i, r) => (r = n[i]) && (e[i] = (o) => new Promise((c, f, u) => (o = r.call(n, o), u = o.done, Promise.resolve(o.value).then((v) => c({ value: v, done: u }), f)))), s("next"), s("return"), e);
+import { URLPattern as ht } from "urlpattern-polyfill";
+import { Notifier as rt } from "../notifier/index.js";
+import { i as et } from "../browser-0zX67oeU.js";
+import { d as ot } from "../function-C10DGppn.js";
+import { n as ct, c as lt, s as ut } from "../url-DMNfW7uN.js";
+import { i as mt } from "../instantiate-D19Uvc31.js";
+import { i as _ } from "../object-D6MVWB4l.js";
+var R, U, A, p, m, w, k, L, E, b, M, st;
+class dt {
+  constructor(e, s) {
+    h(this, M);
+    h(this, R, void 0);
+    h(this, U, void 0);
+    h(this, A, void 0);
+    h(this, p, void 0);
+    h(this, m, void 0);
+    h(this, w, void 0);
+    h(this, k, void 0);
+    h(this, L, null);
+    h(this, E, []);
+    h(this, b, []);
+    a(this, R, e), a(this, U, s), a(this, A, new URLPattern({ pathname: t(this, R) })), a(this, p, null), a(this, m, null), a(this, w, !1), a(this, k, null), et && a(this, L, new MutationObserver((i) => {
+      i[0].addedNodes.forEach((o) => {
+        t(this, p) ? t(this, b).push(o) : t(this, E).push(o);
       });
     }));
   }
   get pattern() {
-    return e(this, R);
+    return t(this, R);
   }
   get urlPattern() {
-    return e(this, b);
+    return t(this, A);
   }
   get isActive() {
-    return e(this, w);
+    return t(this, w);
   }
   get element() {
-    return e(this, l);
+    return t(this, m);
   }
   get nest() {
-    return e(this, A);
+    return t(this, k);
   }
-  testPathname(t) {
-    return this.urlPattern.test({ pathname: t });
+  testPathname(e) {
+    return this.urlPattern.test({ pathname: e });
   }
-  render(t, s) {
-    return j(this, null, function* () {
-      var i, u;
-      if (e(this, v).observe(document.head, {
+  render(e, s) {
+    return I(this, null, function* () {
+      var i, r;
+      if (t(this, L).observe(document.head, {
         childList: !0,
         subtree: !0
-      }), e(this, m))
-        e(this, P).forEach((h) => {
-          document.head.appendChild(h);
+      }), t(this, p))
+        t(this, E).forEach((o) => {
+          document.head.appendChild(o);
         });
       else {
-        const h = yield e(this, U).call(this);
-        if (o(this, E, [...e(this, P)]), typeof h.default == "function" && (o(this, m, h.default), it(h.default))) {
-          const a = "e-" + ((i = e(this, m)) == null ? void 0 : i.name.toLowerCase());
-          customElements.get(a) || customElements.define(a, h.default);
+        const o = yield t(this, U).call(this);
+        if (a(this, b, [...t(this, E)]), typeof o.default == "function" && (a(this, p, o.default), _(o.default))) {
+          const c = "e-" + ((i = t(this, p)) == null ? void 0 : i.name.toLowerCase());
+          customElements.get(c) || customElements.define(c, o.default);
         }
       }
-      if (yield z(this, B, Z).call(this), e(this, m)) {
-        const h = e(this, b).exec({ pathname: s }), a = (h == null ? void 0 : h.pathname.groups) || {}, d = Object.fromEntries(
+      if (yield $(this, M, st).call(this), t(this, p)) {
+        const o = t(this, A).exec({ pathname: s }), c = (o == null ? void 0 : o.pathname.groups) || {}, f = Object.fromEntries(
           new URLSearchParams(location.search)
-        ), f = {
-          pathnameParams: a,
-          searchParams: d
+        ), u = {
+          pathnameParams: c,
+          searchParams: f
         };
-        o(this, l, new (e(this, m))(f)), t.appendChild(e(this, l)), o(this, A, e(this, l).querySelector("[data-nest]") || ((u = e(this, l).shadowRoot) == null ? void 0 : u.querySelector("[data-nest]")) || e(this, l).shadowRoot || e(this, l)), o(this, w, !0);
+        _(t(this, p)) ? a(this, m, new (t(this, p))(u)) : a(this, m, mt(t(this, p), {
+          attributes: u
+        })), e.appendChild(t(this, m)), a(this, k, t(this, m).querySelector("[data-nest]") || ((r = t(this, m).shadowRoot) == null ? void 0 : r.querySelector("[data-nest]")) || t(this, m).shadowRoot || t(this, m)), a(this, w, !0);
       }
-      e(this, v).disconnect();
+      t(this, L).disconnect();
     });
   }
   close() {
-    var t;
-    e(this, v).disconnect(), (t = e(this, l)) == null || t.remove(), o(this, w, !1), e(this, E).forEach((s) => document.head.removeChild(s)), o(this, E, []);
+    var e;
+    t(this, L).disconnect(), (e = t(this, m)) == null || e.remove(), a(this, w, !1), t(this, b).forEach((s) => document.head.removeChild(s)), a(this, b, []);
   }
   getAnchorElements() {
     var s;
-    let t = [];
-    return e(this, l) && (t = [...e(this, l).querySelectorAll("a")]), (s = e(this, l)) != null && s.shadowRoot && (t = [
-      ...t,
-      ...e(this, l).shadowRoot.querySelectorAll("a")
-    ]), t;
+    let e = [];
+    return t(this, m) && (e = [...t(this, m).querySelectorAll("a")]), (s = t(this, m)) != null && s.shadowRoot && (e = [
+      ...e,
+      ...t(this, m).shadowRoot.querySelectorAll("a")
+    ]), e;
   }
 }
-R = new WeakMap(), U = new WeakMap(), b = new WeakMap(), m = new WeakMap(), l = new WeakMap(), w = new WeakMap(), A = new WeakMap(), v = new WeakMap(), P = new WeakMap(), E = new WeakMap(), B = new WeakSet(), Z = function() {
-  return j(this, null, function* () {
-    const t = e(this, P).filter((a) => a instanceof HTMLElement ? a.tagName === "STYLE" || a.tagName === "SCRIPT" || a.tagName === "LINK" : !1);
+R = new WeakMap(), U = new WeakMap(), A = new WeakMap(), p = new WeakMap(), m = new WeakMap(), w = new WeakMap(), k = new WeakMap(), L = new WeakMap(), E = new WeakMap(), b = new WeakMap(), M = new WeakSet(), st = function() {
+  return I(this, null, function* () {
+    const e = t(this, E).filter((c) => c instanceof HTMLElement ? c.tagName === "STYLE" || c.tagName === "SCRIPT" || c.tagName === "LINK" : !1);
     try {
-      for (var s = F(t), i, u, h; i = !(u = yield s.next()).done; i = !1) {
-        const a = u.value;
-        yield new Promise((d) => {
-          a.onload = () => {
-            d();
+      for (var s = F(e), i, r, o; i = !(r = yield s.next()).done; i = !1) {
+        const c = r.value;
+        yield new Promise((f) => {
+          c.onload = () => {
+            f();
           };
         });
       }
-    } catch (u) {
-      h = [u];
+    } catch (r) {
+      o = [r];
     } finally {
       try {
-        i && (u = s.return) && (yield u.call(s));
+        i && (r = s.return) && (yield r.call(s));
       } finally {
-        if (h)
-          throw h[0];
+        if (o)
+          throw o[0];
       }
     }
   });
 };
-var H, g, S, O, x;
-class rt {
-  constructor(t, s) {
-    r(this, H, void 0);
-    r(this, g, void 0);
-    r(this, S, void 0);
-    r(this, O, void 0);
-    r(this, x, (t) => {
-      t.preventDefault(), e(this, H).navigate(e(this, S), e(this, O));
+var S, d, P, O, N, x;
+class ft {
+  constructor(e, s) {
+    h(this, S, void 0);
+    h(this, d, void 0);
+    h(this, P, void 0);
+    h(this, O, void 0);
+    h(this, N, void 0);
+    h(this, x, (e) => {
+      e.preventDefault(), t(this, S).links.forEach((s) => {
+        var i;
+        t(this, P) === t(s, P) || (i = t(s, N)) != null && i.includes(t(this, P)) ? t(s, d).classList.add("clicked") : t(s, d).classList.remove("clicked");
+      }), t(this, S).navigate(t(this, P), t(this, O));
     });
-    o(this, H, t), o(this, g, s), o(this, S, e(this, g).getAttribute("href") || "/"), o(this, O, e(this, g).getAttribute("data-history-action") || "push"), e(this, g).addEventListener("click", e(this, x)), location.pathname === e(this, S) && e(this, g).classList.add("current");
+    var o, c;
+    a(this, S, e), a(this, d, s), a(this, P, t(this, d).getAttribute("href") || "/"), a(this, O, t(this, d).getAttribute(
+      "data-history-action"
+    ) || "push"), t(this, d).addEventListener("click", t(this, x));
+    const i = e.normalizePath(t(this, P)), r = e.normalizePath(location.pathname);
+    a(this, N, (o = t(this, d).getAttribute("data-match-paths")) == null ? void 0 : o.split(",").map((f) => e.normalizePath(f.trim()).pathname)), t(this, d).hasAttribute("data-include") ? r.pathname.includes(i.pathname) && t(this, d).classList.add("current") : i.pathname === r.pathname || (c = t(this, N)) != null && c.includes(r.pathname) ? (t(this, d).classList.add("current"), t(this, d).classList.add("clicked")) : t(this, d).classList.remove("clicked");
   }
   destroy() {
-    e(this, g).removeEventListener("click", e(this, x)), e(this, g).classList.remove("current");
+    t(this, d).removeEventListener("click", t(this, x)), t(this, d).classList.remove("current");
   }
 }
-H = new WeakMap(), g = new WeakMap(), S = new WeakMap(), O = new WeakMap(), x = new WeakMap();
-globalThis.URLPattern = tt;
-var k, N, p, C, I, L, q, M, D, K, _, W;
-const Y = class Y {
-  constructor(t) {
-    r(this, K);
-    r(this, k, null);
-    r(this, N, void 0);
-    r(this, p, []);
-    r(this, C, null);
-    r(this, I, []);
-    r(this, L, void 0);
-    r(this, q, null);
-    r(this, M, new et());
-    r(this, D, st(() => {
-      const t = (s) => s.split("/").length;
-      o(this, p, e(this, p).sort((s, i) => t(s.pattern) - t(i.pattern))), this.navigate(location.pathname.replace(e(this, N), ""));
+S = new WeakMap(), d = new WeakMap(), P = new WeakMap(), O = new WeakMap(), N = new WeakMap(), x = new WeakMap();
+globalThis.URLPattern = ht;
+var C, z, g, q, H, y, T, B, j, D, it, K;
+const W = class W {
+  constructor(e) {
+    h(this, D);
+    h(this, C, null);
+    h(this, z, null);
+    h(this, g, []);
+    h(this, q, null);
+    h(this, H, []);
+    h(this, y, void 0);
+    h(this, T, null);
+    h(this, B, new rt());
+    h(this, j, ot(() => {
+      const e = (s) => s.split("/").length;
+      a(this, g, t(this, g).sort((s, i) => e(s.pattern) - e(i.pattern))), this.navigate(location.pathname);
     }, 0));
-    r(this, W, (t) => {
-      t.state && this.navigate(t.state, "none");
+    h(this, K, (e) => {
+      e.state && this.navigate(e.state, "none");
     });
-    o(this, N, (t == null ? void 0 : t.base) || ""), Y.active = this, X && (o(this, k, (t == null ? void 0 : t.rootElement) || document.body), addEventListener("popstate", e(this, W)));
+    et && (e != null && e.base ? a(this, z, ct(e.base)) : a(this, z, "/"), W.active = this, a(this, C, (e == null ? void 0 : e.rootElement) || document.body), addEventListener("popstate", t(this, K)));
   }
   get currentPathname() {
-    return e(this, q);
+    return t(this, T);
   }
   get candidatePathname() {
-    return e(this, L);
+    return t(this, y);
   }
   get routes() {
-    return e(this, p);
+    return t(this, g);
   }
-  navigationEvent(t) {
-    return e(this, M).subscribe(t);
+  get links() {
+    return t(this, H);
   }
-  defineRoute(t, s) {
-    const i = new nt(t, s);
-    e(this, p).push(i), e(this, D).call(this);
+  navigationEvent(e) {
+    return t(this, B).subscribe(e);
   }
-  navigate(t, s = "push") {
-    return j(this, null, function* () {
-      var f, G;
-      if (e(this, L) === t || e(this, q) === t)
+  defineRoute(e, s) {
+    const i = new dt(e, s);
+    t(this, g).push(i), t(this, j).call(this);
+  }
+  navigate(e, s = "push") {
+    return I(this, null, function* () {
+      var Q, V;
+      const i = this.normalizePath(e);
+      let { pathname: r, hash: o, parameters: c, leaf: f } = i;
+      if (t(this, y) === r || t(this, T) === r)
         return;
-      Y.active = this, o(this, L, t);
-      const i = e(this, p).filter((c) => c.isActive), u = e(this, p).filter(
-        (c) => !i.includes(c) && c.testPathname(t)
-      ), h = i.filter((c) => !c.testPathname(t)), a = i.filter((c) => c.testPathname(t));
-      let d = !0;
+      W.active = this, a(this, y, r);
+      const u = t(this, g).filter((l) => l.isActive), v = t(this, g).filter(
+        (l) => !u.includes(l) && l.testPathname(f)
+      ), at = u.filter((l) => !l.testPathname(f)), G = u.filter((l) => l.testPathname(f));
+      let J = !0;
       if (this.preprocessor)
         try {
-          yield new Promise((c, y) => {
-            var J;
-            (J = this.preprocessor) == null || J.call(this, { pathname: t, resolve: c, reject: y });
+          yield new Promise((l, nt) => {
+            var X;
+            (X = this.preprocessor) == null || X.call(this, { path: i, resolve: l, reject: nt });
           });
-        } catch (c) {
-          c ? console.error(c) : console.log("Route change canceled"), d = !1;
+        } catch (l) {
+          l ? console.error(l) : console.log("Route change canceled"), J = !1;
         }
-      if (d && e(this, L) === t) {
-        o(this, C, a[a.length - 1]), h.forEach((y) => {
-          y.close();
-        }), o(this, q, t);
+      if (J && t(this, y) === r) {
+        a(this, q, G[G.length - 1]), at.forEach((l) => {
+          l.close();
+        }), a(this, T, r);
         try {
-          for (var T = F(u), mt, gt, pt; mt = !(gt = yield T.next()).done; mt = !1) {
-            const y = gt.value;
-            yield y.render(((f = e(this, C)) == null ? void 0 : f.nest) || e(this, k), t), o(this, C, y);
+          for (var At = F(v), kt, St, Nt; kt = !(St = yield At.next()).done; kt = !1) {
+            const l = St.value;
+            yield l.render(((Q = t(this, q)) == null ? void 0 : Q.nest) || t(this, C), r), a(this, q, l);
           }
-        } catch (gt) {
-          pt = [gt];
+        } catch (St) {
+          Nt = [St];
         } finally {
           try {
-            mt && (gt = T.return) && (yield gt.call(T));
+            kt && (St = At.return) && (yield St.call(At));
           } finally {
-            if (pt)
-              throw pt[0];
+            if (Nt)
+              throw Nt[0];
           }
         }
-        const c = e(this, N) + t + location.search;
-        s === "push" ? history.pushState(c, "", c) : s === "replace" && history.replaceState(c, "", c), z(this, K, _).call(this), (G = this.postprocessor) == null || G.call(this, { pathname: t }), e(this, M).notify({ pathname: t });
+        lt(s, r, c, o), $(this, D, it).call(this), (V = this.postprocessor) == null || V.call(this, { pathname: r }), t(this, B).notify({ pathname: r });
       }
     });
   }
+  normalizePath(e) {
+    return ut(e, t(this, z));
+  }
 };
-k = new WeakMap(), N = new WeakMap(), p = new WeakMap(), C = new WeakMap(), I = new WeakMap(), L = new WeakMap(), q = new WeakMap(), M = new WeakMap(), D = new WeakMap(), K = new WeakSet(), _ = function() {
-  const t = e(this, p).filter((i) => i.isActive), s = Array.from(
+C = new WeakMap(), z = new WeakMap(), g = new WeakMap(), q = new WeakMap(), H = new WeakMap(), y = new WeakMap(), T = new WeakMap(), B = new WeakMap(), j = new WeakMap(), D = new WeakSet(), it = function() {
+  const e = t(this, g).filter((i) => i.isActive), s = Array.from(
     new Set(
       [
-        ...e(this, k).querySelectorAll("a"),
-        ...t.map((i) => i.getAnchorElements()).flat()
+        ...t(this, C).querySelectorAll("a"),
+        ...e.map((i) => i.getAnchorElements()).flat()
       ].filter((i) => {
-        var u;
-        return (u = i.getAttribute("href")) == null ? void 0 : u.startsWith("/");
+        var r;
+        return (r = i.getAttribute("href")) == null ? void 0 : r.startsWith("/");
       })
     )
   );
-  e(this, I).forEach((i) => {
+  t(this, H).forEach((i) => {
     i.destroy();
-  }), o(this, I, s.map((i) => new rt(this, i)));
-}, W = new WeakMap();
-let V = Y;
+  }), a(this, H, s.map((i) => new ft(this, i)));
+}, K = new WeakMap();
+let tt = W;
 export {
-  V as Router
+  tt as Router
 };

package/lib/scroll/ScrollElement.d.ts

@@ -3,6 +3,7 @@ import { CustomElement } from '../custom-element';
 import { Store } from '../store';
 import { Axes2D, EasingFunction } from '../utils';
 import { CSSProperty } from '../css-property';
+import { ScrollSection } from './ScrollSection';
 
 export type ScrollBehaviour = 'smooth' | 'instant';
 export interface ScrollSetOptions {
@@ -12,22 +13,6 @@ export interface ScrollSetOptions {
         duration: number;
     };
 }
-export type SectionMark = 'current' | 'previous' | 'next' | null;
-export type SectionmarkChangeEvent = CustomEvent<{
-    mark: SectionMark;
-}>;
-declare class Section {
-    #private;
-    constructor(element: HTMLElement, index: number, scrollElement: ScrollElement);
-    get index(): number;
-    get size(): number;
-    get position(): number;
-    destroy(): void;
-    setSize(value?: number): void;
-    resize(): void;
-    transform(): void;
-    mark(mark: SectionMark): void;
-}
 export declare class ScrollElement extends CustomElement {
     #private;
     constructor();
@@ -60,7 +45,7 @@ export declare class ScrollElement extends CustomElement {
     get currentScrollValue(): number;
     get targetScrollValue(): number;
     get contentElement(): HTMLElement;
-    get sections(): Section[];
+    get sections(): ScrollSection[];
     get position(): number;
     get contentPosition(): number;
     get viewportSize(): number;
@@ -94,7 +79,5 @@ declare global {
     }
     interface HTMLElementEventMap {
         sectionsChange: CustomEvent;
-        sectionMarkChange: SectionmarkChangeEvent;
     }
 }
-export {};

package/lib/scroll/ScrollSection.d.ts

@@ -0,0 +1,23 @@
+import { ScrollElement } from './ScrollElement';
+
+export type ScrollSectionMark = 'current' | 'previous' | 'next' | null;
+export type ScrollSectionMarkChangeEvent = CustomEvent<{
+    mark: ScrollSectionMark;
+}>;
+export declare class ScrollSection {
+    #private;
+    constructor(element: HTMLElement, index: number, scrollElement: ScrollElement);
+    get index(): number;
+    get size(): number;
+    get position(): number;
+    destroy(): void;
+    setSize(value?: number): void;
+    resize(): void;
+    transform(): void;
+    mark(mark: ScrollSectionMark): void;
+}
+declare global {
+    interface HTMLElementEventMap {
+        sectionMarkChange: ScrollSectionMarkChangeEvent;
+    }
+}