aptechka 0.88.0 → 0.88.1

package/lib/color/Color.d.ts

@@ -1,3 +1,14 @@
+export interface ColorToStringOptions extends Partial<ColorRGBA> {
+}
+export interface ColorMixOptions {
+    opacityMult?: number;
+}
+export interface ColorRGBA {
+    r: number;
+    g: number;
+    b: number;
+    a: number;
+}
 export declare class Color {
     #private;
     constructor(color: string);
@@ -12,8 +23,15 @@ export declare class Color {
         b: number;
         a: number;
     };
-    mix(otherColor: Color, ratio?: number): Color;
-    toString(): string;
-    toRGBString(): string;
-    toRGBAString(): string;
+    toString(options?: ColorToStringOptions): string;
+    toRGBString(options?: Omit<ColorToStringOptions, 'a'>): string;
+    toRGBAString(options?: ColorToStringOptions): string;
+    mix(otherColor: Color, ratio?: number, options?: ColorMixOptions): Color;
+    mixToRGBAString(otherColor: Color, ratio?: number, options?: ColorMixOptions): string;
+    mixToRGBA(otherColor: Color, ratio?: number, options?: ColorMixOptions): {
+        r: number;
+        g: number;
+        b: number;
+        a: number;
+    };
 }

package/lib/color/index.cjs

