aptechka 0.11.5 → 0.11.7

package/client-lib/modal/index.cjs

@@ -1 +1 @@
-"use strict";var d=(e,t,o)=>{if(!t.has(e))throw TypeError("Cannot "+o)};var i=(e,t,o)=>(d(e,t,"read from private field"),o?o.call(e):t.get(e)),a=(e,t,o)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,o)},c=(e,t,o,l)=>(d(e,t,"write to private field"),l?l.call(e,o):t.set(e,o),o);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../Store-Cr3VaD9G.cjs");const h=require("../browser-CpzFX2xg.cjs");require("../ticker/index.cjs");const n=require("../tags-BdW7ATzD.cjs"),b=require("../createStylesheet-BBBiyAsF.cjs"),f=require("../popover/index.cjs"),m=require("../theme/index.cjs"),p=b.createStylesheet({":host":{position:"fixed",top:"0",left:"0",zIndex:"1",width:"100%",height:"100%",transitionProperty:"opacity",transitionDuration:"var(--transition-duration)"},":host::before":{content:'""',position:"fixed",top:"0",left:"0",zIndex:"-1",width:"100%",height:"100%",backgroundColor:"var(--backdrop, rgba(0, 0, 0, 0.8))"},".inner":{width:"100%",height:"100%",display:"flex",alignItems:"center",justifyContent:"center",overflow:"hidden auto"},".overflow .inner":{alignItems:"flex-start"},".content":{position:"relative"},".close-button":{position:"absolute",zIndex:"1",top:"var(--close-button-top, 0.5em)",right:"var(--close-button-right, 0.5em)",background:"none",border:"none",fontFamily:"inherit",fontSize:"inherit",fontWeight:"inherit"},".close-button-default":{width:"var(--close-button-size, 1.5em)",height:"var(--close-button-size, 1.5em)",display:"flex",alignItems:"center",justifyContent:"center",transitionProperty:"transform",transitionDuration:"var(--transition-duration)",willChange:"transform"},".close-button:hover .close-button-default":{transform:"scale(0.9)"},".close-button:active .close-button-default":{transform:"scale(0.7)"},".close-button-default::before, .close-button-default::after":{content:'""',position:"absolute",width:"var(--close-button-thickness, 0.1em)",height:"100%",backgroundColor:`var(--close-button-color, ${m.aptechkaTheme.colorMain.var})`},".close-button-default::before":{transform:"rotate(-45deg)"},".close-button-default::after":{transform:"rotate(45deg)"}});var s,r;class u extends f.PopoverElement{constructor(){super();a(this,s,null);a(this,r,null);h.isBrowser&&(this.attachShadow({mode:"open"}).adoptedStyleSheets.push(p),n.element(this,{children:n.div({class:"inner",outside:!0,children:n.div({class:"content",children:[n.element("e-popover-button",{type:"close",target:this.id,class:"close-button",lightChildren:[n.slot({name:"close-button",children:n.span({class:"close-button-default"})})]}),n.slot()]}),ref:l=>c(this,r,l)})}),c(this,s,new ResizeObserver(()=>{i(this,r).scrollHeight>i(this,r).clientHeight?this.classList.add("overflow"):this.classList.remove("overflow")})))}connectedCallback(){super.connectedCallback(),i(this,s).observe(this)}disconnectedCallback(){super.disconnectedCallback(),i(this,s).disconnect()}}s=new WeakMap,r=new WeakMap;customElements.get("e-modal")||customElements.define("e-modal",u);exports.ModalElement=u;
+"use strict";var d=(e,t,o)=>{if(!t.has(e))throw TypeError("Cannot "+o)};var i=(e,t,o)=>(d(e,t,"read from private field"),o?o.call(e):t.get(e)),a=(e,t,o)=>{if(t.has(e))throw TypeError("Cannot add the same private member more than once");t instanceof WeakSet?t.add(e):t.set(e,o)},c=(e,t,o,l)=>(d(e,t,"write to private field"),l?l.call(e,o):t.set(e,o),o);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../Store-Cr3VaD9G.cjs");const h=require("../browser-CpzFX2xg.cjs");require("../ticker/index.cjs");const n=require("../tags-BdW7ATzD.cjs"),b=require("../createStylesheet-BBBiyAsF.cjs"),f=require("../popover/index.cjs"),m=require("../theme/index.cjs"),p=b.createStylesheet({":host":{position:"fixed",top:"0",left:"0",zIndex:"1",width:"100%",height:"100%",transitionProperty:"opacity",transitionDuration:"var(--transition-duration)"},":host::before":{content:'""',position:"fixed",top:"0",left:"0",zIndex:"-1",width:"100%",height:"100%",backgroundColor:"var(--backdrop, rgba(0, 0, 0, 0.8))"},".inner":{width:"100%",height:"100%",display:"flex",alignItems:"center",justifyContent:"center",overflow:"hidden auto"},".overflow .inner":{alignItems:"flex-start"},".content":{position:"relative"},".close-button":{position:"absolute",zIndex:"1",top:"var(--close-button-top, 0.5em)",right:"var(--close-button-right, 0.5em)",background:"none",border:"none",fontFamily:"inherit",fontSize:"inherit",fontWeight:"inherit"},".close-button-default":{width:"var(--close-button-size, 1.5em)",height:"var(--close-button-size, 1.5em)",display:"flex",alignItems:"center",justifyContent:"center",transitionProperty:"transform",transitionDuration:"var(--transition-duration)",willChange:"transform"},".close-button:hover .close-button-default":{transform:"scale(0.9)"},".close-button:active .close-button-default":{transform:"scale(0.7)"},".close-button-default::before, .close-button-default::after":{content:'""',position:"absolute",width:"var(--close-button-thickness, 0.1em)",height:"100%",backgroundColor:`var(--close-button-color, ${m.aptechkaTheme.colorMain.var})`},".close-button-default::before":{transform:"rotate(-45deg)"},".close-button-default::after":{transform:"rotate(45deg)"}});var s,r;class u extends f.PopoverElement{constructor(){super();a(this,s,null);a(this,r,null);h.isBrowser&&(this.attachShadow({mode:"open"}).adoptedStyleSheets.push(p),n.element(this,{children:n.div({class:"inner",outside:!0,children:n.div({class:"content",children:[n.element("e-popover-button",{type:"close",target:"parent",class:"close-button",lightChildren:[n.slot({name:"close-button",children:n.span({class:"close-button-default"})})]}),n.slot()]}),ref:l=>c(this,r,l)})}),c(this,s,new ResizeObserver(()=>{i(this,r).scrollHeight>i(this,r).clientHeight?this.classList.add("overflow"):this.classList.remove("overflow")})))}connectedCallback(){super.connectedCallback(),i(this,s).observe(this)}disconnectedCallback(){super.disconnectedCallback(),i(this,s).disconnect()}}s=new WeakMap,r=new WeakMap;customElements.get("e-modal")||customElements.define("e-modal",u);exports.ModalElement=u;

