@vkontakte/vkui-tokens 4.29.3-dev-b24760.0 → 4.29.4

package/build/compilers/docs/__test__/testLinks.d.ts

@@ -0,0 +1,7 @@
+export interface BaseTheme {
+    /**
+     * @desc Link with text {@link https://google.com Google}.
+     *       Link without text {@link https://google.com}
+     */
+    importedBaseProp: string;
+}

package/build/compilers/docs/__test__/testLinks.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/compilers/docs/compileDocsJSON.d.ts

@@ -1,7 +1,15 @@
 import { SpecialTokens, Theme } from '../../../interfaces/general';
+export type Description = {
+    type: 'text';
+    text: string;
+} | {
+    type: 'link';
+    url: string;
+    text: string;
+};
 export interface ThemePropertyDoc {
     tags: string[];
-    desc: string;
+    desc: Description[];
 }
 export type ThemeDocs = {
     [name: string]: ThemePropertyDoc;

package/build/compilers/docs/compileDocsJSON.js

@@ -18,6 +18,34 @@ exports.compileDocsJSON = exports.getTypeDocs = void 0;
 var path_1 = __importDefault(require("path"));
 var ts_morph_1 = require("ts-morph");
 var capitalize_1 = require("../../helpers/capitalize");
+function getTagDescription(tag) {
+    return tag
+        .getText()
+        .map(function (part) {
+        switch (part.kind) {
+            case 'text':
+                return {
+                    type: 'text',
+                    text: part.text,
+                };
+            case 'linkText': {
+                var _a = part.text.split(' '), url = _a[0], urlText = _a[1];
+                if (!url) {
+                    throw new Error('[desc] Ожидаемый формат ссылки в JSDoc `{@link url urlText}` или `{@link url}`');
+                }
+                return {
+                    url: url,
+                    type: 'link',
+                    text: urlText || url,
+                };
+            }
+            case 'link':
+            default:
+                return null;
+        }
+    })
+        .filter(function (i) { return i !== null; });
+}
 function getTagText(tag) {
     return tag
         .getText()
@@ -47,19 +75,20 @@ function getExportedTypeDeclarations(file, typeName) {
 function mapJsDocTagsToThemePropertyDoc(tags) {
     var doc = {
         tags: [],
-        desc: '',
+        desc: [],
     };
     tags.forEach(function (tag) {
         var tagName = tag.getName();
-        var tagText = getTagText(tag);
         if (tagName === 'desc' || tagName === 'description') {
-            doc.desc = tagText;
+            doc.desc = getTagDescription(tag);
         }
         else if (tagName === 'tags') {
-            doc.tags = tagText.split(',').map(function (tag) { return tag.trim(); });
+            var docTags = getTagText(tag);
+            doc.tags = docTags.split(',').map(function (tag) { return tag.trim(); });
         }
         else if (tagName === 'tag') {
-            doc.tags.push(tagText);
+            var docTag = getTagText(tag);
+            doc.tags.push(docTag);
         }
     });
     return doc;
@@ -71,13 +100,24 @@ function getTypeDocs(filePath, name) {
     });
     var file = project.addSourceFileAtPath(filePath);
     var declarations = getExportedTypeDeclarations(file, name);
-    return declarations.reduce(function (all, declaration) {
-        var properties = declaration.getType().getApparentProperties();
-        var docs = properties.reduce(function (all, prop) {
-            all[prop.getName()] = mapJsDocTagsToThemePropertyDoc(prop.getJsDocTags());
-            return all;
+    return declarations.reduce(function (prevDocs, declaration) {
+        var rawProperties = declaration.getType().getApparentProperties();
+        var parsedProperties = rawProperties
+            .reduce(function (acc, prop) {
+            acc.push([prop.getName(), mapJsDocTagsToThemePropertyDoc(prop.getJsDocTags())]);
+            return acc;
+        }, [])
+            .sort(function (_a, _b) {
+            var a = _a[0];
+            var b = _b[0];
+            return a.localeCompare(b);
+        });
+        var docs = parsedProperties.reduce(function (acc, _a) {
+            var key = _a[0], value = _a[1];
+            acc[key] = value;
+            return acc;
         }, {});
-        return __assign(__assign({}, all), docs);
+        return __assign(__assign({}, prevDocs), docs);
     }, {});
 }
 exports.getTypeDocs = getTypeDocs;

package/build/compilers/docs/compileDocsJSON.test.js

@@ -6,32 +6,65 @@ describe('compileDocsJSON', function () {
         var docs = (0, compileDocsJSON_1.getTypeDocs)('src/build/compilers/docs/__test__/testRecursiveReexport.ts', 'BaseTheme');
         expect(docs).toEqual({
             importedBaseProp: {
-                desc: 'Short desc tag',
+                desc: [
+                    {
+                        type: 'text',
+                        text: 'Short desc tag',
+                    },
+                ],
                 tags: ['tag1', 'tag2'],
             },
         });
     });
+    it('should correct compile documentation with jsdoc link', function () {
+        var docs = (0, compileDocsJSON_1.getTypeDocs)('src/build/compilers/docs/__test__/testLinks.ts', 'BaseTheme');
+        expect(docs).toEqual({
+            importedBaseProp: {
+                desc: [
+                    {
+                        type: 'text',
+                        text: 'Link with text ',
+                    },
+                    {
+                        type: 'link',
+                        url: 'https://google.com',
+                        text: 'Google',
+                    },
+                    {
+                        type: 'text',
+                        text: '.\nLink without text ',
+                    },
+                    {
+                        type: 'link',
+                        url: 'https://google.com',
+                        text: 'https://google.com',
+                    },
+                ],
+                tags: [],
+            },
+        });
+    });
     it('should correct compile documentation with imports', function () {
         var docs = (0, compileDocsJSON_1.getTypeDocs)('src/build/compilers/docs/__test__/testTheme.ts', 'ThemeTest');
         expect(docs).toEqual({
             prop: {
-                desc: '',
+                desc: [],
                 tags: ['empty description'],
             },
             propWithoutDoc: {
-                desc: '',
+                desc: [],
                 tags: [],
             },
             localBaseProp: {
-                desc: 'Empty tags',
+                desc: [{ type: 'text', text: 'Empty tags' }],
                 tags: [],
             },
             importedBaseProp: {
-                desc: 'Short desc tag',
+                desc: [{ type: 'text', text: 'Short desc tag' }],
                 tags: ['tag1', 'tag2'],
             },
             derivedProp: {
-                desc: 'Long description tag',
+                desc: [{ type: 'text', text: 'Long description tag' }],
                 tags: ['tagListItem1', 'tagListItem2', 'tagListItem3'],
             },
         });

package/build/compilers/styles/helpers/tokenProcessors.d.ts

@@ -6,7 +6,7 @@ export declare const EStyleTypes: {
     readonly LESS: "less";
     readonly STYL: "styl";
 };
-export type Formats = typeof EStyleTypes[keyof typeof EStyleTypes];
+export type Formats = (typeof EStyleTypes)[keyof typeof EStyleTypes];
 export declare const varDeclarations: {
     readonly css: (prop: any, prefix?: string) => string;
     readonly pcss: (prop: any, prefix?: string) => string;

package/interfaces/namespaces/vk/index.d.ts

@@ -1,181 +0,0 @@
-import { Theme, ThemeCssVars, ThemeDescription } from '../../general';
-import { GradientPoints } from '../../general/gradients';
-import { Tokens } from '../../general/tools/tokenValue';
-export interface VkGradients {
-    /**
-     * @desc Градиент AquamarineBlue
-     * @tags gradient
-     */
-    gradientAquamarineBlue: GradientPoints;
-    /**
-     * @desc Градиент Blue
-     * @tags gradient
-     */
-    gradientBlue: GradientPoints;
-    /**
-     * @desc Градиент Candy
-     * @tags gradient
-     */
-    gradientCandy: GradientPoints;
-    /**
-     * @desc Градиент Crimson
-     * @tags gradient
-     */
-    gradientCrimson: GradientPoints;
-    /**
-     * @desc Градиент Disco
-     * @tags gradient
-     */
-    gradientDisco: GradientPoints;
-    /**
-     * @desc Градиент Emerald
-     * @tags gradient
-     */
-    gradientEmerald: GradientPoints;
-    /**
-     * @desc Градиент Gray
-     * @tags gradient
-     */
-    gradientGray: GradientPoints;
-    /**
-     * @desc Градиент Green
-     * @tags gradient
-     */
-    gradientGreen: GradientPoints;
-    /**
-     * @desc Градиент Lagoon
-     * @tags gradient
-     */
-    gradientLagoon: GradientPoints;
-    /**
-     * @desc Градиент Lavender
-     * @tags gradient
-     */
-    gradientLavender: GradientPoints;
-    /**
-     * @desc Градиент Marine
-     * @tags gradient
-     */
-    gradientMarine: GradientPoints;
-    /**
-     * @desc Градиент Midnight
-     * @tags gradient
-     */
-    gradientMidnight: GradientPoints;
-    /**
-     * @desc Градиент Orange
-     * @tags gradient
-     */
-    gradientOrange: GradientPoints;
-    /**
-     * @desc Градиент Pink
-     * @tags gradient
-     */
-    gradientPink: GradientPoints;
-    /**
-     * @desc Градиент Purple
-     * @tags gradient
-     */
-    gradientPurple: GradientPoints;
-    /**
-     * @desc Градиент RaspberryPink
-     * @tags gradient
-     */
-    gradientRaspberryPink: GradientPoints;
-    /**
-     * @desc Градиент Red
-     * @tags gradient
-     */
-    gradientRed: GradientPoints;
-    /**
-     * @desc Градиент Retrowave
-     * @tags gradient
-     */
-    gradientRetrowave: GradientPoints;
-    /**
-     * @desc Градиент Sunset
-     * @tags gradient
-     */
-    gradientSunset: GradientPoints;
-    /**
-     * @desc Градиент Turquoise
-     * @tags gradient
-     */
-    gradientTurquoise: GradientPoints;
-    /**
-     * @desc Градиент Twilight
-     * @tags gradient
-     */
-    gradientTwilight: GradientPoints;
-    /**
-     * @desc Градиент Unicorn
-     * @tags gradient
-     */
-    gradientUnicorn: GradientPoints;
-    /**
-     * @desc Градиент Violet
-     * @tags gradient
-     */
-    gradientViolet: GradientPoints;
-    /**
-     * @desc Градиент Yellow
-     * @tags gradient
-     */
-    gradientYellow: GradientPoints;
-    /**
-     * @desc Градиент YellowBright
-     * @tags gradient
-     */
-    gradientYellowBright: GradientPoints;
-    /**
-     * @desc Градиент HalloweenOrange
-     * @tags gradient
-     */
-    gradientHalloweenOrange: GradientPoints;
-    /**
-     * @desc Градиент HalloweenViolet
-     * @tags gradient
-     */
-    gradientHalloweenViolet: GradientPoints;
-    /**
-     * @desc Градиент NewYear
-     * @tags gradient
-     */
-    gradientNewYear: GradientPoints;
-    /**
-     * @desc Градиент Frost
-     * @tags gradient
-     */
-    gradientFrost: GradientPoints;
-    /**
-     * @desc Градиент Valentine
-     * @tags gradient
-     */
-    gradientValentine: GradientPoints;
-    /**
-     * @desc Градиент WarmValentine
-     * @tags gradient
-     */
-    gradientWarmValentine: GradientPoints;
-    /**
-     * @desc Градиент Sberkot
-     * @tags gradient
-     */
-    gradientSberkot: GradientPoints;
-    /**
-     * @desc Градиент Mable
-     * @tags gradient
-     */
-    gradientMable: GradientPoints;
-    /**
-     * @desc Градиент WomensDay
-     * @tags gradient
-     */
-    gradientWomensDay: GradientPoints;
-}
-export interface VkTheme extends Theme, VkGradients {
-}
-export interface VkThemeDescription extends ThemeDescription, Tokens<VkGradients> {
-}
-export interface VkThemeCssVars extends ThemeCssVars<VkTheme> {
-}

package/interfaces/namespaces/vk/index.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+// место где можно оперделить локальные переменные вк, как вариант

package/interfaces/themes/octavius/index.d.ts

@@ -90,6 +90,7 @@ export interface LocalOctaviusColorsDescriptionStruct {
     octaviusColorButtonEmptyStateBackgroundAlpha: ColorDescription;
     octaviusColorBackground: ColorDescription;
     octaviusColorOverlayBackground: ColorDescription;
+    octaviusColorActionArchive: ColorDescription;
     octaviusColorHeaderBackground: ColorDescription;
     octaviusColorHeaderButtonText: ColorDescription;
     octaviusColorHeaderButtonBackgroundAlpha: ColorDescription;

package/interfaces/themes/vkBase/index.d.ts

@@ -1,7 +1,7 @@
-import { VkTheme, VkThemeCssVars, VkThemeDescription } from '../../namespaces/vk';
-export interface ThemeVkBase extends VkTheme {
+import { Theme, ThemeCssVars, ThemeDescription } from '../../general';
+export interface ThemeVkBase extends Theme {
 }
-export interface ThemeVkBaseDescription extends VkThemeDescription {
+export interface ThemeVkBaseDescription extends ThemeDescription {
 }
-export interface ThemeVkBaseCssVars extends VkThemeCssVars {
+export interface ThemeVkBaseCssVars extends ThemeCssVars {
 }

package/interfaces/themes/vkBaseDark/index.d.ts

@@ -1,7 +1,7 @@
-import { VkTheme, VkThemeCssVars, VkThemeDescription } from '../../namespaces/vk';
-export interface ThemeVkBaseDark extends VkTheme {
+import { Theme, ThemeCssVars, ThemeDescription } from '../../general';
+export interface ThemeVkBaseDark extends Theme {
 }
-export interface ThemeVkBaseDarkDescription extends VkThemeDescription {
+export interface ThemeVkBaseDarkDescription extends ThemeDescription {
 }
-export interface ThemeVkBaseDarkCssVars extends VkThemeCssVars {
+export interface ThemeVkBaseDarkCssVars extends ThemeCssVars {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/vkui-tokens",
-  "version": "4.29.3-dev-b24760.0",
+  "version": "4.29.4",
   "description": "Репозиторий, который содержит в себе дизайн-токены и другие инструменты объединенной дизайн-системы VKUI и Paradigm",
   "license": "MIT",
   "main": "utils/descriptions.js",
@@ -63,7 +63,7 @@
     "eslint-config-silence": "1.0.0",
     "eslint-import-resolver-alias": "1.1.2",
     "eslint-plugin-compat": "4.0.2",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jasmine": "4.1.3",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-simple-import-sort": "8.0.0",
@@ -73,19 +73,19 @@
     "jest": "29.4.1",
     "jest-junit": "15.0.0",
     "lodash": "4.17.21",
-    "prettier": "2.8.0",
+    "prettier": "2.8.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.0",
     "style-loader": "3.3.1",
     "terser-webpack-plugin": "5.3.6",
     "ts-jest": "29.0.5",
     "ts-loader": "9.4.2",
     "ts-morph": "17.0.1",
     "ts-node": "10.9.1",
-    "tsconfig-paths": "4.1.1",
+    "tsconfig-paths": "4.1.2",
     "tscpaths": "0.0.9",
-    "type-fest": "3.5.3",
+    "type-fest": "3.6.1",
     "typescript": "4.9.5",
     "webpack": "5.75.0",
     "webpack-cli": "5.0.1",

package/themeDescriptions/base/vk.d.ts

@@ -1,13 +1,11 @@
-import { ColorsDescription } from '../../interfaces/general';
+import { ColorsDescription, ThemeDescription } from '../../interfaces/general';
 import { Elevation } from '../../interfaces/general/elevation';
 import { Gradients } from '../../interfaces/general/gradients';
-import { VkGradients, VkThemeDescription } from '../../interfaces/namespaces/vk';
 export declare const lightColors: ColorsDescription;
 export declare const lightGradient: Gradients;
 export declare const lightElevation: Elevation;
 export declare const darkColors: ColorsDescription;
 export declare const darkGradient: Gradients;
 export declare const darkElevation: Elevation;
-export declare const gradients: VkGradients;
-export declare const lightTheme: VkThemeDescription;
-export declare const darkTheme: VkThemeDescription;
+export declare const lightTheme: ThemeDescription;
+export declare const darkTheme: ThemeDescription;

package/themeDescriptions/base/vk.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.darkTheme = exports.lightTheme = exports.gradients = exports.darkElevation = exports.darkGradient = exports.darkColors = exports.lightElevation = exports.lightGradient = exports.lightColors = void 0;
+exports.darkTheme = exports.lightTheme = exports.darkElevation = exports.darkGradient = exports.darkColors = exports.lightElevation = exports.lightGradient = exports.lightColors = void 0;
 var getGradientPointsFromColor_1 = require("../../build/helpers/getGradientPointsFromColor");
 var tokenHelpers_1 = require("../../build/helpers/tokenHelpers");
 var fontFamilyAccent = "-apple-system, system-ui, \"Helvetica Neue\", Roboto, sans-serif";
@@ -279,43 +279,7 @@ exports.darkElevation = {
     elevation3: '0px 0px 2px rgba(0, 0, 0, 0.08), 0px 4px 16px rgba(0, 0, 0, 0.08)',
     elevation4: '0px 0px 8px rgba(0, 0, 0, 0.12), 0px 16px 16px rgba(0, 0, 0, 0.16)',
 };
-exports.gradients = {
-    gradientAquamarineBlue: '#7DF1FA, #2BB4D6',
-    gradientBlue: '#66CCFF, #3F8AE0',
-    gradientCandy: '#FF99CC, #E52E6A',
-    gradientCrimson: '#FF7373, #E53949, #BF1C38',
-    gradientDisco: '#FFB726, #FF2693, #8122E0, #2693FF',
-    gradientEmerald: '#00D948, #0D8046',
-    gradientGray: '#C1CAD6, #878F99',
-    gradientGreen: '#6CD97E, #12B312',
-    gradientLagoon: '#2BD9D9, #5C9CE6',
-    gradientLavender: '#928FFF, #4B47B2',
-    gradientMarine: '#2EE54D, #0D7EFF',
-    gradientMidnight: '#73D0FF, #3885E1, #0032A6',
-    gradientOrange: '#FFBF80, #E66B2E',
-    gradientPink: '#FF8880, #E62E6B',
-    gradientPurple: '#A393F5, #735CE6',
-    gradientRaspberryPink: '#FF80D5, #E645B1',
-    gradientRed: '#FF7583, #E62E40',
-    gradientRetrowave: '#30F2B1, #5967FF, #FF26A5',
-    gradientSunset: '#FFD24D, #F26549, #E62E6B',
-    gradientTurquoise: '#8AE6E6, #12B3B3',
-    gradientTwilight: '#FF4D87, #9F40FF, #3399FF',
-    gradientUnicorn: '#FF99CC, #A179F2, #5CA1E6',
-    gradientViolet: '#D3A6FF, #903FE0',
-    gradientYellow: '#FFC44D, #F07300',
-    gradientYellowBright: '#FFD54F, #E7A902',
-    gradientHalloweenOrange: '#CB1E3B, #F05C44, #FFA000',
-    gradientHalloweenViolet: '#FFA000, #CD4C4B, #792EC0',
-    gradientNewYear: '#BB64E4, #805BD7, #2866D5',
-    gradientFrost: '#4FA0FF, #016CEA',
-    gradientValentine: '#FF8A65, #F25383, #8F13DB',
-    gradientWarmValentine: '#F3386A, #FF819E',
-    gradientSberkot: '#9DF19D, #31C2A7, #21A19A, #107F8C',
-    gradientMable: '#D9F4FF, #D9F4FF',
-    gradientWomensDay: '#FF99CC, #E52E6A',
-};
-exports.lightTheme = __assign(__assign(__assign(__assign(__assign({ themeName: 'vkBase', themeNameBase: 'vkBase' }, exports.lightColors), exports.gradients), exports.lightGradient), exports.lightElevation), { 
+exports.lightTheme = __assign(__assign(__assign(__assign({ themeName: 'vkBase', themeNameBase: 'vkBase' }, exports.lightColors), exports.lightGradient), exports.lightElevation), { 
     // Типографика
     fontFamilyAccent: fontFamilyAccent, fontFamilyBase: fontFamilyBase, fontWeightAccent1: fontWeightAccent1, fontWeightAccent2: fontWeightAccent2, fontWeightAccent3: fontWeightAccent3, fontWeightBase1: fontWeightBase1, fontWeightBase2: fontWeightBase2, fontWeightBase3: fontWeightBase3, fontTitle1: {
         regular: {