@gravity-ui/page-constructor 6.0.0-alpha.3 → 6.0.0-alpha.4

package/README.md

@@ -146,6 +146,10 @@ const post = {
 
 You can find more utilities in this [section](https://github.com/gravity-ui/page-constructor/tree/main/src/text-transform)
 
+### Detailed Documentation on Server Utilities and Transformers
+
+For a comprehensive guide on using server utilities, including detailed explanations and advanced use cases, visit the [additional chapter on server utils usage](./docs/data-preparation.md).
+
 ### Custom blocks
 
 The page constructor lets you use blocks that are user-defined in their app. Blocks are regular React components.

package/build/cjs/blocks/Slider/schema.d.ts

@@ -69,7 +69,16 @@ export declare const SliderProps: {
                 type: string;
                 patternProperties: {
                     '.*': {
-                        type: string[];
+                        oneOf: ({
+                            type: string[];
+                            additionalProperties?: undefined;
+                        } | {
+                            type: string;
+                            additionalProperties: boolean;
+                        } | {
+                            type: string;
+                            additionalProperties?: undefined;
+                        })[];
                     };
                 };
             };
@@ -193,7 +202,16 @@ export declare const SliderBlock: {
                         type: string;
                         patternProperties: {
                             '.*': {
-                                type: string[];
+                                oneOf: ({
+                                    type: string[];
+                                    additionalProperties?: undefined;
+                                } | {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                } | {
+                                    type: string;
+                                    additionalProperties?: undefined;
+                                })[];
                             };
                         };
                     };

package/build/cjs/blocks/Slider/schema.js

@@ -21,7 +21,18 @@ const LoadableProps = {
             type: 'object',
             patternProperties: {
                 '.*': {
-                    type: ['string', 'number', 'boolean'],
+                    oneOf: [
+                        {
+                            type: ['string', 'number', 'boolean'],
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: true,
+                        },
+                        {
+                            type: 'array',
+                        },
+                    ],
                 },
             },
         },

package/build/cjs/blocks/SliderOld/schema.d.ts

@@ -60,7 +60,16 @@ export declare const SliderOldProps: {
                 type: string;
                 patternProperties: {
                     '.*': {
-                        type: string[];
+                        oneOf: ({
+                            type: string[];
+                            additionalProperties?: undefined;
+                        } | {
+                            type: string;
+                            additionalProperties: boolean;
+                        } | {
+                            type: string;
+                            additionalProperties?: undefined;
+                        })[];
                     };
                 };
             };
@@ -176,7 +185,16 @@ export declare const SliderOldBlock: {
                         type: string;
                         patternProperties: {
                             '.*': {
-                                type: string[];
+                                oneOf: ({
+                                    type: string[];
+                                    additionalProperties?: undefined;
+                                } | {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                } | {
+                                    type: string;
+                                    additionalProperties?: undefined;
+                                })[];
                             };
                         };
                     };

package/build/cjs/blocks/SliderOld/schema.js

@@ -21,7 +21,18 @@ const LoadableProps = {
             type: 'object',
             patternProperties: {
                 '.*': {
-                    type: ['string', 'number', 'boolean'],
+                    oneOf: [
+                        {
+                            type: ['string', 'number', 'boolean'],
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: true,
+                        },
+                        {
+                            type: 'array',
+                        },
+                    ],
                 },
             },
         },

package/build/cjs/models/constructor-items/blocks.d.ts

@@ -50,7 +50,7 @@ export interface LoadableProps {
      * @deprecated Will be moved to params
      */
     serviceId?: number;
-    params?: Record<string, string | number | boolean>;
+    params?: Record<string, string | number | boolean | object>;
 }
 export interface LoadableChildren {
     loadable?: LoadableProps;

package/build/cjs/text-transform/common.d.ts

@@ -1,18 +1,19 @@
 import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { Lang } from './types';
 export type ComplexItem = {
-    [key: string]: string;
+    [key: string]: string | object;
 };
 export type Item = string | null | ComplexItem;
 export type Transformer = (text: string) => string;
 export type TransformerRaw = (lang: Lang, content: string, options: {
     plugins: MarkdownItPluginCb[];
+    renderInline?: boolean;
 }) => string;
 export type Parser<T = any> = (transformer: Transformer, block: T) => T;
 export declare const createItemsParser: (fields: string[]) => (transformer: Transformer, items: Item[]) => (string | {
-    [x: string]: string;
+    [x: string]: string | object;
 } | null)[];
 export declare function yfmTransformer(lang: Lang, content: string, options?: {
     plugins?: MarkdownItPluginCb[];
-}): string;
+}, renderInline?: boolean): string;
 export declare function typografTransformer(lang: Lang, content: string): string;

package/build/cjs/text-transform/common.js

@@ -4,29 +4,52 @@ exports.typografTransformer = exports.yfmTransformer = exports.createItemsParser
 const tslib_1 = require("tslib");
 const plugins_1 = tslib_1.__importDefault(require("@diplodoc/transform/lib/plugins"));
 const utils_1 = require("./utils");
-const createItemsParser = (fields) => (transformer, items) => items.map((item) => {
-    if (!item) {
-        return item;
-    }
-    else if (typeof item === 'string') {
-        return transformer(item);
-    }
-    else {
-        return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
-            if (item[fieldName]) {
-                // eslint-disable-next-line no-param-reassign
-                acc[fieldName] = transformer(item[fieldName]);
-            }
-            return acc;
-        }, {}));
-    }
-});
+const createItemsParser = (fields) => (transformer, items) => {
+    const applyTransform = (itemLocal) => typeof itemLocal === 'string' ? transformer(itemLocal) : itemLocal;
+    return items.map((item) => {
+        if (!item) {
+            return item;
+        }
+        else if (typeof item === 'string') {
+            return transformer(item);
+        }
+        else {
+            return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
+                if (fieldName.includes('.')) {
+                    const [firstProperty, secondProperty] = fieldName.split('.');
+                    const root = item[firstProperty];
+                    if (!root || typeof root !== 'object') {
+                        return acc;
+                    }
+                    if (Array.isArray(root)) {
+                        if (!acc[firstProperty]) {
+                            // eslint-disable-next-line no-param-reassign
+                            acc[firstProperty] = [];
+                        }
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = root.map((subItem) => (Object.assign(Object.assign({}, subItem), { [secondProperty]: applyTransform(subItem[secondProperty]) })));
+                    }
+                    else {
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = Object.assign(Object.assign({}, root), { [secondProperty]: applyTransform(root[secondProperty]) });
+                    }
+                }
+                else if (item[fieldName]) {
+                    // eslint-disable-next-line no-param-reassign
+                    acc[fieldName] = applyTransform(item[fieldName]);
+                }
+                return acc;
+            }, {}));
+        }
+    });
+};
 exports.createItemsParser = createItemsParser;