package/client-lib/modal/index.js

@@ -2,11 +2,11 @@ var c = (t, e, o) => {
   if (!e.has(t))
     throw TypeError("Cannot " + o);
 };
-var i = (t, e, o) => (c(t, e, "read from private field"), o ? o.call(t) : e.get(t)), a = (t, e, o) => {
+var r = (t, e, o) => (c(t, e, "read from private field"), o ? o.call(t) : e.get(t)), a = (t, e, o) => {
   if (e.has(t))
     throw TypeError("Cannot add the same private member more than once");
   e instanceof WeakSet ? e.add(t) : e.set(t, o);
-}, l = (t, e, o, r) => (c(t, e, "write to private field"), r ? r.call(t, o) : e.set(t, o), o);
+}, l = (t, e, o, i) => (c(t, e, "write to private field"), i ? i.call(t, o) : e.set(t, o), o);
 import "../Store-Qr3SNOSf.js";
 import { i as f } from "../browser-0zX67oeU.js";
 import "../ticker/index.js";
@@ -105,7 +105,7 @@ class w extends p {
           children: [
             d("e-popover-button", {
               type: "close",
-              target: this.id,
+              target: "parent",
               class: "close-button",
               lightChildren: [
                 u({
@@ -117,17 +117,17 @@ class w extends p {
             u()
           ]
         }),
-        ref: (r) => l(this, s, r)
+        ref: (i) => l(this, s, i)
       })
     }), l(this, n, new ResizeObserver(() => {
-      i(this, s).scrollHeight > i(this, s).clientHeight ? this.classList.add("overflow") : this.classList.remove("overflow");
+      r(this, s).scrollHeight > r(this, s).clientHeight ? this.classList.add("overflow") : this.classList.remove("overflow");
     })));
   }
   connectedCallback() {
-    super.connectedCallback(), i(this, n).observe(this);
+    super.connectedCallback(), r(this, n).observe(this);
   }
   disconnectedCallback() {
-    super.disconnectedCallback(), i(this, n).disconnect();
+    super.disconnectedCallback(), r(this, n).disconnect();
   }
 }
 n = new WeakMap(), s = new WeakMap();

package/client-lib/popover/index.cjs

