@skbkontur/colors 2.0.0-alpha.1 → 2.0.0-alpha.2

package/dist/cjs/get-base-tokens.d.ts

@@ -7,13 +7,20 @@ export interface ColorObject {
 }
 export type ColorValue = string | ColorObject | ColorValue[];
 type ColorStructure = ColorObject | ColorValue[];
+export type ColorFormat = 'hex/rgba' | 'rgb/rgba' | 'oklch' | 'hex-aarrggbb';
 export interface ConfigOptions {
   brand: PresetOrCustom<keyof typeof DEFAULT_SWATCH.brand>;
   accent: PresetOrCustom<(typeof ACCENT_PARAMS)[number]>;
   system?: typeof DEFAULT_SWATCH.system;
+  format?: ColorFormat;
 }
 export declare function getBaseTokens({ brand, accent, system }: ConfigOptions): BaseTokens;
 export declare function convertOklchToHex(obj: ColorStructure): ColorStructure;
 export declare const convertOklchToRgba: (oklchString: string) => string;
 export declare function convertAlphaOklchToRgba(obj: ColorStructure): ColorStructure;
+export declare const convertHexToRgbString: (hexString: string) => string;
+export declare function convertHexValuesToRgb(obj: ColorStructure): ColorStructure;
+export declare const convertToAarrggbb: (colorString: string) => string;
+export declare function convertToAarrggbbRecursive(obj: ColorStructure): ColorStructure;
+export declare function convertColorFormat(obj: ColorStructure, format?: ColorFormat): ColorStructure;
 export {};

package/dist/cjs/get-base-tokens.js

@@ -40,7 +40,12 @@ var __importStar =
     return result;
   };
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.convertAlphaOklchToRgba =
+exports.convertColorFormat =
+  exports.convertToAarrggbbRecursive =
+  exports.convertToAarrggbb =
+  exports.convertHexValuesToRgb =
+  exports.convertHexToRgbString =
+  exports.convertAlphaOklchToRgba =
   exports.convertOklchToRgba =
   exports.convertOklchToHex =
   exports.getBaseTokens =
