@gravity-ui/page-constructor 6.0.0-alpha.1 → 6.0.0-alpha.2

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

@@ -3,26 +3,10 @@
 import { __rest } from "tslib";
 import { BlockType, SubBlockType, } from '../models';
 import { createItemsParser, typografTransformer, yfmTransformer, } from './common';
-function parseTableBlockLegend(transformer, content) {
+function parseTableBlock(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 = __rest(_a, ["title", "text"]);
@@ -97,9 +81,8 @@ function parseContentLayoutTitle(transformer, content) {
 export const blockHeaderTransformer = [
     {
         fields: ['title'],
-        transformer: yfmTransformer,
+        transformer: typografTransformer,
         parser: parseTitle,
-        renderInline: true,
     },
     {
         fields: ['description'],
@@ -156,30 +139,26 @@ export const config = {
     ],
     [SubBlockType.Quote]: [
         {
-            fields: ['text', 'yfmText'],
+            fields: ['text'],
+            transformer: typografTransformer,
+        },
+        {
+            fields: ['yfmText'],
             transformer: yfmTransformer,
-            renderInline: true,
         },
     ],
     [BlockType.ExtendedFeaturesBlock]: [
         ...blockHeaderTransformer,
         {
             fields: ['items'],
-            transformer: yfmTransformer,
+            transformer: typografTransformer,
             parser: createItemsParser(['title']),
-            renderInline: true,
         },
         {
             fields: ['items'],
             transformer: yfmTransformer,
             parser: createItemsParser(['text', 'additionalInfo']),
         },
-        {
-            fields: ['items'],
-            transformer: yfmTransformer,
-            parser: createItemsParser(['list.text']),
-            renderInline: true,
-        },
     ],
     [BlockType.PromoFeaturesBlock]: [
         ...blockHeaderTransformer,
@@ -209,8 +188,7 @@ export const config = {
     [BlockType.BannerBlock]: [
         {
             fields: ['title'],
-            transformer: yfmTransformer,
-            renderInline: true,
+            transformer: typografTransformer,
         },
         {
             fields: ['subtitle'],
@@ -263,13 +241,7 @@ export const config = {
         {
             fields: ['table'],
             transformer: yfmTransformer,
-            parser: parseTableBlockLegend,
-        },
-        {
-            fields: ['table'],
-            transformer: yfmTransformer,
-            parser: parseTableBlockContent,
-            renderInline: true,
+            parser: parseTableBlock,
         },
     ],
     [BlockType.HeaderSliderBlock]: [
@@ -295,11 +267,6 @@ export const config = {
             fields: ['description'],
             transformer: yfmTransformer,
         },
-        {
-            fields: ['overtitle', 'title'],
-            transformer: yfmTransformer,
-            renderInline: true,
-        },
     ],
     [BlockType.ContentLayoutBlock]: [
         {
@@ -353,20 +320,13 @@ export const config = {
     [SubBlockType.PriceCard]: [
         {
             fields: ['title'],
-            transformer: yfmTransformer,
-            renderInline: true,
+            transformer: typografTransformer,
         },
         {
             fields: ['list'],
             transformer: yfmTransformer,
             parser: createItemsParser(['text']),
         },
-        {
-            fields: ['list'],
-            transformer: yfmTransformer,
-            parser: createItemsParser(['title']),
-            renderInline: true,
-        },
     ],
     [BlockType.FormBlock]: [
         {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "6.0.0-alpha.1",
+  "version": "6.0.0-alpha.2",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

package/server/text-transform/common.d.ts

@@ -1,19 +1,18 @@
 import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { Lang } from './types';
 export type ComplexItem = {
-    [key: string]: string | object;
+    [key: string]: string;
 };
 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 | object;
+    [x: string]: string;
 } | null)[];
 export declare function yfmTransformer(lang: Lang, content: string, options?: {
     plugins?: MarkdownItPluginCb[];
-}, renderInline?: boolean): string;
+}): string;
 export declare function typografTransformer(lang: Lang, content: string): string;

package/server/text-transform/common.js

@@ -15,47 +15,20 @@ const createItemsParser = (fields) => (transformer, items) => items.map((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]: typeof subItem[secondProperty] === 'string'
-                            ? transformer(subItem[secondProperty])
-                            : subItem[secondProperty] })));
-                }
-                else {
-                    // eslint-disable-next-line no-param-reassign
-                    acc[firstProperty] = Object.assign(Object.assign({}, root), { [secondProperty]: typeof root[secondProperty] === 'string'
-                            ? transformer(root[secondProperty])
-                            : root[secondProperty] });
-                }
-            }
-            else if (item[fieldName]) {
+            if (item[fieldName]) {
                 // eslint-disable-next-line no-param-reassign
-                acc[fieldName] =
-                    typeof item[fieldName] === 'string'
-                        ? transformer(item[fieldName])
-                        : item[fieldName];
+                acc[fieldName] = transformer(item[fieldName]);
             }
             return acc;
         }, {}));
     }
 });
 exports.createItemsParser = createItemsParser;
