aptechka 0.41.3 → 0.41.5

package/lib/source/index.cjs

@@ -1 +1 @@
-"use strict";var b=r=>{throw TypeError(r)};var k=(r,n,t)=>n.has(r)||b("Cannot "+t);var e=(r,n,t)=>(k(r,n,"read from private field"),t?t.call(r):n.get(r)),u=(r,n,t)=>n.has(r)?b("Cannot add the same private member more than once"):n instanceof WeakSet?n.add(r):n.set(r,t),s=(r,n,t,h)=>(k(r,n,"write to private field"),h?h.call(r,t):n.set(r,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const _=require("../order/index.cjs"),B=require("../window-resizer/vanilla/index.cjs"),z=require("../Store-C2J4Q87x.cjs");var w,f,M,d,a,o,y;class I{constructor(n){u(this,w);u(this,f);u(this,M);u(this,d);u(this,a);u(this,o);u(this,y);s(this,w,n);let t=n.split(".");const h=/\d+x/g,p=t.find(m=>m.match(h));s(this,M,p?parseInt(p):1),p&&(t=t.slice(0,-1)),s(this,f,t.length>1?t.slice(0,-1).join("."):t.join("."));const c=/\d+max/g,g=/\d+min/g,S=/\d+mar/g,E=/\d+mir/g,$=t.find(m=>m.match(c)),i=t.find(m=>m.match(g)),l=t.find(m=>m.match(S)),V=t.find(m=>m.match(E));l?(s(this,a,parseInt(l)),s(this,o,"max"),s(this,d,`(max-aspect-ratio: ${e(this,a)})`)):V?(s(this,a,parseInt(V)),s(this,o,"max"),s(this,d,`(min-aspect-ratio: ${e(this,a)})`)):$?(s(this,a,parseInt($)),s(this,o,"max"),s(this,d,`(max-width: ${e(this,a)}px)`)):i?(s(this,a,parseInt(i)),s(this,d,`(min-width: ${e(this,a)}px)`),s(this,o,"min")):(s(this,a,0),s(this,d,`(min-width: ${e(this,a)}px)`),s(this,o,"min")),s(this,f,e(this,f).replace(`.${e(this,a)}${e(this,o)}`,"")),s(this,y,t[t.length-1]===e(this,f)?"":"."+t[t.length-1]),s(this,y,e(this,y).replace(`.${e(this,a)}${e(this,o)}`,""))}get url(){return e(this,w)}get name(){return e(this,f)}get density(){return e(this,M)}get query(){return e(this,d)}get extension(){return e(this,y)}get queryType(){return e(this,o)}get queryValue(){return e(this,a)}}w=new WeakMap,f=new WeakMap,M=new WeakMap,d=new WeakMap,a=new WeakMap,o=new WeakMap,y=new WeakMap;var x;class T{constructor(n,t){u(this,x);s(this,x,new Map);const h=(t==null?void 0:t.mediaBuckets)!==!1,p=typeof n=="string"?h?n.trim().split(",").map(i=>i.trim()).filter(i=>!!i):[n]:n,c=[];p.forEach(i=>{const l=new I(i);c.push([l.query,l])});const g=c.filter(i=>i[1].queryType.includes("max")).sort((i,l)=>l[1].queryValue-i[1].queryValue),S=c.filter(i=>i[1].queryType.includes("min")&&i[1].queryValue!==0).sort((i,l)=>i[1].queryValue-l[1].queryValue),E=c.filter(i=>i[0]==="(min-width: 0px)");(E?[...E,...g,...S]:[...g,...S]).forEach(i=>{e(this,x).has(i[0])||e(this,x).set(i[0],[]),e(this,x).get(i[0]).push(i[1])})}get mediaBuckets(){return e(this,x)}}x=new WeakMap;var R,q;class A extends z.Store{constructor(t){super(void 0);u(this,R);u(this,q,()=>{let t;e(this,R).mediaBuckets.forEach((c,g)=>{matchMedia(g).matches&&(t=c)});let h,p=0;t==null||t.forEach(c=>{c.density>p&&c.density<=Math.max(devicePixelRatio,1)&&(p=c.density,h=c)}),t!=null&&t.length&&!h&&(h=t[0]),this.current=h});s(this,R,new T(t.srcset,t.sourceSetOptions))}close(){super.close(),this.disconnect()}connect(){B.windowResizer.subscribe(e(this,q),_.RESIZE_ORDER.SOURCE_MANAGER),e(this,q).call(this)}disconnect(){B.windowResizer.unsubscribe(e(this,q))}}R=new WeakMap,q=new WeakMap;exports.Source=I;exports.SourceManager=A;exports.SourceSet=T;
+"use strict";var I=r=>{throw TypeError(r)};var V=(r,n,t)=>n.has(r)||I("Cannot "+t);var e=(r,n,t)=>(V(r,n,"read from private field"),t?t.call(r):n.get(r)),o=(r,n,t)=>n.has(r)?I("Cannot add the same private member more than once"):n instanceof WeakSet?n.add(r):n.set(r,t),s=(r,n,t,c)=>(V(r,n,"write to private field"),c?c.call(r,t):n.set(r,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const _=require("../order/index.cjs"),k=require("../window-resizer/vanilla/index.cjs"),z=require("../Store-C2J4Q87x.cjs");var w,f,M,d,a,u,y;class B{constructor(n){o(this,w);o(this,f);o(this,M);o(this,d);o(this,a);o(this,u);o(this,y);s(this,w,n);let t=n.split(".");const c=/\b\d{1,2}x\b/g,p=t.find(l=>l.match(c)&&parseInt(l));s(this,M,p?parseInt(p):1),p&&(t=t.slice(0,-1)),s(this,f,t.length>1?t.slice(0,-1).join("."):t.join("."));const h=/\d+max/g,g=/\d+min/g,E=/\d+mar/g,$=/\d+mir/g,b=t.find(l=>l.match(h)),i=t.find(l=>l.match(g)),m=t.find(l=>l.match(E)),S=t.find(l=>l.match($));m?(s(this,a,parseInt(m)),s(this,u,"max"),s(this,d,`(max-aspect-ratio: ${e(this,a)})`)):S?(s(this,a,parseInt(S)),s(this,u,"max"),s(this,d,`(min-aspect-ratio: ${e(this,a)})`)):b?(s(this,a,parseInt(b)),s(this,u,"max"),s(this,d,`(max-width: ${e(this,a)}px)`)):i?(s(this,a,parseInt(i)),s(this,d,`(min-width: ${e(this,a)}px)`),s(this,u,"min")):(s(this,a,0),s(this,d,`(min-width: ${e(this,a)}px)`),s(this,u,"min")),s(this,f,e(this,f).replace(`.${e(this,a)}${e(this,u)}`,"")),s(this,y,t[t.length-1]===e(this,f)?"":"."+t[t.length-1]),s(this,y,e(this,y).replace(`.${e(this,a)}${e(this,u)}`,""))}get url(){return e(this,w)}get name(){return e(this,f)}get density(){return e(this,M)}get query(){return e(this,d)}get extension(){return e(this,y)}get queryType(){return e(this,u)}get queryValue(){return e(this,a)}}w=new WeakMap,f=new WeakMap,M=new WeakMap,d=new WeakMap,a=new WeakMap,u=new WeakMap,y=new WeakMap;var x;class T{constructor(n,t){o(this,x);s(this,x,new Map);const c=(t==null?void 0:t.mediaBuckets)!==!1,p=typeof n=="string"?c?n.trim().split(",").map(i=>i.trim()).filter(i=>!!i):[n]:n,h=[];p.forEach(i=>{const m=new B(i);h.push([m.query,m])});const g=h.filter(i=>i[1].queryType.includes("max")).sort((i,m)=>m[1].queryValue-i[1].queryValue),E=h.filter(i=>i[1].queryType.includes("min")&&i[1].queryValue!==0).sort((i,m)=>i[1].queryValue-m[1].queryValue),$=h.filter(i=>i[0]==="(min-width: 0px)");($?[...$,...g,...E]:[...g,...E]).forEach(i=>{e(this,x).has(i[0])||e(this,x).set(i[0],[]),e(this,x).get(i[0]).push(i[1])})}get mediaBuckets(){return e(this,x)}}x=new WeakMap;var R,q;class A extends z.Store{constructor(t){super(void 0);o(this,R);o(this,q,()=>{let t;e(this,R).mediaBuckets.forEach((h,g)=>{matchMedia(g).matches&&(t=h)});let c,p=0;t==null||t.forEach(h=>{h.density>p&&h.density<=Math.max(devicePixelRatio,1)&&(p=h.density,c=h)}),t!=null&&t.length&&!c&&(c=t[0]),console.log(c==null?void 0:c.name),this.current=c});s(this,R,new T(t.srcset,t.sourceSetOptions))}close(){super.close(),this.disconnect()}connect(){k.windowResizer.subscribe(e(this,q),_.RESIZE_ORDER.SOURCE_MANAGER),e(this,q).call(this)}disconnect(){k.windowResizer.unsubscribe(e(this,q))}}R=new WeakMap,q=new WeakMap;exports.Source=B;exports.SourceManager=A;exports.SourceSet=T;

package/lib/source/index.js

@@ -1,31 +1,31 @@
-var B = (r) => {
+var b = (r) => {
   throw TypeError(r);
 };
-var I = (r, n, t) => n.has(r) || B("Cannot " + t);
-var e = (r, n, t) => (I(r, n, "read from private field"), t ? t.call(r) : n.get(r)), m = (r, n, t) => n.has(r) ? B("Cannot add the same private member more than once") : n instanceof WeakSet ? n.add(r) : n.set(r, t), i = (r, n, t, c) => (I(r, n, "write to private field"), c ? c.call(r, t) : n.set(r, t), t);
+var k = (r, n, t) => n.has(r) || b("Cannot " + t);
+var e = (r, n, t) => (k(r, n, "read from private field"), t ? t.call(r) : n.get(r)), m = (r, n, t) => n.has(r) ? b("Cannot add the same private member more than once") : n instanceof WeakSet ? n.add(r) : n.set(r, t), i = (r, n, t, h) => (k(r, n, "write to private field"), h ? h.call(r, t) : n.set(r, t), t);
 import { RESIZE_ORDER as A } from "../order/index.js";
-import { windowResizer as b } from "../window-resizer/vanilla/index.js";
-import { S } from "../Store-Cm3LPXlx.js";
-var w, f, E, d, h, o, y;
-class T {
+import { windowResizer as B } from "../window-resizer/vanilla/index.js";
+import { S as T } from "../Store-Cm3LPXlx.js";
+var w, f, E, d, a, o, y;
+class O {
   constructor(n) {
     m(this, w);
     m(this, f);
     m(this, E);
     m(this, d);
-    m(this, h);
+    m(this, a);
     m(this, o);
     m(this, y);
     i(this, w, n);
     let t = n.split(".");
-    const c = /\d+x/g, p = t.find((l) => l.match(c));
+    const h = /\b\d{1,2}x\b/g, p = t.find((u) => u.match(h) && parseInt(u));
     i(this, E, p ? parseInt(p) : 1), p && (t = t.slice(0, -1)), i(this, f, t.length > 1 ? t.slice(0, -1).join(".") : t.join("."));
-    const a = /\d+max/g, g = /\d+min/g, R = /\d+mar/g, $ = /\d+mir/g, V = t.find((l) => l.match(a)), s = t.find((l) => l.match(g)), u = t.find((l) => l.match(R)), k = t.find((l) => l.match($));
-    u ? (i(this, h, parseInt(u)), i(this, o, "max"), i(this, d, `(max-aspect-ratio: ${e(this, h)})`)) : k ? (i(this, h, parseInt(k)), i(this, o, "max"), i(this, d, `(min-aspect-ratio: ${e(this, h)})`)) : V ? (i(this, h, parseInt(V)), i(this, o, "max"), i(this, d, `(max-width: ${e(this, h)}px)`)) : s ? (i(this, h, parseInt(s)), i(this, d, `(min-width: ${e(this, h)}px)`), i(this, o, "min")) : (i(this, h, 0), i(this, d, `(min-width: ${e(this, h)}px)`), i(this, o, "min")), i(this, f, e(this, f).replace(
-      `.${e(this, h)}${e(this, o)}`,
+    const c = /\d+max/g, g = /\d+min/g, R = /\d+mar/g, $ = /\d+mir/g, I = t.find((u) => u.match(c)), s = t.find((u) => u.match(g)), l = t.find((u) => u.match(R)), V = t.find((u) => u.match($));
+    l ? (i(this, a, parseInt(l)), i(this, o, "max"), i(this, d, `(max-aspect-ratio: ${e(this, a)})`)) : V ? (i(this, a, parseInt(V)), i(this, o, "max"), i(this, d, `(min-aspect-ratio: ${e(this, a)})`)) : I ? (i(this, a, parseInt(I)), i(this, o, "max"), i(this, d, `(max-width: ${e(this, a)}px)`)) : s ? (i(this, a, parseInt(s)), i(this, d, `(min-width: ${e(this, a)}px)`), i(this, o, "min")) : (i(this, a, 0), i(this, d, `(min-width: ${e(this, a)}px)`), i(this, o, "min")), i(this, f, e(this, f).replace(
+      `.${e(this, a)}${e(this, o)}`,
       ""
     )), i(this, y, t[t.length - 1] === e(this, f) ? "" : "." + t[t.length - 1]), i(this, y, e(this, y).replace(
-      `.${e(this, h)}${e(this, o)}`,
+      `.${e(this, a)}${e(this, o)}`,
       ""
     ));
   }
@@ -48,21 +48,21 @@ class T {
     return e(this, o);
   }
   get queryValue() {
-    return e(this, h);
+    return e(this, a);
   }
 }
-w = new WeakMap(), f = new WeakMap(), E = new WeakMap(), d = new WeakMap(), h = new WeakMap(), o = new WeakMap(), y = new WeakMap();
+w = new WeakMap(), f = new WeakMap(), E = new WeakMap(), d = new WeakMap(), a = new WeakMap(), o = new WeakMap(), y = new WeakMap();
 var x;
-class O {
+class P {
   constructor(n, t) {
     m(this, x);
     i(this, x, /* @__PURE__ */ new Map());
-    const c = (t == null ? void 0 : t.mediaBuckets) !== !1, p = typeof n == "string" ? c ? n.trim().split(",").map((s) => s.trim()).filter((s) => !!s) : [n] : n, a = [];
+    const h = (t == null ? void 0 : t.mediaBuckets) !== !1, p = typeof n == "string" ? h ? n.trim().split(",").map((s) => s.trim()).filter((s) => !!s) : [n] : n, c = [];
     p.forEach((s) => {
-      const u = new T(s);
-      a.push([u.query, u]);
+      const l = new O(s);
+      c.push([l.query, l]);
     });
-    const g = a.filter((s) => s[1].queryType.includes("max")).sort((s, u) => u[1].queryValue - s[1].queryValue), R = a.filter((s) => s[1].queryType.includes("min") && s[1].queryValue !== 0).sort((s, u) => s[1].queryValue - u[1].queryValue), $ = a.filter((s) => s[0] === "(min-width: 0px)");
+    const g = c.filter((s) => s[1].queryType.includes("max")).sort((s, l) => l[1].queryValue - s[1].queryValue), R = c.filter((s) => s[1].queryType.includes("min") && s[1].queryValue !== 0).sort((s, l) => s[1].queryValue - l[1].queryValue), $ = c.filter((s) => s[0] === "(min-width: 0px)");
     ($ ? [...$, ...g, ...R] : [...g, ...R]).forEach((s) => {
       e(this, x).has(s[0]) || e(this, x).set(s[0], []), e(this, x).get(s[0]).push(s[1]);
     });
@@ -73,35 +73,35 @@ class O {
 }
 x = new WeakMap();
 var M, q;
-class _ extends S {
+class _ extends T {
   constructor(t) {
     super(void 0);
     m(this, M);
     m(this, q, () => {
       let t;
-      e(this, M).mediaBuckets.forEach((a, g) => {
-        matchMedia(g).matches && (t = a);
+      e(this, M).mediaBuckets.forEach((c, g) => {
+        matchMedia(g).matches && (t = c);
       });
-      let c, p = 0;
-      t == null || t.forEach((a) => {
-        a.density > p && a.density <= Math.max(devicePixelRatio, 1) && (p = a.density, c = a);
-      }), t != null && t.length && !c && (c = t[0]), this.current = c;
+      let h, p = 0;
+      t == null || t.forEach((c) => {
+        c.density > p && c.density <= Math.max(devicePixelRatio, 1) && (p = c.density, h = c);
+      }), t != null && t.length && !h && (h = t[0]), console.log(h == null ? void 0 : h.name), this.current = h;
     });
-    i(this, M, new O(t.srcset, t.sourceSetOptions));
+    i(this, M, new P(t.srcset, t.sourceSetOptions));
   }
   close() {
     super.close(), this.disconnect();
   }
   connect() {
-    b.subscribe(e(this, q), A.SOURCE_MANAGER), e(this, q).call(this);
+    B.subscribe(e(this, q), A.SOURCE_MANAGER), e(this, q).call(this);
   }
   disconnect() {
-    b.unsubscribe(e(this, q));
+    B.unsubscribe(e(this, q));
   }
 }
 M = new WeakMap(), q = new WeakMap();
 export {
-  T as Source,
+  O as Source,
   _ as SourceManager,
-  O as SourceSet
+  P as SourceSet
 };

package/package.json

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