@skbkontur/colors 1.1.2-626ea.0 → 1.1.2-6463e.0

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

@@ -1,17 +1,19 @@
 import * as DEFAULT_SWATCH from './constants/default-swatch';
 import type { BaseTokens } from './types/base-tokens';
 type PresetOrCustom<T extends string> = T | (string & Record<never, never>);
+export declare const ACCENT_PARAMS: string[];
+export interface ColorObject {
+    [key: string]: ColorValue;
+}
+export type ColorValue = string | ColorObject | ColorValue[];
+type ColorStructure = ColorObject | ColorValue[];
 export interface ConfigOptions {
     brand: PresetOrCustom<keyof typeof DEFAULT_SWATCH.brand>;
-    accent: PresetOrCustom<'brand' | 'gray'>;
+    accent: PresetOrCustom<(typeof ACCENT_PARAMS)[number]>;
     system?: typeof DEFAULT_SWATCH.system;
 }
 export declare function getBaseTokens({ brand, accent, system }: ConfigOptions): BaseTokens;
-export declare const colorToHex: (color: string) => string;
-export declare const camelCaseToKebabCase: (str: string) => string;
-export declare const kebabCaseToCamelCase: (str: string) => string;
-export declare function convertOklchToHex(obj: any): any;
+export declare function convertOklchToHex(obj: ColorStructure): ColorStructure;
 export declare const convertOklchToRgba: (oklchString: string) => string;
-export declare function convertAlphaOklchToRgba(obj: any): any;
-export declare function flattenObject(obj: any, prefix?: string): any;
+export declare function convertAlphaOklchToRgba(obj: ColorStructure): ColorStructure;
 export {};

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

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -34,39 +23,48 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenObject = exports.convertAlphaOklchToRgba = exports.convertOklchToRgba = exports.convertOklchToHex = exports.kebabCaseToCamelCase = exports.camelCaseToKebabCase = exports.colorToHex = exports.getBaseTokens = void 0;
+exports.convertAlphaOklchToRgba = exports.convertOklchToRgba = exports.convertOklchToHex = exports.getBaseTokens = exports.ACCENT_PARAMS = void 0;
 var culori_1 = require("culori");
 var get_palette_1 = require("./helpers/get-palette");
 var get_promo_1 = require("./helpers/get-promo");
 var DEFAULT_SWATCH = __importStar(require("./constants/default-swatch"));
 var get_logo_1 = require("./helpers/get-logo");
 var get_interactions_1 = require("./helpers/get-interactions");