@@ -1 +1 @@
-"use strict";var q=(o,n,t)=>{if(!n.has(o))throw TypeError("Cannot "+t)};var e=(o,n,t)=>(q(o,n,"read from private field"),t?t.call(o):n.get(o)),i=(o,n,t)=>{if(n.has(o))throw TypeError("Cannot add the same private member more than once");n instanceof WeakSet?n.add(o):n.set(o,t)},h=(o,n,t,a)=>(q(o,n,"write to private field"),a?a.call(o,t):n.set(o,t),t);var A=(o,n,t)=>(q(o,n,"access private method"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("../attribute/index.cjs"),I=require("../Store-Cr3VaD9G.cjs"),R=require("../style-At6aDoqG.cjs"),N=require("../browser-CpzFX2xg.cjs");require("../ticker/index.cjs");const j=require("../tags-BdW7ATzD.cjs");var m,l,y,p,d,u,_,x,v,L,f,E,b,M,g;const c=class c extends HTMLElement{constructor(){super();i(this,_);i(this,v);i(this,b);i(this,m,void 0);i(this,l,void 0);i(this,y,void 0);i(this,p,void 0);i(this,d,void 0);i(this,u,void 0);i(this,f,void 0);i(this,E,void 0);i(this,g,void 0);h(this,m,-1),h(this,l,new I.Store(!1)),h(this,p,new $.Attribute(this,"history",!1)),h(this,d,new $.Attribute(this,"single",!1)),h(this,u,!1),this.open=(t=!0)=>{if(e(this,l).current)return;e(this,l).current=!0,e(this,d).current&&(c.__opened.forEach(r=>r.close()),c.__opened=[]),c.__opened.push(this),h(this,m,c.__opened.length-1),e(this,p).current&&e(this,u)&&history.pushState("","",e(this,_,x)),clearTimeout(e(this,y)),this.classList.add("triggered"),this.style.display="block",this.dispatchEvent(new CustomEvent("popoverTriggered"));const a=()=>{addEventListener("click",e(this,f)),addEventListener("keydown",e(this,E)),this.style.opacity="1",this.classList.add("opened"),this.dispatchEvent(new CustomEvent("popoverOpened"))};t?setTimeout(a):a()},this.close=()=>{if(e(this,l).current){if(e(this,l).current=!1,c.__opened=c.__opened.filter(t=>t!==this),e(this,p).current){const t=new URL(location.href);t.searchParams.delete(e(this,v,L)),history.replaceState(null,"",t.href)}this.classList.remove("opened"),this.style.opacity="0",this.dispatchEvent(new CustomEvent("popoverClosing")),removeEventListener("click",e(this,f)),removeEventListener("keydown",e(this,E)),setTimeout(()=>{this.classList.remove("triggered"),this.style.display="none",this.dispatchEvent(new CustomEvent("popoverClosed"))},R.getElementTransitionDurationMS(this)+10)}},h(this,f,t=>{A(this,b,M).call(this,()=>{var O;const r=t.composedPath()[0],P=r instanceof HTMLElement&&(this.contains(r)||((O=this.shadowRoot)==null?void 0:O.contains(r))),B=r instanceof HTMLElement&&r.hasAttribute("outside");(!P||B)&&this.close()})}),h(this,E,t=>{A(this,b,M).call(this,()=>{t.code==="Escape"&&this.close()})}),h(this,g,()=>{h(this,u,!1),e(this,l).current&&e(this,p).current&&!location.search.includes(e(this,v,L))?this.close():!e(this,l).current&&e(this,p).current&&location.search.includes(e(this,v,L))&&this.open(),h(this,u,!0)}),this.setAttribute("popover-target","")}get history(){return e(this,p)}get single(){return e(this,d)}get opened(){return e(this,l)}connectedCallback(){e(this,p).observe(),e(this,d).observe(),this.style.opacity="0",this.style.display="none",addEventListener("popstate",e(this,g)),setTimeout(()=>{e(this,g).call(this)},0)}disconnectedCallback(){e(this,p).unobserve(),e(this,d).unobserve(),c.__opened=c.__opened.filter(t=>t!==this),clearTimeout(e(this,y)),removeEventListener("popstate",e(this,g))}};m=new WeakMap,l=new WeakMap,y=new WeakMap,p=new WeakMap,d=new WeakMap,u=new WeakMap,_=new WeakSet,x=function(){return`${location.pathname}${location.search?location.search+"&":"?"}${e(this,v,L)}`},v=new WeakSet,L=function(){return`modal-${this.id}`},f=new WeakMap,E=new WeakMap,b=new WeakSet,M=function(t){(c.__opened[e(this,m)-1]||c.__opened.length===1)&&t()},g=new WeakMap,c.__opened=[];let S=c;customElements.get("e-popover")||customElements.define("e-popover",S);var s,T,w,C,k;class H extends HTMLElement{constructor(){super();i(this,s,void 0);i(this,T,()=>{this.classList.add("triggered")});i(this,w,()=>{this.classList.add("opened")});i(this,C,()=>{this.classList.remove("opened")});i(this,k,()=>{this.classList.remove("triggered")});N.isBrowser&&j.element(this,{tabindex:this.getAttribute("tabindex")||"0",onClick:()=>{if(e(this,s)){const t=this.getAttribute("type")||"open";t==="open"||t==="toggle"&&!e(this,s).opened.current?e(this,s).open():(t==="close"||t==="toggle"&&e(this,s).opened.current)&&e(this,s).close()}},onKeydown:t=>{t.code==="Space"&&t.currentTarget.click()}})}get popoverElement(){return e(this,s)}connectedCallback(){var a;const t=this.getAttribute("target");if(t){let r=null;t==="parent"?r=this.closest("[popover-target]"):t==="sibling"?r=(a=this.parentElement)==null?void 0:a.querySelector("[popover-target]"):r=document.querySelector(`#${t}`)||this.getRootNode().querySelector(`#${t}`),r instanceof HTMLElement?(h(this,s,r),e(this,s).addEventListener("popoverTriggered",e(this,T)),e(this,s).addEventListener("popoverOpened",e(this,w)),e(this,s).addEventListener("popoverClosing",e(this,C)),e(this,s).addEventListener("popoverClosed",e(this,k))):console.warn(this,`target ${t} not found`)}}disconnectedCallback(){e(this,s)&&(e(this,s).removeEventListener("popoverTriggered",e(this,T)),e(this,s).removeEventListener("popoverOpened",e(this,w)),e(this,s).removeEventListener("popoverClosing",e(this,C)),e(this,s).removeEventListener("popoverClosed",e(this,k)))}}s=new WeakMap,T=new WeakMap,w=new WeakMap,C=new WeakMap,k=new WeakMap;customElements.get("e-popover-button")||customElements.define("e-popover-button",H);exports.PopoverButtonElement=H;exports.PopoverElement=S;
+"use strict";var M=(o,n,t)=>{if(!n.has(o))throw TypeError("Cannot "+t)};var e=(o,n,t)=>(M(o,n,"read from private field"),t?t.call(o):n.get(o)),i=(o,n,t)=>{if(n.has(o))throw TypeError("Cannot add the same private member more than once");n instanceof WeakSet?n.add(o):n.set(o,t)},h=(o,n,t,a)=>(M(o,n,"write to private field"),a?a.call(o,t):n.set(o,t),t);var O=(o,n,t)=>(M(o,n,"access private method"),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../attribute/index.cjs"),P=require("../Store-Cr3VaD9G.cjs"),B=require("../style-At6aDoqG.cjs"),I=require("../browser-CpzFX2xg.cjs");require("../ticker/index.cjs");const j=require("../tags-BdW7ATzD.cjs");var f,l,b,p,d,u,A,R,v,y,E,L,T,$,g;const c=class c extends HTMLElement{constructor(){super();i(this,A);i(this,v);i(this,T);i(this,f,void 0);i(this,l,void 0);i(this,b,void 0);i(this,p,void 0);i(this,d,void 0);i(this,u,void 0);i(this,E,void 0);i(this,L,void 0);i(this,g,void 0);h(this,f,-1),h(this,l,new P.Store(!1)),h(this,p,new H.Attribute(this,"history",!1)),h(this,d,new H.Attribute(this,"single",!1)),h(this,u,!1),this.open=(t=!0)=>{if(e(this,l).current)return;e(this,l).current=!0,e(this,d).current&&(c.__opened.forEach(r=>r.close()),c.__opened=[]),c.__opened.push(this),h(this,f,c.__opened.length-1),e(this,p).current&&e(this,u)&&history.pushState("","",e(this,A,R)),clearTimeout(e(this,b)),this.classList.add("triggered"),this.style.display="block",this.dispatchEvent(new CustomEvent("popoverTriggered"));const a=()=>{addEventListener("click",e(this,E)),addEventListener("keydown",e(this,L)),this.style.opacity="1",this.classList.add("opened"),this.dispatchEvent(new CustomEvent("popoverOpened"))};t?setTimeout(a):a()},this.close=()=>{if(e(this,l).current){if(e(this,l).current=!1,c.__opened=c.__opened.filter(t=>t!==this),e(this,p).current){const t=new URL(location.href);t.searchParams.delete(e(this,v,y)),history.replaceState(null,"",t.href)}this.classList.remove("opened"),this.style.opacity="0",this.dispatchEvent(new CustomEvent("popoverClosing")),removeEventListener("click",e(this,E)),removeEventListener("keydown",e(this,L)),setTimeout(()=>{this.classList.remove("triggered"),this.style.display="none",this.dispatchEvent(new CustomEvent("popoverClosed"))},B.getElementTransitionDurationMS(this)+10)}},h(this,E,t=>{O(this,T,$).call(this,()=>{var x;const r=t.composedPath()[0],_=r instanceof HTMLElement&&(this.contains(r)||((x=this.shadowRoot)==null?void 0:x.contains(r))),m=r instanceof HTMLElement&&r.hasAttribute("outside");(!_||m)&&this.close()})}),h(this,L,t=>{O(this,T,$).call(this,()=>{t.code==="Escape"&&this.close()})}),h(this,g,()=>{h(this,u,!1),e(this,l).current&&e(this,p).current&&!location.search.includes(e(this,v,y))?this.close():!e(this,l).current&&e(this,p).current&&location.search.includes(e(this,v,y))&&this.open(),h(this,u,!0)}),this.setAttribute("popover-target","")}get history(){return e(this,p)}get single(){return e(this,d)}get opened(){return e(this,l)}connectedCallback(){e(this,p).observe(),e(this,d).observe(),this.style.opacity="0",this.style.display="none",addEventListener("popstate",e(this,g)),setTimeout(()=>{e(this,g).call(this)},0)}disconnectedCallback(){e(this,p).unobserve(),e(this,d).unobserve(),c.__opened=c.__opened.filter(t=>t!==this),clearTimeout(e(this,b)),removeEventListener("popstate",e(this,g))}};f=new WeakMap,l=new WeakMap,b=new WeakMap,p=new WeakMap,d=new WeakMap,u=new WeakMap,A=new WeakSet,R=function(){return`${location.pathname}${location.search?location.search+"&":"?"}${e(this,v,y)}`},v=new WeakSet,y=function(){return`modal-${this.id}`},E=new WeakMap,L=new WeakMap,T=new WeakSet,$=function(t){(c.__opened[e(this,f)-1]||c.__opened.length===1)&&t()},g=new WeakMap,c.__opened=[];let q=c;customElements.get("e-popover")||customElements.define("e-popover",q);var s,w,C,k,S;class N extends HTMLElement{constructor(){super();i(this,s,void 0);i(this,w,()=>{this.classList.add("triggered")});i(this,C,()=>{this.classList.add("opened")});i(this,k,()=>{this.classList.remove("opened")});i(this,S,()=>{this.classList.remove("triggered")});I.isBrowser&&j.element(this,{tabindex:this.getAttribute("tabindex")||"0",onClick:()=>{if(e(this,s)){const t=this.getAttribute("type")||"open";t==="open"||t==="toggle"&&!e(this,s).opened.current?e(this,s).open():(t==="close"||t==="toggle"&&e(this,s).opened.current)&&e(this,s).close()}},onKeydown:t=>{t.code==="Space"&&t.currentTarget.click()}})}get popoverElement(){return e(this,s)}connectedCallback(){var a;const t=this.getAttribute("target");if(t){let r=null;if(t==="parent"){const _=this.closest("[popover-target]");if(_)r=_;else{const m=this.getRootNode();m instanceof ShadowRoot?r=m.host.closest("[popover-target]"):m instanceof HTMLElement&&(r=m.closest("[popover-target]"))}}else t==="sibling"?r=(a=this.parentElement)==null?void 0:a.querySelector("[popover-target]"):r=document.querySelector(`#${t}`)||this.getRootNode().querySelector(`#${t}`);r instanceof HTMLElement?(h(this,s,r),e(this,s).addEventListener("popoverTriggered",e(this,w)),e(this,s).addEventListener("popoverOpened",e(this,C)),e(this,s).addEventListener("popoverClosing",e(this,k)),e(this,s).addEventListener("popoverClosed",e(this,S))):console.warn(this,`target ${t} not found`)}}disconnectedCallback(){e(this,s)&&(e(this,s).removeEventListener("popoverTriggered",e(this,w)),e(this,s).removeEventListener("popoverOpened",e(this,C)),e(this,s).removeEventListener("popoverClosing",e(this,k)),e(this,s).removeEventListener("popoverClosed",e(this,S)))}}s=new WeakMap,w=new WeakMap,C=new WeakMap,k=new WeakMap,S=new WeakMap;customElements.get("e-popover-button")||customElements.define("e-popover-button",N);exports.PopoverButtonElement=N;exports.PopoverElement=q;

package/client-lib/popover/index.js

@@ -1,65 +1,65 @@
-var S = (o, n, t) => {
+var M = (o, n, t) => {
   if (!n.has(o))
     throw TypeError("Cannot " + t);
 };
-var e = (o, n, t) => (S(o, n, "read from private field"), t ? t.call(o) : n.get(o)), i = (o, n, t) => {
+var e = (o, n, t) => (M(o, n, "read from private field"), t ? t.call(o) : n.get(o)), i = (o, n, t) => {
   if (n.has(o))
     throw TypeError("Cannot add the same private member more than once");
   n instanceof WeakSet ? n.add(o) : n.set(o, t);
-}, h = (o, n, t, a) => (S(o, n, "write to private field"), a ? a.call(o, t) : n.set(o, t), t);
-var A = (o, n, t) => (S(o, n, "access private method"), t);
-import { Attribute as O } from "../attribute/index.js";
-import { S as R } from "../Store-Qr3SNOSf.js";
-import { g as B } from "../style-j2TwriJ_.js";
-import { i as N } from "../browser-0zX67oeU.js";
+}, h = (o, n, t, a) => (M(o, n, "write to private field"), a ? a.call(o, t) : n.set(o, t), t);
+var $ = (o, n, t) => (M(o, n, "access private method"), t);
+import { Attribute as R } from "../attribute/index.js";
+import { S as q } from "../Store-Qr3SNOSf.js";
+import { g as I } from "../style-j2TwriJ_.js";
+import { i as B } from "../browser-0zX67oeU.js";
 import "../ticker/index.js";
 import { e as D } from "../tags-C75owfOo.js";
-var g, c, y, l, d, u, _, H, v, L, f, E, b, x, m;
+var f, c, T, l, d, u, A, N, v, y, E, L, b, H, g;
 const p = class p extends HTMLElement {
   constructor() {
     super();
-    i(this, _);
+    i(this, A);
     i(this, v);
     i(this, b);
-    i(this, g, void 0);
+    i(this, f, void 0);
     i(this, c, void 0);
-    i(this, y, void 0);
+    i(this, T, void 0);
     i(this, l, void 0);
     i(this, d, void 0);
     i(this, u, void 0);
-    i(this, f, void 0);
     i(this, E, void 0);
-    i(this, m, void 0);
-    h(this, g, -1), h(this, c, new R(!1)), h(this, l, new O(this, "history", !1)), h(this, d, new O(this, "single", !1)), h(this, u, !1), this.open = (t = !0) => {
+    i(this, L, void 0);
+    i(this, g, void 0);
+    h(this, f, -1), h(this, c, new q(!1)), h(this, l, new R(this, "history", !1)), h(this, d, new R(this, "single", !1)), h(this, u, !1), this.open = (t = !0) => {
       if (e(this, c).current)
         return;
-      e(this, c).current = !0, e(this, d).current && (p.__opened.forEach((r) => r.close()), p.__opened = []), p.__opened.push(this), h(this, g, p.__opened.length - 1), e(this, l).current && e(this, u) && history.pushState("", "", e(this, _, H)), clearTimeout(e(this, y)), this.classList.add("triggered"), this.style.display = "block", this.dispatchEvent(new CustomEvent("popoverTriggered"));
+      e(this, c).current = !0, e(this, d).current && (p.__opened.forEach((r) => r.close()), p.__opened = []), p.__opened.push(this), h(this, f, p.__opened.length - 1), e(this, l).current && e(this, u) && history.pushState("", "", e(this, A, N)), clearTimeout(e(this, T)), this.classList.add("triggered"), this.style.display = "block", this.dispatchEvent(new CustomEvent("popoverTriggered"));
       const a = () => {
-        addEventListener("click", e(this, f)), addEventListener("keydown", e(this, E)), this.style.opacity = "1", this.classList.add("opened"), this.dispatchEvent(new CustomEvent("popoverOpened"));
+        addEventListener("click", e(this, E)), addEventListener("keydown", e(this, L)), this.style.opacity = "1", this.classList.add("opened"), this.dispatchEvent(new CustomEvent("popoverOpened"));
       };
       t ? setTimeout(a) : a();
     }, this.close = () => {
       if (e(this, c).current) {
         if (e(this, c).current = !1, p.__opened = p.__opened.filter((t) => t !== this), e(this, l).current) {
           const t = new URL(location.href);
-          t.searchParams.delete(e(this, v, L)), history.replaceState(null, "", t.href);
+          t.searchParams.delete(e(this, v, y)), history.replaceState(null, "", t.href);
         }
-        this.classList.remove("opened"), this.style.opacity = "0", this.dispatchEvent(new CustomEvent("popoverClosing")), removeEventListener("click", e(this, f)), removeEventListener("keydown", e(this, E)), setTimeout(() => {
+        this.classList.remove("opened"), this.style.opacity = "0", this.dispatchEvent(new CustomEvent("popoverClosing")), removeEventListener("click", e(this, E)), removeEventListener("keydown", e(this, L)), setTimeout(() => {
           this.classList.remove("triggered"), this.style.display = "none", this.dispatchEvent(new CustomEvent("popoverClosed"));
-        }, B(this) + 10);
+        }, I(this) + 10);
       }
-    }, h(this, f, (t) => {
-      A(this, b, x).call(this, () => {
-        var M;
-        const r = t.composedPath()[0], q = r instanceof HTMLElement && (this.contains(r) || ((M = this.shadowRoot) == null ? void 0 : M.contains(r))), I = r instanceof HTMLElement && r.hasAttribute("outside");
-        (!q || I) && this.close();
+    }, h(this, E, (t) => {
+      $(this, b, H).call(this, () => {
+        var O;
+        const r = t.composedPath()[0], _ = r instanceof HTMLElement && (this.contains(r) || ((O = this.shadowRoot) == null ? void 0 : O.contains(r))), m = r instanceof HTMLElement && r.hasAttribute("outside");
+        (!_ || m) && this.close();
       });
-    }), h(this, E, (t) => {
-      A(this, b, x).call(this, () => {
+    }), h(this, L, (t) => {
+      $(this, b, H).call(this, () => {
         t.code === "Escape" && this.close();
       });
-    }), h(this, m, () => {
-      h(this, u, !1), e(this, c).current && e(this, l).current && !location.search.includes(e(this, v, L)) ? this.close() : !e(this, c).current && e(this, l).current && location.search.includes(e(this, v, L)) && this.open(), h(this, u, !0);
+    }), h(this, g, () => {
+      h(this, u, !1), e(this, c).current && e(this, l).current && !location.search.includes(e(this, v, y)) ? this.close() : !e(this, c).current && e(this, l).current && location.search.includes(e(this, v, y)) && this.open(), h(this, u, !0);
     }), this.setAttribute("popover-target", "");
   }
   get history() {
@@ -72,41 +72,41 @@ const p = class p extends HTMLElement {
     return e(this, c);
   }
   connectedCallback() {
-    e(this, l).observe(), e(this, d).observe(), this.style.opacity = "0", this.style.display = "none", addEventListener("popstate", e(this, m)), setTimeout(() => {
-      e(this, m).call(this);
+    e(this, l).observe(), e(this, d).observe(), this.style.opacity = "0", this.style.display = "none", addEventListener("popstate", e(this, g)), setTimeout(() => {
+      e(this, g).call(this);
     }, 0);
   }
   disconnectedCallback() {
-    e(this, l).unobserve(), e(this, d).unobserve(), p.__opened = p.__opened.filter((t) => t !== this), clearTimeout(e(this, y)), removeEventListener("popstate", e(this, m));
+    e(this, l).unobserve(), e(this, d).unobserve(), p.__opened = p.__opened.filter((t) => t !== this), clearTimeout(e(this, T)), removeEventListener("popstate", e(this, g));
   }
 };
-g = new WeakMap(), c = new WeakMap(), y = new WeakMap(), l = new WeakMap(), d = new WeakMap(), u = new WeakMap(), _ = new WeakSet(), H = function() {
-  return `${location.pathname}${location.search ? location.search + "&" : "?"}${e(this, v, L)}`;
-}, v = new WeakSet(), L = function() {
+f = new WeakMap(), c = new WeakMap(), T = new WeakMap(), l = new WeakMap(), d = new WeakMap(), u = new WeakMap(), A = new WeakSet(), N = function() {
+  return `${location.pathname}${location.search ? location.search + "&" : "?"}${e(this, v, y)}`;
+}, v = new WeakSet(), y = function() {
   return `modal-${this.id}`;
-}, f = new WeakMap(), E = new WeakMap(), b = new WeakSet(), x = function(t) {
-  (p.__opened[e(this, g) - 1] || p.__opened.length === 1) && t();
-}, m = new WeakMap(), p.__opened = [];
-let $ = p;
-customElements.get("e-popover") || customElements.define("e-popover", $);
-var s, T, w, C, k;
+}, E = new WeakMap(), L = new WeakMap(), b = new WeakSet(), H = function(t) {
+  (p.__opened[e(this, f) - 1] || p.__opened.length === 1) && t();
+}, g = new WeakMap(), p.__opened = [];
+let x = p;
+customElements.get("e-popover") || customElements.define("e-popover", x);
+var s, w, C, k, S;
 class K extends HTMLElement {
   constructor() {
     super();
     i(this, s, void 0);
-    i(this, T, () => {
+    i(this, w, () => {
       this.classList.add("triggered");
     });
-    i(this, w, () => {
+    i(this, C, () => {
       this.classList.add("opened");
     });
-    i(this, C, () => {
+    i(this, k, () => {
       this.classList.remove("opened");
     });
-    i(this, k, () => {
+    i(this, S, () => {
       this.classList.remove("triggered");
     });
-    N && D(this, {
+    B && D(this, {
       tabindex: this.getAttribute("tabindex") || "0",
       onClick: () => {
         if (e(this, s)) {
@@ -127,40 +127,50 @@ class K extends HTMLElement {
     const t = this.getAttribute("target");
     if (t) {
       let r = null;
-      t === "parent" ? r = this.closest("[popover-target]") : t === "sibling" ? r = (a = this.parentElement) == null ? void 0 : a.querySelector("[popover-target]") : r = document.querySelector(`#${t}`) || this.getRootNode().querySelector(`#${t}`), r instanceof HTMLElement ? (h(this, s, r), e(this, s).addEventListener(
+      if (t === "parent") {
+        const _ = this.closest("[popover-target]");
+        if (_)
+          r = _;
+        else {
+          const m = this.getRootNode();
+          m instanceof ShadowRoot ? r = m.host.closest("[popover-target]") : m instanceof HTMLElement && (r = m.closest("[popover-target]"));
+        }
+      } else
+        t === "sibling" ? r = (a = this.parentElement) == null ? void 0 : a.querySelector("[popover-target]") : r = document.querySelector(`#${t}`) || this.getRootNode().querySelector(`#${t}`);
+      r instanceof HTMLElement ? (h(this, s, r), e(this, s).addEventListener(
         "popoverTriggered",
-        e(this, T)
+        e(this, w)
       ), e(this, s).addEventListener(
         "popoverOpened",
-        e(this, w)
+        e(this, C)
       ), e(this, s).addEventListener(
         "popoverClosing",
-        e(this, C)
+        e(this, k)
       ), e(this, s).addEventListener(
         "popoverClosed",
-        e(this, k)
+        e(this, S)
       )) : console.warn(this, `target ${t} not found`);
     }
   }
   disconnectedCallback() {
     e(this, s) && (e(this, s).removeEventListener(
       "popoverTriggered",
-      e(this, T)
+      e(this, w)
     ), e(this, s).removeEventListener(
       "popoverOpened",
-      e(this, w)
+      e(this, C)
     ), e(this, s).removeEventListener(
       "popoverClosing",
-      e(this, C)
+      e(this, k)
     ), e(this, s).removeEventListener(
       "popoverClosed",
-      e(this, k)
+      e(this, S)
     ));
   }
 }
-s = new WeakMap(), T = new WeakMap(), w = new WeakMap(), C = new WeakMap(), k = new WeakMap();
+s = new WeakMap(), w = new WeakMap(), C = new WeakMap(), k = new WeakMap(), S = new WeakMap();
 customElements.get("e-popover-button") || customElements.define("e-popover-button", K);
 export {
   K as PopoverButtonElement,
-  $ as PopoverElement
+  x as PopoverElement
 };

package/package.json

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

package/server-lib/optimizer/index.js

@@ -234,6 +234,7 @@ async function inputFiles({
               quality: 80,
               scale: 1,
               webp: false,
+              forceJPG: false,
               destinationPath,
               ...(_d = settings == null ? void 0 : settings.image) == null ? void 0 : _d.call(settings, { destinationPath })
             }
@@ -273,7 +274,6 @@ function getNumberSetting(value, min, max) {
 async function optimizeImage(source) {
   const { settings } = source;
   const content = await getBuffer(source.content);
-  const ext = extname(settings.destinationPath).toLowerCase();
   const image = sharp(content);
   const meta = await image.metadata();
   const width = meta.width;
@@ -281,6 +281,8 @@ async function optimizeImage(source) {
   const output = [];
   const scale = getNumberSetting(settings.scale, 0, 1);
   const quality = getNumberSetting(settings.quality, 0, 100);
+  let destinationPath = settings.destinationPath;
+  let ext = extname(destinationPath).toLowerCase();
   if (width && height) {
     if (scale) {
       image.resize(Math.floor(width * scale), Math.floor(height * scale));
@@ -292,17 +294,26 @@ async function optimizeImage(source) {
       quality
     });
   } else if (ext === ".png") {
-    image.png({
-      compressionLevel: 9,
-      adaptiveFiltering: true,
-      quality,
-      effort: 8
-    });
+    if (settings.forceJPG) {
+      const bg = typeof settings.forceJPG === "string" ? settings.forceJPG : "#ffffff";
+      image.jpeg({
+        mozjpeg: true
+      }).flatten({ background: bg });
+      destinationPath = replaceExtension(settings.destinationPath, "jpg");
+      ext = ".jpg";
+    } else {
+      image.png({
+        compressionLevel: 9,
+        adaptiveFiltering: true,
+        quality,
+        effort: 8
+      });
+    }
   }
   const buffer = await image.toBuffer();
   output.push({
     data: buffer,
-    destinationPath: settings.destinationPath
+    destinationPath
   });
   if (settings == null ? void 0 : settings.webp) {
     const buffer2 = await image.webp({
@@ -311,17 +322,14 @@ async function optimizeImage(source) {
     }).toBuffer();
     output.push({
       data: buffer2,
-      destinationPath: replaceExtension(settings.destinationPath, "webp")
+      destinationPath: replaceExtension(destinationPath, "webp")
     });
   }
   if (settings == null ? void 0 : settings.placeholder) {
     const buffer2 = await image.resize(20, 20).blur(10).toBuffer();
     output.push({
       data: buffer2,
-      destinationPath: replaceExtension(
-        settings.destinationPath,
-        `placeholder${ext}`
-      )
+      destinationPath: replaceExtension(destinationPath, `placeholder${ext}`)
     });
   }
   return output;

package/server-lib/optimizer/types.d.ts

@@ -20,6 +20,7 @@ export type ImageSource = Source<Buffer | File, 'image', {
     scale?: number;
     placeholder?: boolean;
     webp?: boolean;
+    forceJPG?: boolean | string;
 }>;
 export type VideoSource = Source<Buffer | File, 'video', {
     destinationPath: string;