@@ -184,6 +189,7 @@ function convertAlphaOklchToRgba(obj) {
   for (var key in obj) {
     if (Object.prototype.hasOwnProperty.call(obj, key)) {
       var value = obj[key];
+      // Конвертируем OKLCH с альфа-каналом (содержит '/') в RGBA
       if (typeof value === 'string' && value.includes('oklch(')) {
         value = (0, exports.convertOklchToRgba)(value);
       }
@@ -197,3 +203,117 @@ function convertAlphaOklchToRgba(obj) {
   return newObj;
 }
 exports.convertAlphaOklchToRgba = convertAlphaOklchToRgba;
+var convertHexToRgbString = function (hexString) {
+  var _a;
+  var color = (0, culori_1.converter)('rgb')(hexString);
+  if (!color) {
+    return hexString;
+  }
+  var r = Math.round(color.r * 255);
+  var g = Math.round(color.g * 255);
+  var b = Math.round(color.b * 255);
+  var alpha = (_a = color.alpha) !== null && _a !== void 0 ? _a : 1;
+  return alpha === 1
+    ? 'rgb('.concat(r, ', ').concat(g, ', ').concat(b, ')')
+    : 'rgba('.concat(r, ', ').concat(g, ', ').concat(b, ', ').concat(alpha, ')');
+};
+exports.convertHexToRgbString = convertHexToRgbString;
+function convertHexValuesToRgb(obj) {
+  if (typeof obj !== 'object' || obj === null) {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(function (item) {
+      if (typeof item === 'object' && item !== null) {
+        return convertHexValuesToRgb(item);
+      }
+      return item;
+    });
+  }
+  var newObj = {};
+  for (var key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      var value = obj[key];
+      // Конвертируем HEX-строки в RGB(A)-строки
+      if (typeof value === 'string' && value.startsWith('#')) {
+        newObj[key] = (0, exports.convertHexToRgbString)(value);
+      } else if (typeof value === 'object' && value !== null) {
+        newObj[key] = convertHexValuesToRgb(value);
+      } else {
+        newObj[key] = value;
+      }
+    }
+  }
+  return newObj;
+}
+exports.convertHexValuesToRgb = convertHexValuesToRgb;
+var convertToAarrggbb = function (colorString) {
+  var _a;
+  var color = (0, culori_1.converter)('rgb')(colorString);
+  if (!color) {
+    return colorString;
+  }
+  var r = Math.round(color.r * 255);
+  var g = Math.round(color.g * 255);
+  var b = Math.round(color.b * 255);
+  var alpha = Math.round(((_a = color.alpha) !== null && _a !== void 0 ? _a : 1) * 255);
+  var toHex = function (c) {
+    return c.toString(16).padStart(2, '0');
+  };
+  var rgbHex = ''.concat(toHex(r)).concat(toHex(g)).concat(toHex(b)).toUpperCase();
+  if (alpha === 255) {
+    return '#'.concat(rgbHex);
+  }
+  return '#'.concat(toHex(alpha)).concat(rgbHex).toUpperCase();
+};
+exports.convertToAarrggbb = convertToAarrggbb;
+function convertToAarrggbbRecursive(obj) {
+  if (typeof obj !== 'object' || obj === null) {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(function (item) {
+      if (typeof item === 'object' && item !== null) {
+        return convertToAarrggbbRecursive(item);
+      }
+      return item;
+    });
+  }
+  var newObj = {};
+  for (var key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      var value = obj[key];
+      // Конвертируем строки цветов (HEX, RGBA) в AARRGGBB
+      if (typeof value === 'string') {
+        newObj[key] = (0, exports.convertToAarrggbb)(value); // Измененная логика в этой функции
+      } else if (typeof value === 'object' && value !== null) {
+        newObj[key] = convertToAarrggbbRecursive(value);
+      } else {
+        newObj[key] = value;
+      }
+    }
+  }
+  return newObj;
+}
+exports.convertToAarrggbbRecursive = convertToAarrggbbRecursive;
+function convertColorFormat(obj, format) {
+  if (format === void 0) {
+    format = 'hex/rgba';
+  }
+  var result = obj;
+  result = convertOklchToHex(obj);
+  result = convertAlphaOklchToRgba(result);
+  switch (format) {
+    case 'oklch':
+      return obj;
+    case 'hex/rgba':
+      return result;
+    case 'rgb/rgba':
+      return convertHexValuesToRgb(result);
+    case 'hex-aarrggbb':
+      return convertToAarrggbbRecursive(result);
+    default:
+      return result;
+  }
+}
+exports.convertColorFormat = convertColorFormat;

package/dist/cjs/get-colors.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigOptions } from './get-base-tokens';
+import { type ConfigOptions, type ColorFormat } from './get-base-tokens';
 import { getDefaultTokens } from './get-default-tokens';
 import type { BaseTokens } from './types/base-tokens';
 export interface Themed<T> {
@@ -10,6 +10,7 @@ export type DefaultTokens = DefaultTokensFull['light' | 'dark'];
 export interface SemanticConfigOptions<T> extends ConfigOptions {
   theme?: 'light' | 'dark';
   overrides?: (base: BaseTokens, defaults?: DefaultTokensFull, params?: SemanticConfigOptions<T>) => Themed<T>;
+  format?: ColorFormat;
 }
 export declare function getColors(params: SemanticConfigOptions<DefaultTokens>): DefaultTokens;
 export declare function getColors<T>(

package/dist/cjs/get-colors.js

@@ -1,7 +1,7 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.getColors = void 0;
-var get_base_tokens_1 = require('./get-base-tokens'); //
+var get_base_tokens_1 = require('./get-base-tokens');
 var get_default_tokens_1 = require('./get-default-tokens');
 var DEFAULT_THEME = 'light';
 function getColors(params) {
@@ -9,17 +9,12 @@ function getColors(params) {
   var base = (0, get_base_tokens_1.getBaseTokens)(params);
   var defaults = (0, get_default_tokens_1.getDefaultTokens)(base);
   var result;
-  // 1. Получаем базовый объект цветов (либо дефолтный, либо переопределенный)
   if (params.overrides) {
     result = params.overrides(base, defaults, params)[theme];
   } else {
     result = defaults[theme];
   }
-  // 2. Конвертируем oklch без прозрачности в HEX
-  // Используем 'as any', так как конвертеры рассчитаны на рекурсивную структуру ColorStructure
-  var hexConverted = (0, get_base_tokens_1.convertOklchToHex)(result);
-  // 3. Конвертируем оставшиеся oklch (с прозрачностью) в RGBA
-  var finalResult = (0, get_base_tokens_1.convertAlphaOklchToRgba)(hexConverted);
+  var finalResult = (0, get_base_tokens_1.convertColorFormat)(result, params.format);
   return finalResult;
 }
 exports.getColors = getColors;

package/dist/cjs/helpers/get-palette.js

@@ -277,9 +277,9 @@ function calculateBaseHueAndCorrectionRange(inputColorString, abneyData) {
 }
 exports.calculateBaseHueAndCorrectionRange = calculateBaseHueAndCorrectionRange;
 function calcOnBrand(hex) {
-  var whiteContrast = Number((0, apca_w3_1.calcAPCA)('#fff', hex));
-  var blackContrast = Number((0, apca_w3_1.calcAPCA)('#000', hex));
-  if (whiteContrast - 10 <= blackContrast) {
+  var whiteContrast = Math.abs(Number((0, apca_w3_1.calcAPCA)('#fff', hex)));
+  var blackContrast = Math.abs(Number((0, apca_w3_1.calcAPCA)('#000', hex)));
+  if (whiteContrast + 10 >= blackContrast) {
     return DefaultSwatch.whiteAlpha;
   }
   return DefaultSwatch.blackAlpha;