@@ -1 +1 @@
-"use strict";var __defProp=Object.defineProperty;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};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"});var _hex,_rgba,_Color_instances,parseColor_fn,parseHex_fn,parseRgb_fn,setRGBA_fn,setHexFromRGBA_fn;const _Color=class _Color{constructor(color){__privateAdd(this,_Color_instances);__privateAdd(this,_hex,"");__privateAdd(this,_rgba,{r:0,g:0,b:0,a:1});__privateMethod(this,_Color_instances,parseColor_fn).call(this,color)}get r(){return __privateGet(this,_rgba).r}get g(){return __privateGet(this,_rgba).g}get b(){return __privateGet(this,_rgba).b}get a(){return __privateGet(this,_rgba).a}get hex(){return __privateGet(this,_hex)}get rgba(){return __spreadValues({},__privateGet(this,_rgba))}mix(otherColor,ratio=.5){if(!(otherColor instanceof _Color))throw new Error("Argument must be an instance of Color");if(ratio<0||ratio>1)throw new Error("Ratio must be between 0 and 1");const r=Math.round(this.r*(1-ratio)+otherColor.r*ratio),g=Math.round(this.g*(1-ratio)+otherColor.g*ratio),b=Math.round(this.b*(1-ratio)+otherColor.b*ratio),a=this.a*(1-ratio)+otherColor.a*ratio;return new _Color(`rgba(${r}, ${g}, ${b}, ${a})`)}toString(){return this.a===1?this.hex:`rgba(${this.r}, ${this.g}, ${this.b}, ${this.a})`}toRGBString(){return`rgb(${this.r}, ${this.g}, ${this.b})`}toRGBAString(){return`rgba(${this.r}, ${this.g}, ${this.b}, ${this.a})`}};_hex=new WeakMap,_rgba=new WeakMap,_Color_instances=new WeakSet,parseColor_fn=__name(function(color){if(typeof color!="string")throw new Error("Color must be a string");const trimmedColor=color.trim().toLowerCase();if(trimmedColor.startsWith("#"))__privateMethod(this,_Color_instances,parseHex_fn).call(this,trimmedColor);else if(trimmedColor.startsWith("rgb"))__privateMethod(this,_Color_instances,parseRgb_fn).call(this,trimmedColor);else throw new Error("Unsupported color format. Use hex, rgb, or rgba.")},"#parseColor"),parseHex_fn=__name(function(hexColor){let hex=hexColor.replace("#","");if(hex.length===3&&(hex=hex.split("").map(char=>char+char).join("")),hex.length===8){const r=parseInt(hex.substring(0,2),16),g=parseInt(hex.substring(2,4),16),b=parseInt(hex.substring(4,6),16),a=parseInt(hex.substring(6,8),16)/255;__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,a),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this);return}if(hex.length===6){const r=parseInt(hex.substring(0,2),16),g=parseInt(hex.substring(2,4),16),b=parseInt(hex.substring(4,6),16);__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,1),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this);return}throw new Error("Invalid HEX color format")},"#parseHex"),parseRgb_fn=__name(function(rgbColor){const match=rgbColor.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*([\d.]+))?\)/);if(!match)throw new Error("Invalid RGB/RGBA color format");const r=Math.max(0,Math.min(255,parseInt(match[1]))),g=Math.max(0,Math.min(255,parseInt(match[2]))),b=Math.max(0,Math.min(255,parseInt(match[3]))),a=match[4]?Math.max(0,Math.min(1,parseFloat(match[4]))):1;__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,a),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this)},"#parseRgb"),setRGBA_fn=__name(function(r,g,b,a){__privateSet(this,_rgba,{r:Math.round(r),g:Math.round(g),b:Math.round(b),a:Math.round(a*100)/100})},"#setRGBA"),setHexFromRGBA_fn=__name(function(){const{r,g,b,a}=__privateGet(this,_rgba),hexR=r.toString(16).padStart(2,"0"),hexG=g.toString(16).padStart(2,"0"),hexB=b.toString(16).padStart(2,"0");if(__privateSet(this,_hex,`#${hexR}${hexG}${hexB}`),a<1){const hexA=Math.round(a*255).toString(16).padStart(2,"0");__privateSet(this,_hex,__privateGet(this,_hex)+hexA)}},"#setHexFromRGBA"),__name(_Color,"Color");let Color=_Color;var _colorMap,_DocumentColors_instances,collectColors_fn;const _DocumentColors=class _DocumentColors{constructor(){__privateAdd(this,_DocumentColors_instances);__privateAdd(this,_colorMap);__privateSet(this,_colorMap,new Map),__privateMethod(this,_DocumentColors_instances,collectColors_fn).call(this)}get size(){return __privateGet(this,_colorMap).size}get(variableName){return __privateGet(this,_colorMap).get(variableName)}getAll(){return new Map(__privateGet(this,_colorMap))}getAllAsObject(){const result={};return __privateGet(this,_colorMap).forEach((color,variableName)=>{result[variableName]=color}),result}getVariableNames(){return Array.from(__privateGet(this,_colorMap).keys())}refresh(){__privateGet(this,_colorMap).clear(),__privateMethod(this,_DocumentColors_instances,collectColors_fn).call(this)}getColor(variableName){const color=__privateGet(this,_colorMap).get(variableName);if(!color)throw new Error(`Цветовая переменная ${variableName} не найдена`);return color}has(variableName){return __privateGet(this,_colorMap).has(variableName)}};_colorMap=new WeakMap,_DocumentColors_instances=new WeakSet,collectColors_fn=__name(function(){const styles=getComputedStyle(document.documentElement);Array.from(document.styleSheets).forEach(stylesheet=>{Array.from(stylesheet.cssRules).forEach(rule=>{rule instanceof CSSStyleRule&&rule.selectorText==="html"&&Array.from(rule.style).forEach(variableName=>{const value=styles.getPropertyValue(variableName).trim();try{const color=new Color(value);__privateGet(this,_colorMap).set(variableName,color)}catch(error){console.warn(`Не удалось распарсить цвет ${variableName}: ${value}`,error)}})})})},"#collectColors"),__name(_DocumentColors,"DocumentColors");let DocumentColors=_DocumentColors;exports.Color=Color;exports.DocumentColors=DocumentColors;
+"use strict";var __defProp=Object.defineProperty;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};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"});var _hex,_rgba,_Color_instances,rgbaChannelsToString_fn,parseColor_fn,parseHex_fn,parseRgb_fn,setRGBA_fn,setHexFromRGBA_fn;const _Color=class _Color{constructor(color){__privateAdd(this,_Color_instances);__privateAdd(this,_hex,"");__privateAdd(this,_rgba,{r:0,g:0,b:0,a:1});__privateMethod(this,_Color_instances,parseColor_fn).call(this,color)}get r(){return __privateGet(this,_rgba).r}get g(){return __privateGet(this,_rgba).g}get b(){return __privateGet(this,_rgba).b}get a(){return __privateGet(this,_rgba).a}get hex(){return __privateGet(this,_hex)}get rgba(){return __spreadValues({},__privateGet(this,_rgba))}toString(options){return this.a===1&&!options?this.hex:this.toRGBAString(options)}toRGBString(options){return`rgb(${(options==null?void 0:options.r)||this.r}, ${(options==null?void 0:options.g)||this.g}, ${(options==null?void 0:options.b)||this.b})`}toRGBAString(options){return`rgba(${(options==null?void 0:options.r)||this.r}, ${(options==null?void 0:options.g)||this.g}, ${(options==null?void 0:options.b)||this.b}, ${(options==null?void 0:options.a)||this.a})`}mix(otherColor,ratio=.5,options){const rgba=this.mixToRGBA(otherColor,ratio,options);return new _Color(__privateMethod(this,_Color_instances,rgbaChannelsToString_fn).call(this,rgba))}mixToRGBAString(otherColor,ratio=.5,options){const rgba=this.mixToRGBA(otherColor,ratio,options);return __privateMethod(this,_Color_instances,rgbaChannelsToString_fn).call(this,rgba)}mixToRGBA(otherColor,ratio=.5,options){if(!(otherColor instanceof _Color))throw new Error("Argument must be an instance of Color");if(ratio<0||ratio>1)throw new Error("Ratio must be between 0 and 1");const r=Math.round(this.r*(1-ratio)+otherColor.r*ratio),g=Math.round(this.g*(1-ratio)+otherColor.g*ratio),b=Math.round(this.b*(1-ratio)+otherColor.b*ratio),a=(this.a*(1-ratio)+otherColor.a*ratio)*((options==null?void 0:options.opacityMult)||1);return{r,g,b,a}}};_hex=new WeakMap,_rgba=new WeakMap,_Color_instances=new WeakSet,rgbaChannelsToString_fn=__name(function(rgba){return`rgba(${rgba.r}, ${rgba.g}, ${rgba.b}, ${rgba.a})`},"#rgbaChannelsToString"),parseColor_fn=__name(function(color){if(typeof color!="string")throw new Error("Color must be a string");const trimmedColor=color.trim().toLowerCase();if(trimmedColor.startsWith("#"))__privateMethod(this,_Color_instances,parseHex_fn).call(this,trimmedColor);else if(trimmedColor.startsWith("rgb"))__privateMethod(this,_Color_instances,parseRgb_fn).call(this,trimmedColor);else throw new Error("Unsupported color format. Use hex, rgb, or rgba.")},"#parseColor"),parseHex_fn=__name(function(hexColor){let hex=hexColor.replace("#","");if(hex.length===3&&(hex=hex.split("").map(char=>char+char).join("")),hex.length===8){const r=parseInt(hex.substring(0,2),16),g=parseInt(hex.substring(2,4),16),b=parseInt(hex.substring(4,6),16),a=parseInt(hex.substring(6,8),16)/255;__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,a),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this);return}if(hex.length===6){const r=parseInt(hex.substring(0,2),16),g=parseInt(hex.substring(2,4),16),b=parseInt(hex.substring(4,6),16);__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,1),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this);return}throw new Error("Invalid HEX color format")},"#parseHex"),parseRgb_fn=__name(function(rgbColor){const match=rgbColor.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*([\d.]+))?\)/);if(!match)throw new Error("Invalid RGB/RGBA color format");const r=Math.max(0,Math.min(255,parseInt(match[1]))),g=Math.max(0,Math.min(255,parseInt(match[2]))),b=Math.max(0,Math.min(255,parseInt(match[3]))),a=match[4]?Math.max(0,Math.min(1,parseFloat(match[4]))):1;__privateMethod(this,_Color_instances,setRGBA_fn).call(this,r,g,b,a),__privateMethod(this,_Color_instances,setHexFromRGBA_fn).call(this)},"#parseRgb"),setRGBA_fn=__name(function(r,g,b,a){__privateSet(this,_rgba,{r:Math.round(r),g:Math.round(g),b:Math.round(b),a:Math.round(a*100)/100})},"#setRGBA"),setHexFromRGBA_fn=__name(function(){const{r,g,b,a}=__privateGet(this,_rgba),hexR=r.toString(16).padStart(2,"0"),hexG=g.toString(16).padStart(2,"0"),hexB=b.toString(16).padStart(2,"0");if(__privateSet(this,_hex,`#${hexR}${hexG}${hexB}`),a<1){const hexA=Math.round(a*255).toString(16).padStart(2,"0");__privateSet(this,_hex,__privateGet(this,_hex)+hexA)}},"#setHexFromRGBA"),__name(_Color,"Color");let Color=_Color;var _colorMap,_DocumentColors_instances,collectColors_fn;const _DocumentColors=class _DocumentColors{constructor(){__privateAdd(this,_DocumentColors_instances);__privateAdd(this,_colorMap);__privateSet(this,_colorMap,new Map),__privateMethod(this,_DocumentColors_instances,collectColors_fn).call(this)}get size(){return __privateGet(this,_colorMap).size}get(variableName){return __privateGet(this,_colorMap).get(variableName)}getAll(){return new Map(__privateGet(this,_colorMap))}getAllAsObject(){const result={};return __privateGet(this,_colorMap).forEach((color,variableName)=>{result[variableName]=color}),result}getVariableNames(){return Array.from(__privateGet(this,_colorMap).keys())}refresh(){__privateGet(this,_colorMap).clear(),__privateMethod(this,_DocumentColors_instances,collectColors_fn).call(this)}getColor(variableName){const color=__privateGet(this,_colorMap).get(variableName);if(!color)throw new Error(`Цветовая переменная ${variableName} не найдена`);return color}has(variableName){return __privateGet(this,_colorMap).has(variableName)}};_colorMap=new WeakMap,_DocumentColors_instances=new WeakSet,collectColors_fn=__name(function(){const styles=getComputedStyle(document.documentElement);Array.from(document.styleSheets).forEach(stylesheet=>{Array.from(stylesheet.cssRules).forEach(rule=>{rule instanceof CSSStyleRule&&rule.selectorText==="html"&&Array.from(rule.style).forEach(variableName=>{if(variableName.startsWith("--color")){const value=styles.getPropertyValue(variableName).trim();try{const color=new Color(value);__privateGet(this,_colorMap).set(variableName,color)}catch(error){console.warn(`Не удалось распарсить цвет ${variableName}: ${value}`,error)}}})})})},"#collectColors"),__name(_DocumentColors,"DocumentColors");let DocumentColors=_DocumentColors;exports.Color=Color;exports.DocumentColors=DocumentColors;