+exports.ACCENT_PARAMS = ['brand', 'gray'];
 function getBaseTokens(_a) {
     var brand = _a.brand, _b = _a.accent, accent = _b === void 0 ? 'gray' : _b, _c = _a.system, system = _c === void 0 ? DEFAULT_SWATCH.system : _c;
-    var brandColor = (0, exports.colorToHex)(brand);
+    var isPresetColor = brand in DEFAULT_SWATCH.brand;
+    var brandColor;
+    if (isPresetColor) {
+        brandColor = DEFAULT_SWATCH.brand[brand];
+    }
+    else {
+        brandColor = brand;
+    }
+    var accentColor;
+    if (accent === 'brand') {
+        accentColor = brandColor;
+    }
+    else if (accent !== 'gray') {
+        accentColor = accent;
+    }
     var brandPalette = (0, get_palette_1.getPalette)({ color: brandColor });
     var accentPalette;
-    switch (accent) {
-        case 'brand':
-            accentPalette = brandPalette;
-            break;
-        case 'gray':
-        default:
-            accentPalette = undefined;
+    if (accent === 'brand') {
+        accentPalette = brandPalette;
+    }
+    else if (accent !== 'gray' && accentColor) {
+        accentPalette = (0, get_palette_1.getPalette)({ color: accentColor });
     }
-    var warningPalette = (0, get_palette_1.getPalette)({
-        color: system.warning,
-    });
-    var errorPalette = (0, get_palette_1.getPalette)({ color: system.error });
-    var successPalette = (0, get_palette_1.getPalette)({
-        color: system.success,
-    });
-    var customizable = {};
+    var customizablePalettes = {};
     for (var colorKey in DEFAULT_SWATCH.customizable) {
-        // @ts-expect-error
-        customizable[colorKey] = (0, get_palette_1.getPalette)({
-            // @ts-expect-error
-            color: DEFAULT_SWATCH.customizable[colorKey],
+        var key = colorKey;
+        if (key === brand && isPresetColor) {
+            customizablePalettes[key] = brandPalette;
+            continue;
+        }
+        customizablePalettes[key] = (0, get_palette_1.getPalette)({
+            color: DEFAULT_SWATCH.customizable[key],
         });
     }
     return {
@@ -80,82 +78,71 @@ function getBaseTokens(_a) {
             },
             palette: brandPalette,
         },
-        accent: {
-            original: {
-                light: accent === 'brand' ? brandColor : DEFAULT_SWATCH.gray[36],
-                dark: accent === 'brand' ? brandColor : DEFAULT_SWATCH.gray[96],
-            },
-            interactions: {
-                // TODO обработать hover/pressed для gray
-                hover: (0, get_interactions_1.getHover)(accent === 'brand' ? brandColor : DEFAULT_SWATCH.gray[36]),
-                pressed: (0, get_interactions_1.getPressed)(accent === 'brand' ? brandColor : DEFAULT_SWATCH.gray[36]),
-            },
-            palette: accentPalette || undefined,
-        },
-        warning: warningPalette,
-        error: errorPalette,
-        success: successPalette,
+        accent: accentColor
+            ? {
+                original: {
+                    light: accentColor,
+                    dark: accentColor,
+                },
+                interactions: {
+                    hover: (0, get_interactions_1.getHover)(accentColor),
+                    pressed: (0, get_interactions_1.getPressed)(accentColor),
+                },
+                palette: accentPalette,
+            }
+            : undefined,
+        warning: (0, get_palette_1.getPalette)({ color: system.warning }),
+        error: (0, get_palette_1.getPalette)({ color: system.error }),
+        success: (0, get_palette_1.getPalette)({ color: system.success }),
         gray: DEFAULT_SWATCH.gray,
         whiteAlpha: DEFAULT_SWATCH.whiteAlpha,
         blackAlpha: DEFAULT_SWATCH.blackAlpha,
         onBrand: (0, get_palette_1.calcOnBrand)(brandColor),
-        // TODO: настроить для gray
-        onAccent: (accent === 'brand' && (0, get_palette_1.calcOnBrand)(brandColor)) || undefined,
-        customizable: customizable,
+        onAccent: accentColor ? (0, get_palette_1.calcOnBrand)(accentColor) : undefined,
+        customizable: customizablePalettes,
     };
 }
 exports.getBaseTokens = getBaseTokens;
-var colorToHex = function (color) {
-    if (DEFAULT_SWATCH.brand[color]) {
-        return DEFAULT_SWATCH.brand[color];
-    }
-    return color;
-};
-exports.colorToHex = colorToHex;
-var camelCaseToKebabCase = function (str) {
-    return str.replace(/[A-Z]/g, function (match) { return "-".concat(match.toLowerCase()); });
-};
-exports.camelCaseToKebabCase = camelCaseToKebabCase;
-var kebabCaseToCamelCase = function (str) {
-    return str.replace(/-(\w)/g, function (_, c) { return c.toUpperCase(); });
-};
-exports.kebabCaseToCamelCase = kebabCaseToCamelCase;
 function convertOklchToHex(obj) {
     if (typeof obj !== 'object' || obj === null) {
         return obj;
     }
     if (Array.isArray(obj)) {
-        return obj.map(function (item) { return convertOklchToHex(item); });
+        return obj.map(function (item) {
+            if (typeof item === 'object' && item !== null) {
+                return convertOklchToHex(item);
+            }
+            return item;
+        });
     }
     var newObj = {};
     for (var key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
             var value = obj[key];
             if (typeof value === 'string' && value.startsWith('oklch(') && !value.includes('/')) {
-                try {
-                    var toHex = (0, culori_1.converter)('oklch');
-                    value = (0, culori_1.formatHex)(toHex(value));
-                }
-                catch (e) {
-                    console.error("Failed to convert OKLCH to hex: ".concat(value), e);
-                }
+                var oklchColor = (0, culori_1.converter)('oklch')(value);
+                var rgbColor = (0, culori_1.converter)('rgb')(oklchColor);
+                value = (0, culori_1.formatHex)(rgbColor);
+            }
+            if (typeof value === 'object' && value !== null) {
+                newObj[key] = convertOklchToHex(value);
+            }
+            else {
+                newObj[key] = value;
             }
-            newObj[key] = convertOklchToHex(value);
         }
     }
     return newObj;
 }
 exports.convertOklchToHex = convertOklchToHex;
 var convertOklchToRgba = function (oklchString) {
+    var _a;
     var oklch = (0, culori_1.converter)('oklch')(oklchString);
     var rgb = (0, culori_1.converter)('rgb')(oklch);
-    if (!rgb) {
-        throw new Error("Invalid color format: ".concat(oklchString));
-    }
     var r = Math.round(rgb.r * 255);
     var g = Math.round(rgb.g * 255);
     var b = Math.round(rgb.b * 255);
-    var alpha = oklch.alpha;
+    var alpha = (_a = oklch.alpha) !== null && _a !== void 0 ? _a : 1;
     return "rgba(".concat(r, ", ").concat(g, ", ").concat(b, ", ").concat(alpha, ")");
 };
 exports.convertOklchToRgba = convertOklchToRgba;
@@ -164,40 +151,28 @@ function convertAlphaOklchToRgba(obj) {
         return obj;
     }
     if (Array.isArray(obj)) {
-        return obj.map(function (item) { return convertAlphaOklchToRgba(item); });
+        return obj.map(function (item) {
+            if (typeof item === 'object' && item !== null) {
+                return convertAlphaOklchToRgba(item);
+            }
+            return item;
+        });
     }
     var newObj = {};
     for (var key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
             var value = obj[key];
             if (typeof value === 'string' && value.includes('oklch(')) {
-                try {
-                    value = (0, exports.convertOklchToRgba)(value);
-                }
-                catch (e) {
-                    console.error("Failed to convert OKLCH with alpha to rgba: ".concat(value), e);
-                }
+                value = (0, exports.convertOklchToRgba)(value);
             }
-            newObj[key] = convertAlphaOklchToRgba(value);
-        }
-    }
-    return newObj;
-}
-exports.convertAlphaOklchToRgba = convertAlphaOklchToRgba;
-function flattenObject(obj, prefix) {
-    if (prefix === void 0) { prefix = ''; }
-    var result = {};
-    for (var key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            var newKey = prefix ? "".concat(prefix, "-").concat((0, exports.camelCaseToKebabCase)(key)) : key;
-            if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
-                result = __assign(__assign({}, result), flattenObject(obj[key], newKey));
+            if (typeof value === 'object' && value !== null) {
+                newObj[key] = convertAlphaOklchToRgba(value);
             }
             else {
-                result[newKey] = obj[key];
+                newObj[key] = value;
             }
         }
     }
