aptechka 0.96.4 → 0.96.6

package/lib/size-element/index.cjs

@@ -1 +1 @@
-"use strict";var __defProp=Object.defineProperty;var __typeError=msg=>{throw TypeError(msg)};var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __accessCheck=(obj,member,msg)=>member.has(obj)||__typeError("Cannot "+msg);var __privateGet=(obj,member,getter)=>(__accessCheck(obj,member,"read from private field"),getter?getter.call(obj):member.get(obj)),__privateAdd=(obj,member,value)=>member.has(obj)?__typeError("Cannot add the same private member more than once"):member instanceof WeakSet?member.add(obj):member.set(obj,value),__privateSet=(obj,member,value,setter)=>(__accessCheck(obj,member,"write to private field"),setter?setter.call(obj,value):member.set(obj,value),value),__privateMethod=(obj,member,method)=>(__accessCheck(obj,member,"access private method"),method);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const elementResizer_index=require("../element-resizer/index.cjs"),browser=require("../browser-CIp8NsnF.cjs");require("construct-style-sheets-polyfill");require("../index-BrasTsja.cjs");var _targetElement,_SizeElement_instances,setVar_fn,_resizeListener;const _SizeElement=class _SizeElement extends HTMLElement{constructor(){super(...arguments);__privateAdd(this,_SizeElement_instances);__privateAdd(this,_targetElement,this);__privateAdd(this,_resizeListener,__name(()=>{__privateGet(this,_targetElement).style.removeProperty("--width"),__privateGet(this,_targetElement).style.removeProperty("--height"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"width"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"height"),setTimeout(()=>{const width=this.offsetWidth,height=this.offsetHeight;__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"width",width+"px"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"height",height+"px")},0)},"#resizeListener"))}connectedCallback(){var _a;const targetName=(_a=this.getAttribute("target"))==null?void 0:_a.trim();targetName&&(targetName==="parent"?__privateSet(this,_targetElement,this.parentElement||this):__privateSet(this,_targetElement,document.querySelector(targetName)||this)),elementResizer_index.elementResizer.subscribe(this,__privateGet(this,_resizeListener))}disconnectedCallback(){elementResizer_index.elementResizer.unsubscribe(__privateGet(this,_resizeListener))}};_targetElement=new WeakMap,_SizeElement_instances=new WeakSet,setVar_fn=__name(function(varName,value){const prefix=this.dataset.prefix||"";value?__privateGet(this,_targetElement).style.setProperty(`--${prefix}${varName}`,value):__privateGet(this,_targetElement).style.removeProperty(`--${prefix}${varName}`)},"#setVar"),_resizeListener=new WeakMap,__name(_SizeElement,"SizeElement");let SizeElement=_SizeElement;browser.isBrowser&&!customElements.get("e-size-element")&&customElements.define("e-size-element",SizeElement);exports.SizeElement=SizeElement;
+"use strict";var __defProp=Object.defineProperty;var __typeError=msg=>{throw TypeError(msg)};var __name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __accessCheck=(obj,member,msg)=>member.has(obj)||__typeError("Cannot "+msg);var __privateGet=(obj,member,getter)=>(__accessCheck(obj,member,"read from private field"),getter?getter.call(obj):member.get(obj)),__privateAdd=(obj,member,value)=>member.has(obj)?__typeError("Cannot add the same private member more than once"):member instanceof WeakSet?member.add(obj):member.set(obj,value),__privateSet=(obj,member,value,setter)=>(__accessCheck(obj,member,"write to private field"),setter?setter.call(obj,value):member.set(obj,value),value),__privateMethod=(obj,member,method)=>(__accessCheck(obj,member,"access private method"),method);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const elementResizer_index=require("../element-resizer/index.cjs"),browser=require("../browser-CIp8NsnF.cjs");require("construct-style-sheets-polyfill");require("../index-BrasTsja.cjs");var _targetElement,_SizeElement_instances,setVar_fn,_resizeListener;const _SizeElement=class _SizeElement extends HTMLElement{constructor(){super(...arguments);__privateAdd(this,_SizeElement_instances);__privateAdd(this,_targetElement,this);__privateAdd(this,_resizeListener,__name(()=>{__privateGet(this,_targetElement).style.removeProperty("--width"),__privateGet(this,_targetElement).style.removeProperty("--height"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"width"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"height"),setTimeout(()=>{const width=this.offsetWidth,height=this.offsetHeight;__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"width",width+"px"),__privateMethod(this,_SizeElement_instances,setVar_fn).call(this,"height",height+"px")},0)},"#resizeListener"))}connectedCallback(){var _a;const targetName=(_a=this.getAttribute("target"))==null?void 0:_a.trim();targetName&&(targetName==="parent"?__privateSet(this,_targetElement,this.parentElement||this):__privateSet(this,_targetElement,document.querySelector(targetName)||this)),elementResizer_index.elementResizer.subscribe(this,__privateGet(this,_resizeListener)),document.addEventListener("spaAfterUpdate",__privateGet(this,_resizeListener))}disconnectedCallback(){elementResizer_index.elementResizer.unsubscribe(__privateGet(this,_resizeListener)),document.removeEventListener("spaAfterUpdate",__privateGet(this,_resizeListener))}};_targetElement=new WeakMap,_SizeElement_instances=new WeakSet,setVar_fn=__name(function(varName,value){const prefix=this.dataset.prefix||"";value?__privateGet(this,_targetElement).style.setProperty(`--${prefix}${varName}`,value):__privateGet(this,_targetElement).style.removeProperty(`--${prefix}${varName}`)},"#setVar"),_resizeListener=new WeakMap,__name(_SizeElement,"SizeElement");let SizeElement=_SizeElement;browser.isBrowser&&!customElements.get("e-size-element")&&customElements.define("e-size-element",SizeElement);exports.SizeElement=SizeElement;