-function yfmTransformer(lang, content, options = {}, renderInline = false) {
+function yfmTransformer(lang, content, options = {}) {
     const { plugins = [] } = options;
     const { html } = (0, utils_1.fullTransform)(content, {
         lang,
         plugins: [...plugins_1.default, ...plugins],
-        renderInline,
     });
     return html;
 }

package/server/text-transform/config.d.ts

@@ -1,8 +1,8 @@
 import { TitleItemProps } from '../models';
-import { Parser, Transformer, TransformerRaw, yfmTransformer } from './common';
+import { Parser, Transformer, TransformerRaw, typografTransformer, yfmTransformer } from './common';
 export declare const blockHeaderTransformer: ({
     fields: string[];
-    transformer: typeof yfmTransformer;
+    transformer: typeof typografTransformer;
     parser: (transformer: Transformer, title: TitleItemProps | string) => string | {
         text: string;
         navTitle?: string | undefined;
@@ -14,18 +14,15 @@ 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/server/text-transform/config.js

@@ -16,26 +16,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = exports.blockHeaderTransformer = void 0;
 const models_1 = require("../models");
 const common_1 = require("./common");
-function parseTableBlockLegend(transformer, content) {
+function parseTableBlock(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 = __rest(_a, ["title", "text"]);
@@ -110,9 +94,8 @@ function parseContentLayoutTitle(transformer, content) {
 exports.blockHeaderTransformer = [
     {
         fields: ['title'],
-        transformer: common_1.yfmTransformer,
+        transformer: common_1.typografTransformer,
         parser: parseTitle,
-        renderInline: true,
     },
     {
         fields: ['description'],
@@ -169,30 +152,26 @@ exports.config = {
     ],
     [models_1.SubBlockType.Quote]: [
         {
-            fields: ['text', 'yfmText'],
+            fields: ['text'],
+            transformer: common_1.typografTransformer,
+        },
+        {
+            fields: ['yfmText'],
             transformer: common_1.yfmTransformer,
-            renderInline: true,
         },
     ],
     [models_1.BlockType.ExtendedFeaturesBlock]: [
         ...exports.blockHeaderTransformer,
         {
             fields: ['items'],
-            transformer: common_1.yfmTransformer,
+            transformer: common_1.typografTransformer,
             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,
@@ -222,8 +201,7 @@ exports.config = {
     [models_1.BlockType.BannerBlock]: [
         {
             fields: ['title'],
-            transformer: common_1.yfmTransformer,
-            renderInline: true,
+            transformer: common_1.typografTransformer,
         },
         {
             fields: ['subtitle'],
@@ -276,13 +254,7 @@ exports.config = {
         {
             fields: ['table'],
             transformer: common_1.yfmTransformer,
-            parser: parseTableBlockLegend,
-        },
-        {
-            fields: ['table'],
-            transformer: common_1.yfmTransformer,
-            parser: parseTableBlockContent,
-            renderInline: true,
+            parser: parseTableBlock,
         },
     ],
     [models_1.BlockType.HeaderSliderBlock]: [
@@ -308,11 +280,6 @@ exports.config = {
             fields: ['description'],
             transformer: common_1.yfmTransformer,
         },
-        {
-            fields: ['overtitle', 'title'],
-            transformer: common_1.yfmTransformer,
-            renderInline: true,
-        },
     ],
     [models_1.BlockType.ContentLayoutBlock]: [
         {
@@ -366,20 +333,13 @@ exports.config = {
     [models_1.SubBlockType.PriceCard]: [
         {
             fields: ['title'],
-            transformer: common_1.yfmTransformer,
-            renderInline: true,
+            transformer: common_1.typografTransformer,
         },
         {
             fields: ['list'],
             transformer: common_1.yfmTransformer,
             parser: (0, common_1.createItemsParser)(['text']),
         },
-        {
-            fields: ['list'],
-            transformer: common_1.yfmTransformer,
-            parser: (0, common_1.createItemsParser)(['title']),
-            renderInline: true,
-        },
     ],
     [models_1.BlockType.FormBlock]: [
         {

package/server/text-transform/transformers.js

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