-    return result;
+    return newObj;
 }
-exports.flattenObject = flattenObject;
+exports.convertAlphaOklchToRgba = convertAlphaOklchToRgba;

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

@@ -1,55 +1,61 @@
 import type { BaseTokens } from './types/base-tokens';
 export declare const getDefaultTokens: (base: BaseTokens) => {
     light: {
-        textAccentPrimary: string;
-        textAccentPrimaryHover: string;
-        textAccentPrimaryPressed: string;
+        textAccentHeavy: string;
+        textAccentHeavyHover: string;
+        textAccentHeavyPressed: string;
         textDisabled: string;
-        textErrorPrimary: string;
-        textErrorPrimaryHover: string;
-        textErrorPrimaryPressed: string;
-        textInvertedAccentPrimary: string;
-        textInvertedAccentPrimaryHover: string;
-        textInvertedAccentPrimaryPressed: string;
+        textErrorHeavy: string;
+        textErrorHeavyHover: string;
+        textErrorHeavyPressed: string;
+        textInvertedAccentHeavy: string;
+        textInvertedAccentHeavyHover: string;
+        textInvertedAccentHeavyPressed: string;
         textInvertedDisabled: string;
-        textInvertedErrorPrimary: string;
-        textInvertedErrorPrimaryHover: string;
-        textInvertedErrorPrimaryPressed: string;
-        textInvertedNeutralPrimary: string;
-        textInvertedNeutralSecondary: string;
-        textInvertedSuccessPrimary: string;
-        textInvertedSuccessPrimaryHover: string;
-        textInvertedSuccessPrimaryPressed: string;
-        textInvertedWarningPrimary: string;
-        textInvertedWarningPrimaryHover: string;
-        textInvertedWarningPrimaryPressed: string;
+        textInvertedErrorHeavy: string;
+        textInvertedErrorHeavyHover: string;
+        textInvertedErrorHeavyPressed: string;
+        textInvertedNeutralHeavy: string;
+        textInvertedNeutralPale: string;
+        textInvertedNeutralSoft: string;
+        textInvertedSuccessHeavy: string;
+        textInvertedSuccessHeavyHover: string;
+        textInvertedSuccessHeavyPressed: string;
+        textInvertedWarningHeavy: string;
+        textInvertedWarningHeavyHover: string;
+        textInvertedWarningHeavyPressed: string;
         textLogo: string;
-        textNeutralPrimary: string;
-        textNeutralSecondary: string;
-        textSuccessPrimary: string;
-        textSuccessPrimaryHover: string;
-        textSuccessPrimaryPressed: string;
-        textWarningPrimary: string;
-        textWarningPrimaryHover: string;
-        textWarningPrimaryPressed: string;
+        textNeutralHeavy: string;
+        textNeutralPale: string;
+        textNeutralSoft: string;
+        textSuccessHeavy: string;
+        textSuccessHeavyHover: string;
+        textSuccessHeavyPressed: string;
+        textWarningHeavy: string;
+        textWarningHeavyHover: string;
+        textWarningHeavyPressed: string;
         textConstDisabledBlack: string;
         textConstDisabledWhite: string;
-        textConstPrimaryBlack: string;
-        textConstPrimaryWhite: string;
-        textConstSecondaryBlack: string;
-        textConstSecondaryWhite: string;
+        textConstHeavyBlack: string;
+        textConstHeavyWhite: string;
+        textConstPaleBlack: string;
+        textConstPaleWhite: string;
+        textConstSoftBlack: string;
+        textConstSoftWhite: string;
         textOnAccentBoldDisabled: string;
-        textOnAccentBoldPrimary: string;
-        textOnAccentBoldSecondary: string;
+        textOnAccentBoldHeavy: string;
+        textOnAccentBoldPale: string;
+        textOnAccentBoldSoft: string;
         textOnBrandOriginalDisabled: string;
-        textOnBrandOriginalPrimary: string;
-        textOnBrandOriginalSecondary: string;
+        textOnBrandOriginalHeavy: string;
+        textOnBrandOriginalPale: string;
+        textOnBrandOriginalSoft: string;
         shapeBoldAccent: string;
         shapeBoldAccentHover: string;
         shapeBoldAccentPressed: string;
-        shapeBoldBrandOriginal: string;
-        shapeBoldBrandOriginalHover: string;
-        shapeBoldBrandOriginalPressed: string;
+        shapeBoldBrandOriginal: string | undefined;
+        shapeBoldBrandOriginalHover: string | undefined;
+        shapeBoldBrandOriginalPressed: string | undefined;
         shapeBoldError: string;
         shapeBoldErrorHover: string;
         shapeBoldErrorPressed: string;
@@ -92,6 +98,8 @@ export declare const getDefaultTokens: (base: BaseTokens) => {
         shapeOtherBasePressed: string;
         shapeOtherDisabled: string;
         shapeOtherField: string;
+        shapeOtherFieldHover: string;
+        shapeOtherFieldPressed: string;
         shapeOtherLow: string;
         shapeOtherLowHover: string;
         shapeOtherLowPressed: string;
@@ -250,6 +258,8 @@ export declare const getDefaultTokens: (base: BaseTokens) => {
         illustrationBlack: string;
         illustrationBrand: string;
         illustrationComplement: string;
+        illustrationInvertedNeutral: string;
+        illustrationNeutral: string;
         illustrationOnBrand: string;
         illustrationOnComplement: string;
         illustrationPromo: string;
@@ -312,55 +322,61 @@ export declare const getDefaultTokens: (base: BaseTokens) => {
         customizableSoftYellow: string;
     };
     dark: {
-        textAccentPrimary: string;
-        textAccentPrimaryHover: string;
-        textAccentPrimaryPressed: string;
+        textAccentHeavy: string;
+        textAccentHeavyHover: string;
+        textAccentHeavyPressed: string;
         textDisabled: string;
-        textErrorPrimary: string;
-        textErrorPrimaryHover: string;
-        textErrorPrimaryPressed: string;
-        textInvertedAccentPrimary: string;
-        textInvertedAccentPrimaryHover: string;
-        textInvertedAccentPrimaryPressed: string;
+        textErrorHeavy: string;
+        textErrorHeavyHover: string;
+        textErrorHeavyPressed: string;
+        textInvertedAccentHeavy: string;
+        textInvertedAccentHeavyHover: string;
+        textInvertedAccentHeavyPressed: string;
         textInvertedDisabled: string;
-        textInvertedErrorPrimary: string;
-        textInvertedErrorPrimaryHover: string;
-        textInvertedErrorPrimaryPressed: string;
-        textInvertedNeutralPrimary: string;
-        textInvertedNeutralSecondary: string;
-        textInvertedSuccessPrimary: string;
-        textInvertedSuccessPrimaryHover: string;
-        textInvertedSuccessPrimaryPressed: string;
-        textInvertedWarningPrimary: string;
-        textInvertedWarningPrimaryHover: string;
-        textInvertedWarningPrimaryPressed: string;
+        textInvertedErrorHeavy: string;
+        textInvertedErrorHeavyHover: string;
+        textInvertedErrorHeavyPressed: string;
+        textInvertedNeutralHeavy: string;
+        textInvertedNeutralPale: string;
+        textInvertedNeutralSoft: string;
+        textInvertedSuccessHeavy: string;
+        textInvertedSuccessHeavyHover: string;
+        textInvertedSuccessHeavyPressed: string;
+        textInvertedWarningHeavy: string;
+        textInvertedWarningHeavyHover: string;
+        textInvertedWarningHeavyPressed: string;
         textLogo: string;
-        textNeutralPrimary: string;
-        textNeutralSecondary: string;
-        textSuccessPrimary: string;
-        textSuccessPrimaryHover: string;
-        textSuccessPrimaryPressed: string;
-        textWarningPrimary: string;
-        textWarningPrimaryHover: string;
-        textWarningPrimaryPressed: string;
+        textNeutralHeavy: string;
+        textNeutralPale: string;
+        textNeutralSoft: string;
+        textSuccessHeavy: string;
+        textSuccessHeavyHover: string;
+        textSuccessHeavyPressed: string;
+        textWarningHeavy: string;
+        textWarningHeavyHover: string;
+        textWarningHeavyPressed: string;
         textConstDisabledBlack: string;
         textConstDisabledWhite: string;
-        textConstPrimaryBlack: string;
-        textConstPrimaryWhite: string;
-        textConstSecondaryBlack: string;
-        textConstSecondaryWhite: string;
+        textConstHeavyBlack: string;
+        textConstHeavyWhite: string;
+        textConstPaleBlack: string;
+        textConstPaleWhite: string;
+        textConstSoftBlack: string;
+        textConstSoftWhite: string;
         textOnAccentBoldDisabled: string;
-        textOnAccentBoldPrimary: string;
-        textOnAccentBoldSecondary: string;
+        textOnAccentBoldHeavy: string;
+        textOnAccentBoldPale: string;
+        textOnAccentBoldSoft: string;
         textOnBrandOriginalDisabled: string;
-        textOnBrandOriginalPrimary: string;
-        textOnBrandOriginalSecondary: string;
+        textOnBrandOriginalHeavy: string;
+        textOnBrandOriginalPale: string;
+        textOnBrandOriginalSoft: string;
         shapeBoldAccent: string;
         shapeBoldAccentHover: string;
         shapeBoldAccentPressed: string;
-        shapeBoldBrandOriginal: string;
-        shapeBoldBrandOriginalHover: string;
-        shapeBoldBrandOriginalPressed: string;
+        shapeBoldBrandOriginal: string | undefined;
+        shapeBoldBrandOriginalHover: string | undefined;
+        shapeBoldBrandOriginalPressed: string | undefined;
         shapeBoldError: string;
         shapeBoldErrorHover: string;
         shapeBoldErrorPressed: string;
@@ -403,6 +419,8 @@ export declare const getDefaultTokens: (base: BaseTokens) => {
         shapeOtherBasePressed: string;
         shapeOtherDisabled: string;
         shapeOtherField: string;
+        shapeOtherFieldHover: string;
+        shapeOtherFieldPressed: string;
         shapeOtherLow: string;
         shapeOtherLowHover: string;
         shapeOtherLowPressed: string;
@@ -561,6 +579,8 @@ export declare const getDefaultTokens: (base: BaseTokens) => {
         illustrationBlack: string;
         illustrationBrand: string;
         illustrationComplement: string;
+        illustrationInvertedNeutral: string;
+        illustrationNeutral: string;
         illustrationOnBrand: string;
         illustrationOnComplement: string;
         illustrationPromo: string;