package/lib/size-element/index.js

@@ -25,10 +25,10 @@ const _SizeElement = class _SizeElement extends HTMLElement {
   connectedCallback() {
     var _a;
     const targetName = (_a = this.getAttribute("target")) == null ? void 0 : _a.trim();
-    targetName && (targetName === "parent" ? __privateSet(this, _targetElement, this.parentElement || this) : __privateSet(this, _targetElement, document.querySelector(targetName) || this)), elementResizer.subscribe(this, __privateGet(this, _resizeListener));
+    targetName && (targetName === "parent" ? __privateSet(this, _targetElement, this.parentElement || this) : __privateSet(this, _targetElement, document.querySelector(targetName) || this)), elementResizer.subscribe(this, __privateGet(this, _resizeListener)), document.addEventListener("spaAfterUpdate", __privateGet(this, _resizeListener));
   }
   disconnectedCallback() {
-    elementResizer.unsubscribe(__privateGet(this, _resizeListener));
+    elementResizer.unsubscribe(__privateGet(this, _resizeListener)), document.removeEventListener("spaAfterUpdate", __privateGet(this, _resizeListener));
   }
 };
 _targetElement = new WeakMap(), _SizeElement_instances = new WeakSet(), setVar_fn = /* @__PURE__ */ __name(function(varName, value) {

package/lib/spa/SPA.d.ts

@@ -3,26 +3,39 @@ import { PageScroll } from '../page-scroll';
 export type SPAURLModifier = (url: URL) => URL;
 export interface SPAOptions extends Pick<LocalLinksOptions, 'base' | 'trailingSlash' | 'includeAnchor'> {
     scrollSelector?: string;
-    beforeDiff?: (newDocument: Document) => void | Promise<void>;
-    afterDiff?: () => void | Promise<void>;
+    beforeDiff?: (newDocument: Document, signal: AbortSignal) => void | Promise<void>;
+    afterDiff?: (signal: AbortSignal) => void | Promise<void>;
     viewTransition?: boolean;
     urlModifier?: SPAURLModifier;
 }
 export interface SPANavigateOptions extends LocalLinksLinkOptions {
     pushStateNoFetch?: boolean;
+    signal?: AbortSignal;
 }
 export interface SPAEvents {
-    spaBeforeFetch: CustomEvent;
-    spaAfterFetch: CustomEvent;
-    spaBeforeUpdate: CustomEvent;
-    spaAfterUpdate: CustomEvent;
+    spaBeforeFetch: CustomEvent<{
+        signal: AbortSignal;
+    }>;
+    spaAfterFetch: CustomEvent<{
+        signal: AbortSignal;
+    }>;
+    spaBeforeUpdate: CustomEvent<{
+        signal: AbortSignal;
+    }>;
+    spaAfterUpdate: CustomEvent<{
+        signal: AbortSignal;
+    }>;
+}
+export interface SPANavigationHandle extends Promise<void> {
+    signal: AbortSignal;
+    abort: () => void;
 }
 export declare class SPA {
     #private;
     static instance: SPA;
     constructor(options?: SPAOptions);
     get scroll(): PageScroll;
-    navigate(url: URL | string, options?: SPANavigateOptions): Promise<void>;
+    navigate(url: URL | string, options?: SPANavigateOptions): SPANavigationHandle;
 }
 declare global {
     interface DocumentEventMap extends SPAEvents {

package/lib/spa/index.cjs

@@ -1 +1 @@
-"use strict";var __defProp=Object.defineProperty,__defProps=Object.defineProperties;var __getOwnPropDescs=Object.getOwnPropertyDescriptors;var __getOwnPropSymbols=Object.getOwnPropertySymbols;var __hasOwnProp=Object.prototype.hasOwnProperty,__propIsEnum=Object.prototype.propertyIsEnumerable;var __typeError=msg=>{throw TypeError(msg)};var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value,__spreadValues=(a,b)=>{for(var prop in b||(b={}))__hasOwnProp.call(b,prop)&&__defNormalProp(a,prop,b[prop]);if(__getOwnPropSymbols)for(var prop of __getOwnPropSymbols(b))__propIsEnum.call(b,prop)&&__defNormalProp(a,prop,b[prop]);return a},__spreadProps=(a,b)=>__defProps(a,__getOwnPropDescs(b)),__name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __accessCheck=(obj,member,msg)=>member.has(obj)||__typeError("Cannot "+msg);var __privateGet=(obj,member,getter)=>(__accessCheck(obj,member,"read from private field"),getter?getter.call(obj):member.get(obj)),__privateAdd=(obj,member,value)=>member.has(obj)?__typeError("Cannot add the same private member more than once"):member instanceof WeakSet?member.add(obj):member.set(obj,value),__privateSet=(obj,member,value,setter)=>(__accessCheck(obj,member,"write to private field"),setter?setter.call(obj,value):member.set(obj,value),value);var __privateWrapper=(obj,member,setter,getter)=>({set _(value){__privateSet(obj,member,value,setter)},get _(){return __privateGet(obj,member,getter)}});var __async=(__this,__arguments,generator)=>new Promise((resolve,reject)=>{var fulfilled=value=>{try{step(generator.next(value))}catch(e){reject(e)}},rejected=value=>{try{step(generator.throw(value))}catch(e){reject(e)}},step=x=>x.done?resolve(x.value):Promise.resolve(x.value).then(fulfilled,rejected);step((generator=generator.apply(__this,__arguments)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const cache_index=require("../cache/index.cjs"),LocalLinks=require("../LocalLinks-D9t9p3Kh.cjs"),PageAnnouncerElement=require("../PageAnnouncerElement-DreveHSN.cjs"),PageScroll=require("../PageScroll-xuHDTIoC.cjs"),ScrollNavigator=require("../ScrollNavigator-CNKI1Iae.cjs"),historyManager=require("../historyManager-Car6P2ak.cjs"),events=require("../events-UlGk63iC.cjs"),morph=require("../morph-CsmERL3V.cjs");require("construct-style-sheets-polyfill");require("../index-BrasTsja.cjs");const url=require("../url-D_KuhhOg.cjs");var _cache,_domParser,_options,_scroll,_links,_announcerElement,_updateId,_isBack;const _SPA=class _SPA{constructor(options){__privateAdd(this,_cache,new cache_index.Cache);__privateAdd(this,_domParser,new DOMParser);__privateAdd(this,_options,null);__privateAdd(this,_scroll,null);__privateAdd(this,_links,null);__privateAdd(this,_announcerElement,null);__privateAdd(this,_updateId,0);__privateAdd(this,_isBack,!1);_SPA.instance||(_SPA.instance=this,__privateSet(this,_options,__spreadProps(__spreadValues({},options),{base:url.normalizeBase(options==null?void 0:options.base)})),__privateSet(this,_announcerElement,new PageAnnouncerElement.PageAnnouncerElement),__privateSet(this,_scroll,new PageScroll.PageScroll(__privateGet(this,_options).scrollSelector)),__privateGet(this,_scroll).update(),__privateSet(this,_links,new LocalLinks.LocalLinks({base:__privateGet(this,_options).base,trailingSlash:__privateGet(this,_options).trailingSlash,includeAnchor:options==null?void 0:options.includeAnchor,onClick:__name((url2,options2)=>{try{this.navigate(url2,options2)}catch(e){window.location.assign(url2)}},"onClick")})),__privateGet(this,_links).update(),historyManager.historyManager.addPopStateHandler(event=>{var _a,_b,_c,_d,_e,_f;(_b=(_a=event.state)==null?void 0:_a.data)!=null&&_b.popover||(_d=(_c=event.previousState)==null?void 0:_c.data)!=null&&_d.popover||(__privateSet(this,_isBack,!0),this.navigate(location.href.replace(location.origin,""),{scrollValue:((_f=(_e=event.state)==null?void 0:_e.data)==null?void 0:_f.scrollTop)||0}))}))}get scroll(){return __privateGet(this,_scroll)}navigate(url$1,options){return __async(this,null,function*(){var _a,_b,_c,_d,_e,_f,_g;let isBack=__privateGet(this,_isBack);__privateSet(this,_isBack,!1);const updateId=++__privateWrapper(this,_updateId)._;let fullUrl=url.normalizeURL(url$1,{base:__privateGet(this,_options).base,trailingSlash:__privateGet(this,_options).trailingSlash});if(__privateGet(this,_options).urlModifier&&(fullUrl=__privateGet(this,_options).urlModifier(fullUrl)),options!=null&&options.pushStateNoFetch){historyManager.historyManager.updateCurrentStateData({scrollTop:__privateGet(this,_scroll).y}),historyManager.historyManager.pushState(fullUrl);return}events.dispatchEvent(document,"spaBeforeFetch",{custom:!0});let contents=__privateGet(this,_cache).get(fullUrl.toString());if((!contents||options!=null&&options.revalidate)&&(contents=yield fetch(`${fullUrl}`,{headers:{"X-SPA":"true"}}).then(res=>res.text()).catch(()=>{window.location.assign(fullUrl)})),events.dispatchEvent(document,"spaAfterFetch",{custom:!0}),!contents||(options!=null&&options.cache&&__privateGet(this,_cache).set(fullUrl.toString(),contents),__privateGet(this,_updateId)!==updateId))return;isBack?historyManager.historyManager.updatePreviousStateData({scrollTop:__privateGet(this,_scroll).y}):(historyManager.historyManager.updateCurrentStateData({scrollTop:__privateGet(this,_scroll).y}),historyManager.historyManager.pushState(fullUrl));const html=__privateGet(this,_domParser).parseFromString(contents,"text/html");if(url.normalizeRelativeURLs(html,fullUrl),yield(_b=(_a=__privateGet(this,_options)).beforeDiff)==null?void 0:_b.call(_a,html),__privateGet(this,_updateId)!==updateId)return;events.dispatchEvent(document,"spaBeforeUpdate",{custom:!0});let title=(_c=html.querySelector("title"))==null?void 0:_c.textContent;if(title)document.title=title;else{const h1=document.querySelector("h1");title=(_e=(_d=h1==null?void 0:h1.innerText)!=null?_d:h1==null?void 0:h1.textContent)!=null?_e:fullUrl.pathname}__privateGet(this,_announcerElement).create(html,title);const updateDone=__name(()=>{__privateGet(this,_scroll).update(),__privateGet(this,_links).update(),__privateGet(this,_announcerElement).done(),options!=null&&options.keepScrollPosition||ScrollNavigator.ScrollNavigator.scrollToElement((options==null?void 0:options.scrollValue)||0,__spreadValues({scrollElement:__privateGet(this,_scroll).element,behavior:"instant"},options==null?void 0:options.scrollOptions))},"updateDone");if(__privateGet(this,_options).viewTransition&&document.startViewTransition){const v=document.startViewTransition(()=>morph.morph(document,html));yield v.updateCallbackDone,updateDone(),yield v.finished}else yield morph.morph(document,html),updateDone();yield(_g=(_f=__privateGet(this,_options)).afterDiff)==null?void 0:_g.call(_f),events.dispatchEvent(document,"spaAfterUpdate",{custom:!0})})}};_cache=new WeakMap,_domParser=new WeakMap,_options=new WeakMap,_scroll=new WeakMap,_links=new WeakMap,_announcerElement=new WeakMap,_updateId=new WeakMap,_isBack=new WeakMap,__name(_SPA,"SPA"),_SPA.instance=null;let SPA=_SPA;exports.SPA=SPA;
+"use strict";var __defProp=Object.defineProperty,__defProps=Object.defineProperties;var __getOwnPropDescs=Object.getOwnPropertyDescriptors;var __getOwnPropSymbols=Object.getOwnPropertySymbols;var __hasOwnProp=Object.prototype.hasOwnProperty,__propIsEnum=Object.prototype.propertyIsEnumerable;var __typeError=msg=>{throw TypeError(msg)};var __defNormalProp=(obj,key,value)=>key in obj?__defProp(obj,key,{enumerable:!0,configurable:!0,writable:!0,value}):obj[key]=value,__spreadValues=(a,b)=>{for(var prop in b||(b={}))__hasOwnProp.call(b,prop)&&__defNormalProp(a,prop,b[prop]);if(__getOwnPropSymbols)for(var prop of __getOwnPropSymbols(b))__propIsEnum.call(b,prop)&&__defNormalProp(a,prop,b[prop]);return a},__spreadProps=(a,b)=>__defProps(a,__getOwnPropDescs(b)),__name=(target,value)=>__defProp(target,"name",{value,configurable:!0});var __accessCheck=(obj,member,msg)=>member.has(obj)||__typeError("Cannot "+msg);var __privateGet=(obj,member,getter)=>(__accessCheck(obj,member,"read from private field"),getter?getter.call(obj):member.get(obj)),__privateAdd=(obj,member,value)=>member.has(obj)?__typeError("Cannot add the same private member more than once"):member instanceof WeakSet?member.add(obj):member.set(obj,value),__privateSet=(obj,member,value,setter)=>(__accessCheck(obj,member,"write to private field"),setter?setter.call(obj,value):member.set(obj,value),value),__privateMethod=(obj,member,method)=>(__accessCheck(obj,member,"access private method"),method);var __privateWrapper=(obj,member,setter,getter)=>({set _(value){__privateSet(obj,member,value,setter)},get _(){return __privateGet(obj,member,getter)}});var __async=(__this,__arguments,generator)=>new Promise((resolve,reject)=>{var fulfilled=value=>{try{step(generator.next(value))}catch(e){reject(e)}},rejected=value=>{try{step(generator.throw(value))}catch(e){reject(e)}},step=x=>x.done?resolve(x.value):Promise.resolve(x.value).then(fulfilled,rejected);step((generator=generator.apply(__this,__arguments)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const cache_index=require("../cache/index.cjs"),LocalLinks=require("../LocalLinks-D9t9p3Kh.cjs"),PageAnnouncerElement=require("../PageAnnouncerElement-DreveHSN.cjs"),PageScroll=require("../PageScroll-xuHDTIoC.cjs"),ScrollNavigator=require("../ScrollNavigator-CNKI1Iae.cjs"),historyManager=require("../historyManager-Car6P2ak.cjs"),events=require("../events-UlGk63iC.cjs"),morph=require("../morph-CsmERL3V.cjs");require("construct-style-sheets-polyfill");require("../index-BrasTsja.cjs");const url=require("../url-D_KuhhOg.cjs");var _cache,_domParser,_options,_scroll,_links,_announcerElement,_updateId,_isBack,_SPA_instances,navigateInternal_fn;const _SPA=class _SPA{constructor(options){__privateAdd(this,_SPA_instances);__privateAdd(this,_cache,new cache_index.Cache);__privateAdd(this,_domParser,new DOMParser);__privateAdd(this,_options,null);__privateAdd(this,_scroll,null);__privateAdd(this,_links,null);__privateAdd(this,_announcerElement,null);__privateAdd(this,_updateId,0);__privateAdd(this,_isBack,!1);_SPA.instance||(_SPA.instance=this,__privateSet(this,_options,__spreadProps(__spreadValues({},options),{base:url.normalizeBase(options==null?void 0:options.base)})),__privateSet(this,_announcerElement,new PageAnnouncerElement.PageAnnouncerElement),__privateSet(this,_scroll,new PageScroll.PageScroll(__privateGet(this,_options).scrollSelector)),__privateGet(this,_scroll).update(),__privateSet(this,_links,new LocalLinks.LocalLinks({base:__privateGet(this,_options).base,trailingSlash:__privateGet(this,_options).trailingSlash,includeAnchor:options==null?void 0:options.includeAnchor,onClick:__name((url2,options2)=>{this.navigate(url2,options2).signal.addEventListener("abort",()=>{console.log("Navigation aborted")})},"onClick")})),__privateGet(this,_links).update(),historyManager.historyManager.addPopStateHandler(event=>{var _a,_b,_c,_d,_e,_f;if((_b=(_a=event.state)==null?void 0:_a.data)!=null&&_b.popover||(_d=(_c=event.previousState)==null?void 0:_c.data)!=null&&_d.popover)return;__privateSet(this,_isBack,!0),this.navigate(location.href.replace(location.origin,""),{scrollValue:((_f=(_e=event.state)==null?void 0:_e.data)==null?void 0:_f.scrollTop)||0}).signal.addEventListener("abort",()=>{console.log("Popstate navigation aborted")})}))}get scroll(){return __privateGet(this,_scroll)}navigate(url2,options){const abortController=new AbortController,signal=(options==null?void 0:options.signal)||abortController.signal,navigationPromise=__privateMethod(this,_SPA_instances,navigateInternal_fn).call(this,url2,__spreadProps(__spreadValues({},options),{signal})).catch(error=>{throw error instanceof Error&&error.name==="AbortError"||console.error("Navigation failed:",error),error});return Object.assign(navigationPromise,{signal,abort:__name(()=>abortController.abort(),"abort")})}};_cache=new WeakMap,_domParser=new WeakMap,_options=new WeakMap,_scroll=new WeakMap,_links=new WeakMap,_announcerElement=new WeakMap,_updateId=new WeakMap,_isBack=new WeakMap,_SPA_instances=new WeakSet,navigateInternal_fn=__name(function(url$1,options){return __async(this,null,function*(){var _a,_b,_c,_d,_e,_f,_g;let isBack=__privateGet(this,_isBack);__privateSet(this,_isBack,!1);const updateId=++__privateWrapper(this,_updateId)._,{signal}=options||{signal:new AbortController().signal};let fullUrl=url.normalizeURL(url$1,{base:__privateGet(this,_options).base,trailingSlash:__privateGet(this,_options).trailingSlash});if(__privateGet(this,_options).urlModifier&&(fullUrl=__privateGet(this,_options).urlModifier(fullUrl)),options!=null&&options.pushStateNoFetch){historyManager.historyManager.updateCurrentStateData({scrollTop:__privateGet(this,_scroll).y}),historyManager.historyManager.pushState(fullUrl);return}signal.throwIfAborted(),events.dispatchEvent(document,"spaBeforeFetch",{custom:!0,detail:{signal}});let contents=__privateGet(this,_cache).get(fullUrl.toString());if(!contents||options!=null&&options.revalidate)try{contents=yield(yield fetch(`${fullUrl}`,{headers:{"X-SPA":"true"},signal})).text()}catch(error){if(error instanceof Error&&error.name==="AbortError")throw error;window.location.assign(fullUrl);return}if(signal.throwIfAborted(),events.dispatchEvent(document,"spaAfterFetch",{custom:!0,detail:{signal}}),!contents||(options!=null&&options.cache&&__privateGet(this,_cache).set(fullUrl.toString(),contents),signal.throwIfAborted(),__privateGet(this,_updateId)!==updateId))return;isBack?historyManager.historyManager.updatePreviousStateData({scrollTop:__privateGet(this,_scroll).y}):(historyManager.historyManager.updateCurrentStateData({scrollTop:__privateGet(this,_scroll).y}),historyManager.historyManager.pushState(fullUrl)),signal.throwIfAborted();const html=__privateGet(this,_domParser).parseFromString(contents,"text/html");if(url.normalizeRelativeURLs(html,fullUrl),yield(_b=(_a=__privateGet(this,_options)).beforeDiff)==null?void 0:_b.call(_a,html,signal),signal.throwIfAborted(),__privateGet(this,_updateId)!==updateId)return;events.dispatchEvent(document,"spaBeforeUpdate",{custom:!0,detail:{signal}});let title=(_c=html.querySelector("title"))==null?void 0:_c.textContent;if(title)document.title=title;else{const h1=document.querySelector("h1");title=(_e=(_d=h1==null?void 0:h1.innerText)!=null?_d:h1==null?void 0:h1.textContent)!=null?_e:fullUrl.pathname}signal.throwIfAborted(),__privateGet(this,_announcerElement).create(html,title);const updateDone=__name(()=>{__privateGet(this,_scroll).update(),__privateGet(this,_links).update(),__privateGet(this,_announcerElement).done(),options!=null&&options.keepScrollPosition||ScrollNavigator.ScrollNavigator.scrollToElement((options==null?void 0:options.scrollValue)||0,__spreadValues({scrollElement:__privateGet(this,_scroll).element,behavior:"instant"},options==null?void 0:options.scrollOptions))},"updateDone");if(__privateGet(this,_options).viewTransition&&document.startViewTransition){const v=document.startViewTransition(()=>morph.morph(document,html));yield v.updateCallbackDone,signal.throwIfAborted(),updateDone(),yield v.finished}else yield morph.morph(document,html),signal.throwIfAborted(),updateDone();yield(_g=(_f=__privateGet(this,_options)).afterDiff)==null?void 0:_g.call(_f,signal),signal.throwIfAborted(),events.dispatchEvent(document,"spaAfterUpdate",{custom:!0,detail:{signal}})})},"#navigateInternal"),__name(_SPA,"SPA"),_SPA.instance=null;let SPA=_SPA;exports.SPA=SPA;

package/lib/spa/index.d.ts

@@ -1 +1 @@
-export { SPA, type SPAEvents, type SPANavigateOptions, type SPAOptions, type SPAURLModifier, } from './SPA';
+export { SPA, type SPAEvents, type SPANavigateOptions, type SPANavigationHandle, type SPAOptions, type SPAURLModifier, } from './SPA';

package/lib/spa/index.js

@@ -14,7 +14,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
   return a;
 }, __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b)), __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj)), __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value), __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj)), __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value), __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value), __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var __privateWrapper = (obj, member, setter, getter) => ({
   set _(value) {
     __privateSet(obj, member, value, setter);
@@ -50,9 +50,10 @@ import { m as morph } from "../morph-DwKYrG4g.js";
 import "construct-style-sheets-polyfill";
 import "../index-Z2Lgb7xU.js";
 import { a as normalizeBase, n as normalizeURL, b as normalizeRelativeURLs } from "../url-bipuV3FR.js";
-var _cache, _domParser, _options, _scroll, _links, _announcerElement, _updateId, _isBack;
+var _cache, _domParser, _options, _scroll, _links, _announcerElement, _updateId, _isBack, _SPA_instances, navigateInternal_fn;
 const _SPA = class _SPA {
   constructor(options) {
+    __privateAdd(this, _SPA_instances);
     __privateAdd(this, _cache, new Cache());
     __privateAdd(this, _domParser, new DOMParser());
     __privateAdd(this, _options, null);
@@ -68,89 +69,116 @@ const _SPA = class _SPA {
       trailingSlash: __privateGet(this, _options).trailingSlash,
       includeAnchor: options == null ? void 0 : options.includeAnchor,
       onClick: /* @__PURE__ */ __name((url, options2) => {
-        try {
-          this.navigate(url, options2);
-        } catch (e) {
-          window.location.assign(url);
-        }
+        this.navigate(url, options2).signal.addEventListener("abort", () => {
+          console.log("Navigation aborted");
+        });
       }, "onClick")
     })), __privateGet(this, _links).update(), historyManager.addPopStateHandler((event) => {
       var _a, _b, _c, _d, _e, _f;
-      (_b = (_a = event.state) == null ? void 0 : _a.data) != null && _b.popover || (_d = (_c = event.previousState) == null ? void 0 : _c.data) != null && _d.popover || (__privateSet(this, _isBack, !0), this.navigate(location.href.replace(location.origin, ""), {
-        scrollValue: ((_f = (_e = event.state) == null ? void 0 : _e.data) == null ? void 0 : _f.scrollTop) || 0
-      }));
+      if ((_b = (_a = event.state) == null ? void 0 : _a.data) != null && _b.popover || (_d = (_c = event.previousState) == null ? void 0 : _c.data) != null && _d.popover)
+        return;
+      __privateSet(this, _isBack, !0), this.navigate(
+        location.href.replace(location.origin, ""),
+        {
+          scrollValue: ((_f = (_e = event.state) == null ? void 0 : _e.data) == null ? void 0 : _f.scrollTop) || 0
+        }
+      ).signal.addEventListener("abort", () => {
+        console.log("Popstate navigation aborted");
+      });
     }));
   }
   get scroll() {
     return __privateGet(this, _scroll);
   }
   navigate(url, options) {
-    return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g;
-      let isBack = __privateGet(this, _isBack);
-      __privateSet(this, _isBack, !1);
-      const updateId = ++__privateWrapper(this, _updateId)._;
-      let fullUrl = normalizeURL(url, {
-        base: __privateGet(this, _options).base,
-        trailingSlash: __privateGet(this, _options).trailingSlash
-      });
-      if (__privateGet(this, _options).urlModifier && (fullUrl = __privateGet(this, _options).urlModifier(fullUrl)), options != null && options.pushStateNoFetch) {
-        historyManager.updateCurrentStateData({
-          scrollTop: __privateGet(this, _scroll).y
-        }), historyManager.pushState(fullUrl);
-        return;
-      }
-      dispatchEvent(document, "spaBeforeFetch", {
-        custom: !0
-      });
-      let contents = __privateGet(this, _cache).get(fullUrl.toString());
-      if ((!contents || options != null && options.revalidate) && (contents = yield fetch(`${fullUrl}`, {
-        headers: {
-          "X-SPA": "true"
-        }
-      }).then((res) => res.text()).catch(() => {
-        window.location.assign(fullUrl);
-      })), dispatchEvent(document, "spaAfterFetch", {
-        custom: !0
-      }), !contents || (options != null && options.cache && __privateGet(this, _cache).set(fullUrl.toString(), contents), __privateGet(this, _updateId) !== updateId))
-        return;
-      isBack ? historyManager.updatePreviousStateData({
-        scrollTop: __privateGet(this, _scroll).y
-      }) : (historyManager.updateCurrentStateData({
+    const abortController = new AbortController(), signal = (options == null ? void 0 : options.signal) || abortController.signal, navigationPromise = __privateMethod(this, _SPA_instances, navigateInternal_fn).call(this, url, __spreadProps(__spreadValues({}, options), {
+      signal
+    })).catch((error) => {
+      throw error instanceof Error && error.name === "AbortError" || console.error("Navigation failed:", error), error;
+    });
+    return Object.assign(navigationPromise, {
+      signal,
+      abort: /* @__PURE__ */ __name(() => abortController.abort(), "abort")
+    });
+  }
+};
+_cache = new WeakMap(), _domParser = new WeakMap(), _options = new WeakMap(), _scroll = new WeakMap(), _links = new WeakMap(), _announcerElement = new WeakMap(), _updateId = new WeakMap(), _isBack = new WeakMap(), _SPA_instances = new WeakSet(), navigateInternal_fn = /* @__PURE__ */ __name(function(url, options) {
+  return __async(this, null, function* () {
+    var _a, _b, _c, _d, _e, _f, _g;
+    let isBack = __privateGet(this, _isBack);
+    __privateSet(this, _isBack, !1);
+    const updateId = ++__privateWrapper(this, _updateId)._, { signal } = options || { signal: new AbortController().signal };
+    let fullUrl = normalizeURL(url, {
+      base: __privateGet(this, _options).base,
+      trailingSlash: __privateGet(this, _options).trailingSlash
+    });
+    if (__privateGet(this, _options).urlModifier && (fullUrl = __privateGet(this, _options).urlModifier(fullUrl)), options != null && options.pushStateNoFetch) {
+      historyManager.updateCurrentStateData({
         scrollTop: __privateGet(this, _scroll).y
-      }), historyManager.pushState(fullUrl));
-      const html = __privateGet(this, _domParser).parseFromString(contents, "text/html");
-      if (normalizeRelativeURLs(html, fullUrl), yield (_b = (_a = __privateGet(this, _options)).beforeDiff) == null ? void 0 : _b.call(_a, html), __privateGet(this, _updateId) !== updateId)
+      }), historyManager.pushState(fullUrl);
+      return;
+    }
+    signal.throwIfAborted(), dispatchEvent(document, "spaBeforeFetch", {
+      custom: !0,
+      detail: { signal }
+    });
+    let contents = __privateGet(this, _cache).get(fullUrl.toString());
+    if (!contents || options != null && options.revalidate)
+      try {
+        contents = yield (yield fetch(`${fullUrl}`, {
+          headers: {
+            "X-SPA": "true"
+          },
+          signal
+        })).text();
+      } catch (error) {
+        if (error instanceof Error && error.name === "AbortError")
+          throw error;
+        window.location.assign(fullUrl);
         return;
-      dispatchEvent(document, "spaBeforeUpdate", {
-        custom: !0
-      });
-      let title = (_c = html.querySelector("title")) == null ? void 0 : _c.textContent;
-      if (title)
-        document.title = title;
-      else {
-        const h1 = document.querySelector("h1");
-        title = (_e = (_d = h1 == null ? void 0 : h1.innerText) != null ? _d : h1 == null ? void 0 : h1.textContent) != null ? _e : fullUrl.pathname;
       }
-      __privateGet(this, _announcerElement).create(html, title);
-      const updateDone = /* @__PURE__ */ __name(() => {
-        __privateGet(this, _scroll).update(), __privateGet(this, _links).update(), __privateGet(this, _announcerElement).done(), options != null && options.keepScrollPosition || ScrollNavigator.scrollToElement((options == null ? void 0 : options.scrollValue) || 0, __spreadValues({
-          scrollElement: __privateGet(this, _scroll).element,
-          behavior: "instant"
-        }, options == null ? void 0 : options.scrollOptions));
-      }, "updateDone");
-      if (__privateGet(this, _options).viewTransition && document.startViewTransition) {
-        const v = document.startViewTransition(() => morph(document, html));
-        yield v.updateCallbackDone, updateDone(), yield v.finished;
-      } else
-        yield morph(document, html), updateDone();
-      yield (_g = (_f = __privateGet(this, _options)).afterDiff) == null ? void 0 : _g.call(_f), dispatchEvent(document, "spaAfterUpdate", {
-        custom: !0
-      });
+    if (signal.throwIfAborted(), dispatchEvent(document, "spaAfterFetch", {
+      custom: !0,
+      detail: { signal }
+    }), !contents || (options != null && options.cache && __privateGet(this, _cache).set(fullUrl.toString(), contents), signal.throwIfAborted(), __privateGet(this, _updateId) !== updateId))
+      return;
+    isBack ? historyManager.updatePreviousStateData({
+      scrollTop: __privateGet(this, _scroll).y
+    }) : (historyManager.updateCurrentStateData({
+      scrollTop: __privateGet(this, _scroll).y
+    }), historyManager.pushState(fullUrl)), signal.throwIfAborted();
+    const html = __privateGet(this, _domParser).parseFromString(contents, "text/html");
+    if (normalizeRelativeURLs(html, fullUrl), yield (_b = (_a = __privateGet(this, _options)).beforeDiff) == null ? void 0 : _b.call(_a, html, signal), signal.throwIfAborted(), __privateGet(this, _updateId) !== updateId)
+      return;
+    dispatchEvent(document, "spaBeforeUpdate", {
+      custom: !0,
+      detail: { signal }
     });
-  }
-};
-_cache = new WeakMap(), _domParser = new WeakMap(), _options = new WeakMap(), _scroll = new WeakMap(), _links = new WeakMap(), _announcerElement = new WeakMap(), _updateId = new WeakMap(), _isBack = new WeakMap(), __name(_SPA, "SPA"), _SPA.instance = null;
+    let title = (_c = html.querySelector("title")) == null ? void 0 : _c.textContent;
+    if (title)
+      document.title = title;
+    else {
+      const h1 = document.querySelector("h1");
+      title = (_e = (_d = h1 == null ? void 0 : h1.innerText) != null ? _d : h1 == null ? void 0 : h1.textContent) != null ? _e : fullUrl.pathname;
+    }
+    signal.throwIfAborted(), __privateGet(this, _announcerElement).create(html, title);
+    const updateDone = /* @__PURE__ */ __name(() => {
+      __privateGet(this, _scroll).update(), __privateGet(this, _links).update(), __privateGet(this, _announcerElement).done(), options != null && options.keepScrollPosition || ScrollNavigator.scrollToElement((options == null ? void 0 : options.scrollValue) || 0, __spreadValues({
+        scrollElement: __privateGet(this, _scroll).element,
+        behavior: "instant"
+      }, options == null ? void 0 : options.scrollOptions));
+    }, "updateDone");
+    if (__privateGet(this, _options).viewTransition && document.startViewTransition) {
+      const v = document.startViewTransition(() => morph(document, html));
+      yield v.updateCallbackDone, signal.throwIfAborted(), updateDone(), yield v.finished;
+    } else
+      yield morph(document, html), signal.throwIfAborted(), updateDone();
+    yield (_g = (_f = __privateGet(this, _options)).afterDiff) == null ? void 0 : _g.call(_f, signal), signal.throwIfAborted(), dispatchEvent(document, "spaAfterUpdate", {
+      custom: !0,
+      detail: { signal }
+    });
+  });
+}, "#navigateInternal"), __name(_SPA, "SPA"), _SPA.instance = null;
 let SPA = _SPA;
 export {
   SPA

package/package.json

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