-function yfmTransformer(lang, content, options = {}) {
+function yfmTransformer(lang, content, options = {}, renderInline = false) {
     const { plugins = [] } = options;
     const { html } = (0, utils_1.fullTransform)(content, {
         lang,
         plugins: [...plugins_1.default, ...plugins],
+        renderInline,
     });
     return html;
 }

package/build/cjs/text-transform/config.d.ts

@@ -1,8 +1,8 @@
 import { TitleItemProps } from '../models';
-import { Parser, Transformer, TransformerRaw, typografTransformer, yfmTransformer } from './common';
+import { Parser, Transformer, TransformerRaw, yfmTransformer } from './common';
 export declare const blockHeaderTransformer: ({
     fields: string[];
-    transformer: typeof typografTransformer;
+    transformer: typeof yfmTransformer;
     parser: (transformer: Transformer, title: TitleItemProps | string) => string | {
         text: string;
         navTitle?: string | undefined;
@@ -14,15 +14,18 @@ export declare const blockHeaderTransformer: ({
         custom?: import("react").ReactNode;
         onClick?: (() => void) | undefined;
     };
+    renderInline: boolean;
 } | {
     fields: string[];
     transformer: typeof yfmTransformer;
     parser?: undefined;
+    renderInline?: undefined;
 })[];
 interface BlockConfig {
     transformer: TransformerRaw;
     fields?: string[];
     parser?: Parser;
+    renderInline?: boolean;
 }
 export type BlocksConfig = Record<string, BlockConfig | BlockConfig[]>;
 export declare const config: BlocksConfig;

package/build/cjs/text-transform/config.js

@@ -6,10 +6,26 @@ exports.config = exports.blockHeaderTransformer = void 0;
 const tslib_1 = require("tslib");
 const models_1 = require("../models");
 const common_1 = require("./common");
-function parseTableBlock(transformer, content) {
+function parseTableBlockLegend(transformer, content) {
     const legend = content === null || content === void 0 ? void 0 : content.legend;
     return Object.assign(Object.assign({}, (content || {})), { legend: legend && legend.map((string) => transformer(string)) });
 }
+function parseTableBlockContent(transformer, content) {
+    const legend = content === null || content === void 0 ? void 0 : content.legend;
+    const tableContent = content === null || content === void 0 ? void 0 : content.content;
+    return Object.assign(Object.assign({}, (content || {})), { content: tableContent &&
+            tableContent.map((row, i) => row.map((cell, j) => {
+                if (legend) {
+                    if (i === 0 || j === 0) {
+                        return transformer(cell);
+                    }
+                    return cell;
+                }
+                else {
+                    return transformer(cell);
+                }
+            })) });
+}
 function parseFeatures(transformer, items) {
     return items.map((_a) => {
         var { title, text } = _a, rest = tslib_1.__rest(_a, ["title", "text"]);
@@ -84,8 +100,9 @@ function parseContentLayoutTitle(transformer, content) {
 exports.blockHeaderTransformer = [
     {
         fields: ['title'],
-        transformer: common_1.typografTransformer,
+        transformer: common_1.yfmTransformer,
         parser: parseTitle,
+        renderInline: true,
     },
     {
         fields: ['description'],
@@ -142,26 +159,30 @@ exports.config = {
     ],
     [models_1.SubBlockType.Quote]: [
         {
-            fields: ['text'],
-            transformer: common_1.typografTransformer,
-        },
-        {
-            fields: ['yfmText'],
+            fields: ['text', 'yfmText'],
             transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.ExtendedFeaturesBlock]: [
         ...exports.blockHeaderTransformer,
         {
             fields: ['items'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: (0, common_1.createItemsParser)(['title']),
+            renderInline: true,
         },
         {
             fields: ['items'],
             transformer: common_1.yfmTransformer,
             parser: (0, common_1.createItemsParser)(['text', 'additionalInfo']),
         },
+        {
+            fields: ['items'],
+            transformer: common_1.yfmTransformer,
+            parser: (0, common_1.createItemsParser)(['list.text']),
+            renderInline: true,
+        },
     ],
     [models_1.BlockType.PromoFeaturesBlock]: [
         ...exports.blockHeaderTransformer,
@@ -191,7 +212,8 @@ exports.config = {
     [models_1.BlockType.BannerBlock]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['subtitle'],
@@ -244,7 +266,13 @@ exports.config = {
         {
             fields: ['table'],
             transformer: common_1.yfmTransformer,
-            parser: parseTableBlock,
+            parser: parseTableBlockLegend,
+        },
+        {
+            fields: ['table'],
+            transformer: common_1.yfmTransformer,
+            parser: parseTableBlockContent,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.HeaderSliderBlock]: [
@@ -270,6 +298,11 @@ exports.config = {
             fields: ['description'],
             transformer: common_1.yfmTransformer,
         },
+        {
+            fields: ['overtitle', 'title'],
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
+        },
     ],
     [models_1.BlockType.ContentLayoutBlock]: [
         {
@@ -323,7 +356,8 @@ exports.config = {
     [models_1.SubBlockType.PriceCard]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['list'],

package/build/cjs/text-transform/transformers.js

@@ -22,10 +22,10 @@ function transformBlock(lang, blocksConfig, block, plugins) {
     if (blockConfig) {
         const configs = Array.isArray(blockConfig) ? blockConfig : [blockConfig];
         configs.forEach((transformConfig) => {
-            const { fields, transformer: transformerRaw, parser } = transformConfig;
+            const { fields, transformer: transformerRaw, parser, renderInline } = transformConfig;
             const transformer = (content) => 
             // eslint-disable-next-line no-useless-call
-            transformerRaw.call(null, lang, content, { plugins });
+            transformerRaw.call(null, lang, content, { plugins, renderInline });
             if (fields) {
                 fields.forEach((field) => {
                     if (block[field]) {

package/build/esm/blocks/Slider/schema.d.ts

@@ -69,7 +69,16 @@ export declare const SliderProps: {
                 type: string;
                 patternProperties: {
                     '.*': {
-                        type: string[];
+                        oneOf: ({
+                            type: string[];
+                            additionalProperties?: undefined;
+                        } | {
+                            type: string;
+                            additionalProperties: boolean;
+                        } | {
+                            type: string;
+                            additionalProperties?: undefined;
+                        })[];
                     };
                 };
             };
@@ -193,7 +202,16 @@ export declare const SliderBlock: {
                         type: string;
                         patternProperties: {
                             '.*': {
-                                type: string[];
+                                oneOf: ({
+                                    type: string[];
+                                    additionalProperties?: undefined;
+                                } | {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                } | {
+                                    type: string;
+                                    additionalProperties?: undefined;
+                                })[];
                             };
                         };
                     };

package/build/esm/blocks/Slider/schema.js

@@ -18,7 +18,18 @@ const LoadableProps = {
             type: 'object',
             patternProperties: {
                 '.*': {
-                    type: ['string', 'number', 'boolean'],
+                    oneOf: [
+                        {
+                            type: ['string', 'number', 'boolean'],
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: true,
+                        },
+                        {
+                            type: 'array',
+                        },
+                    ],
                 },
             },
         },

package/build/esm/blocks/SliderOld/schema.d.ts

@@ -60,7 +60,16 @@ export declare const SliderOldProps: {
                 type: string;
                 patternProperties: {
                     '.*': {
-                        type: string[];
+                        oneOf: ({
+                            type: string[];
+                            additionalProperties?: undefined;
+                        } | {
+                            type: string;
+                            additionalProperties: boolean;
+                        } | {
+                            type: string;
+                            additionalProperties?: undefined;
+                        })[];
                     };
                 };
             };
@@ -176,7 +185,16 @@ export declare const SliderOldBlock: {
                         type: string;
                         patternProperties: {
                             '.*': {
-                                type: string[];
+                                oneOf: ({
+                                    type: string[];
+                                    additionalProperties?: undefined;
+                                } | {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                } | {
+                                    type: string;
+                                    additionalProperties?: undefined;
+                                })[];
                             };
                         };
                     };

package/build/esm/blocks/SliderOld/schema.js

@@ -18,7 +18,18 @@ const LoadableProps = {
             type: 'object',
             patternProperties: {
                 '.*': {
-                    type: ['string', 'number', 'boolean'],
+                    oneOf: [
+                        {
+                            type: ['string', 'number', 'boolean'],
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: true,
+                        },
+                        {
+                            type: 'array',
+                        },
+                    ],
                 },
             },
         },

package/build/esm/models/constructor-items/blocks.d.ts

@@ -50,7 +50,7 @@ export interface LoadableProps {
      * @deprecated Will be moved to params
      */
     serviceId?: number;
-    params?: Record<string, string | number | boolean>;
+    params?: Record<string, string | number | boolean | object>;
 }
 export interface LoadableChildren {
     loadable?: LoadableProps;

package/build/esm/text-transform/common.d.ts

@@ -1,18 +1,19 @@
 import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { Lang } from './types';
 export type ComplexItem = {
-    [key: string]: string;
+    [key: string]: string | object;
 };
 export type Item = string | null | ComplexItem;
 export type Transformer = (text: string) => string;
 export type TransformerRaw = (lang: Lang, content: string, options: {
     plugins: MarkdownItPluginCb[];
+    renderInline?: boolean;
 }) => string;
 export type Parser<T = any> = (transformer: Transformer, block: T) => T;
 export declare const createItemsParser: (fields: string[]) => (transformer: Transformer, items: Item[]) => (string | {
-    [x: string]: string;
+    [x: string]: string | object;
 } | null)[];
 export declare function yfmTransformer(lang: Lang, content: string, options?: {
     plugins?: MarkdownItPluginCb[];
-}): string;
+}, renderInline?: boolean): string;
 export declare function typografTransformer(lang: Lang, content: string): string;

package/build/esm/text-transform/common.js

@@ -1,27 +1,50 @@
 import defaultPlugins from '@diplodoc/transform/lib/plugins';
 import { fullTransform, typografToHTML } from './utils';
-export const createItemsParser = (fields) => (transformer, items) => items.map((item) => {
-    if (!item) {
-        return item;
-    }
-    else if (typeof item === 'string') {
-        return transformer(item);
-    }
-    else {
-        return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
-            if (item[fieldName]) {
-                // eslint-disable-next-line no-param-reassign
-                acc[fieldName] = transformer(item[fieldName]);
-            }
-            return acc;
-        }, {}));
-    }
-});
-export function yfmTransformer(lang, content, options = {}) {
+export const createItemsParser = (fields) => (transformer, items) => {
+    const applyTransform = (itemLocal) => typeof itemLocal === 'string' ? transformer(itemLocal) : itemLocal;
+    return items.map((item) => {
+        if (!item) {
+            return item;
+        }
+        else if (typeof item === 'string') {
+            return transformer(item);
+        }
+        else {
+            return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
+                if (fieldName.includes('.')) {
+                    const [firstProperty, secondProperty] = fieldName.split('.');
+                    const root = item[firstProperty];
+                    if (!root || typeof root !== 'object') {
+                        return acc;
+                    }
+                    if (Array.isArray(root)) {
+                        if (!acc[firstProperty]) {
+                            // eslint-disable-next-line no-param-reassign
+                            acc[firstProperty] = [];
+                        }
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = root.map((subItem) => (Object.assign(Object.assign({}, subItem), { [secondProperty]: applyTransform(subItem[secondProperty]) })));
+                    }
+                    else {
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = Object.assign(Object.assign({}, root), { [secondProperty]: applyTransform(root[secondProperty]) });
+                    }
+                }
+                else if (item[fieldName]) {
+                    // eslint-disable-next-line no-param-reassign
+                    acc[fieldName] = applyTransform(item[fieldName]);
+                }
+                return acc;
+            }, {}));
+        }
+    });
+};
+export function yfmTransformer(lang, content, options = {}, renderInline = false) {
     const { plugins = [] } = options;
     const { html } = fullTransform(content, {
         lang,
         plugins: [...defaultPlugins, ...plugins],
+        renderInline,
     });
     return html;
 }

package/build/esm/text-transform/config.d.ts

@@ -1,8 +1,8 @@
 import { TitleItemProps } from '../models';
-import { Parser, Transformer, TransformerRaw, typografTransformer, yfmTransformer } from './common';
+import { Parser, Transformer, TransformerRaw, yfmTransformer } from './common';
 export declare const blockHeaderTransformer: ({
     fields: string[];
-    transformer: typeof typografTransformer;
+    transformer: typeof yfmTransformer;
     parser: (transformer: Transformer, title: TitleItemProps | string) => string | {
         text: string;
         navTitle?: string | undefined;
@@ -14,15 +14,18 @@ export declare const blockHeaderTransformer: ({
         custom?: import("react").ReactNode;
         onClick?: (() => void) | undefined;
     };
+    renderInline: boolean;
 } | {
     fields: string[];
     transformer: typeof yfmTransformer;
     parser?: undefined;
+    renderInline?: undefined;
 })[];
 interface BlockConfig {
     transformer: TransformerRaw;
     fields?: string[];
     parser?: Parser;
+    renderInline?: boolean;
 }
 export type BlocksConfig = Record<string, BlockConfig | BlockConfig[]>;
 export declare const config: BlocksConfig;