package/lib/color/index.js

@@ -15,7 +15,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 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);
-var _hex, _rgba, _Color_instances, parseColor_fn, parseHex_fn, parseRgb_fn, setRGBA_fn, setHexFromRGBA_fn;
+var _hex, _rgba, _Color_instances, rgbaChannelsToString_fn, parseColor_fn, parseHex_fn, parseRgb_fn, setRGBA_fn, setHexFromRGBA_fn;
 const _Color = class _Color {
   constructor(color) {
     __privateAdd(this, _Color_instances);
@@ -41,25 +41,35 @@ const _Color = class _Color {
   get rgba() {
     return __spreadValues({}, __privateGet(this, _rgba));
   }
-  mix(otherColor, ratio = 0.5) {
+  toString(options) {
+    return this.a === 1 && !options ? this.hex : this.toRGBAString(options);
+  }
+  toRGBString(options) {
+    return `rgb(${(options == null ? void 0 : options.r) || this.r}, ${(options == null ? void 0 : options.g) || this.g}, ${(options == null ? void 0 : options.b) || this.b})`;
+  }
+  toRGBAString(options) {
+    return `rgba(${(options == null ? void 0 : options.r) || this.r}, ${(options == null ? void 0 : options.g) || this.g}, ${(options == null ? void 0 : options.b) || this.b}, ${(options == null ? void 0 : options.a) || this.a})`;
+  }
+  mix(otherColor, ratio = 0.5, options) {
+    const rgba = this.mixToRGBA(otherColor, ratio, options);
+    return new _Color(__privateMethod(this, _Color_instances, rgbaChannelsToString_fn).call(this, rgba));
+  }
+  mixToRGBAString(otherColor, ratio = 0.5, options) {
+    const rgba = this.mixToRGBA(otherColor, ratio, options);
+    return __privateMethod(this, _Color_instances, rgbaChannelsToString_fn).call(this, rgba);
+  }
+  mixToRGBA(otherColor, ratio = 0.5, options) {
     if (!(otherColor instanceof _Color))
       throw new Error("Argument must be an instance of Color");
     if (ratio < 0 || ratio > 1)
       throw new Error("Ratio must be between 0 and 1");
-    const r = Math.round(this.r * (1 - ratio) + otherColor.r * ratio), g = Math.round(this.g * (1 - ratio) + otherColor.g * ratio), b = Math.round(this.b * (1 - ratio) + otherColor.b * ratio), a = this.a * (1 - ratio) + otherColor.a * ratio;
-    return new _Color(`rgba(${r}, ${g}, ${b}, ${a})`);
-  }
-  toString() {
-    return this.a === 1 ? this.hex : `rgba(${this.r}, ${this.g}, ${this.b}, ${this.a})`;
-  }
-  toRGBString() {
-    return `rgb(${this.r}, ${this.g}, ${this.b})`;
-  }
-  toRGBAString() {
-    return `rgba(${this.r}, ${this.g}, ${this.b}, ${this.a})`;
+    const r = Math.round(this.r * (1 - ratio) + otherColor.r * ratio), g = Math.round(this.g * (1 - ratio) + otherColor.g * ratio), b = Math.round(this.b * (1 - ratio) + otherColor.b * ratio), a = (this.a * (1 - ratio) + otherColor.a * ratio) * ((options == null ? void 0 : options.opacityMult) || 1);
+    return { r, g, b, a };
   }
 };
-_hex = new WeakMap(), _rgba = new WeakMap(), _Color_instances = new WeakSet(), parseColor_fn = /* @__PURE__ */ __name(function(color) {
+_hex = new WeakMap(), _rgba = new WeakMap(), _Color_instances = new WeakSet(), rgbaChannelsToString_fn = /* @__PURE__ */ __name(function(rgba) {
+  return `rgba(${rgba.r}, ${rgba.g}, ${rgba.b}, ${rgba.a})`;
+}, "#rgbaChannelsToString"), parseColor_fn = /* @__PURE__ */ __name(function(color) {
   if (typeof color != "string")
     throw new Error("Color must be a string");
   const trimmedColor = color.trim().toLowerCase();
@@ -148,15 +158,17 @@ _colorMap = new WeakMap(), _DocumentColors_instances = new WeakSet(), collectCol
   Array.from(document.styleSheets).forEach((stylesheet) => {
     Array.from(stylesheet.cssRules).forEach((rule) => {
       rule instanceof CSSStyleRule && rule.selectorText === "html" && Array.from(rule.style).forEach((variableName) => {
-        const value = styles.getPropertyValue(variableName).trim();
-        try {
-          const color = new Color(value);
-          __privateGet(this, _colorMap).set(variableName, color);
-        } catch (error) {
-          console.warn(
-            `Не удалось распарсить цвет ${variableName}: ${value}`,
-            error
-          );
+        if (variableName.startsWith("--color")) {
+          const value = styles.getPropertyValue(variableName).trim();
+          try {
+            const color = new Color(value);
+            __privateGet(this, _colorMap).set(variableName, color);
+          } catch (error) {
+            console.warn(
+              `Не удалось распарсить цвет ${variableName}: ${value}`,
+              error
+            );
+          }
         }
       });
     });

package/package.json

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