fix: fixed issues

Author: separatrixxx

packages/page-constructor-extension/src/YfmPageConstructor.test.ts

@@ -10,7 +10,7 @@ import type {Node} from '@gravity-ui/markdown-editor/pm/model';
 import {builders} from '@gravity-ui/markdown-editor/pm/test-builder';
 import dd from 'ts-dedent';
 
-import {YfmPageConstructorSpecs} from './extension/YfmPageConstructorSpecs';
+import {YfmPageConstructorSpecsExtension} from './extension/YfmPageConstructorSpecs';
 import {YfmPageConstructorAttrs, yfmPageConstructorNodeName} from './extension/const';
 
 jest.mock('@gravity-ui/markdown-editor', () => {
@@ -44,7 +44,7 @@ const {
     serializer,
 } = new ExtensionsManager({
     extensions: (builder) =>
-        builder.use(BaseSchemaSpecs, {}).use(BlockquoteSpecs).use(YfmPageConstructorSpecs, {}),
+        builder.use(BaseSchemaSpecs, {}).use(BlockquoteSpecs).use(YfmPageConstructorSpecsExtension),
 }).buildDeps();
 
 const {doc, yfmPageConstructor, quote} = builders<'doc' | 'yfmPageConstructor' | 'quote'>(schema, {

packages/page-constructor-extension/src/extension/YfmPageConstructorNodeView/NodeView.tsx

@@ -8,7 +8,7 @@ import type {Node} from '@gravity-ui/markdown-editor/pm/model';
 import type {EditorView, NodeView} from '@gravity-ui/markdown-editor/pm/view';
 import {Portal} from '@gravity-ui/uikit';
 
-import type {YfmPageConstructorOptions} from '..';
+import type {YfmPageConstructorExtensionOptions} from '..';
 import {
     YfmPageConstructorConsts,
     defaultYfmPageConstructorEntityId,
@@ -22,13 +22,13 @@ export class WYfmPageConstructorNodeView implements NodeView {
     private readonly view: EditorView;
     private readonly getPos: () => number | undefined;
     private readonly renderItem;
-    private readonly options: YfmPageConstructorOptions;
+    private readonly options: YfmPageConstructorExtensionOptions;
 
     constructor(
         node: Node,
         view: EditorView,
         getPos: () => number | undefined,
-        options: YfmPageConstructorOptions,
+        options: YfmPageConstructorExtensionOptions,
     ) {
         this.node = node;
         this.view = view;

packages/page-constructor-extension/src/extension/YfmPageConstructorNodeView/YfmPageConstructorView.tsx

@@ -16,15 +16,15 @@ import {Button, Flex, Icon, Loader, Menu, Popup, type PopupPlacement} from '@gra
 
 import {i18n} from '../../i18n';
 import {YfmPageConstructorConsts} from '../YfmPageConstructorSpecs/const';
-import type {YfmPageConstructorOptions} from '../index';
+import type {YfmPageConstructorExtensionOptions} from '../index';
 import type {YfmPageConstructorEntitySharedState} from '../types';
 
 import type {TransformerOptions} from './YfmPageConstructorPreview';
 
 import './YfmPageConstructor.scss';
 
 export {type TransformerOptions};
-export const cnYfmPageConstructor: (...args: unknown[]) => string = cn('yfm-page-constructor');
+export const cnYfmPageConstructor = cn('yfm-page-constructor');
 export const STOP_EVENT_CLASSNAME = 'prosemirror-stop-event';
 
 const b = cnYfmPageConstructor;
@@ -52,7 +52,7 @@ const PageConstructorEditMode: React.FC<{
     initialText: string;
     onSave: (v: string) => void;
     onCancel: () => void;
-    autoSave: YfmPageConstructorOptions['autoSave'];
+    autoSave: YfmPageConstructorExtensionOptions['autoSave'];
     transformerOptions: TransformerOptions;
 }> = ({initialText, onSave, onCancel, autoSave, transformerOptions}) => {
     const {value, handleChange, handleManualSave, isSaveDisabled, isAutoSaveEnabled} = useAutoSave({
@@ -99,7 +99,7 @@ export const YfmPageConstructorView: React.FC<{
     onChange: (content: string) => void;
     onRemove: () => void;
     canEdit: boolean;
-    autoSave: YfmPageConstructorOptions['autoSave'];
+    autoSave: YfmPageConstructorExtensionOptions['autoSave'];
     transformerOptions: TransformerOptions;
 }> = ({view, node, onChange, onRemove, canEdit, autoSave, transformerOptions}) => {
     const entityId: string = node.attrs[YfmPageConstructorConsts.NodeAttrs.EntityId];

packages/page-constructor-extension/src/extension/YfmPageConstructorSpecs/index.tsx

@@ -11,7 +11,7 @@ import {
 
 export {yfmPageConstructorNodeName, YfmPageConstructorConsts} from './const';
 
-export const YfmPageConstructorSpecsExtension: ExtensionAuto = (builder) => {
+const YfmPageConstructorSpecsExtensionFn: ExtensionAuto = (builder) => {
     builder
         .configureMd((md) => md.use(transform({bundle: false}), {}))
         .addNodeSpec(yfmPageConstructorNodeName, () => ({
@@ -57,7 +57,7 @@ export const YfmPageConstructorSpecsExtension: ExtensionAuto = (builder) => {
         });
 };
 
-export const YfmPageConstructorSpecs = Object.assign(
-    YfmPageConstructorSpecsExtension,
+export const YfmPageConstructorSpecsExtension = Object.assign(
+    YfmPageConstructorSpecsExtensionFn,
     YfmPageConstructorConsts,
 );

packages/page-constructor-extension/src/extension/index.ts

@@ -4,12 +4,12 @@ import {Plugin} from '@gravity-ui/markdown-editor/pm/state';
 import {WYfmPageConstructorNodeView} from './YfmPageConstructorNodeView';
 import type {TransformerOptions} from './YfmPageConstructorNodeView/YfmPageConstructorPreview';
 export type {TransformerOptions as YfmPageConstructorTransformerOptions};
-import {YfmPageConstructorSpecs} from './YfmPageConstructorSpecs';
+import {YfmPageConstructorSpecsExtension} from './YfmPageConstructorSpecs';
 import {yfmPageConstructorNodeName} from './YfmPageConstructorSpecs/const';
 import {addYfmPageConstructor} from './actions';
 import {YfmPageConstructorAction} from './const';
 
-export type YfmPageConstructorOptions = {
+export type YfmPageConstructorExtensionOptions = {
     /** Whether the user can edit page-constructor blocks in WYSIWYG mode. @default true */
     canEdit?: boolean;
     /** Auto-save configuration for the YAML editor inside the node view. */
@@ -23,11 +23,11 @@ export type YfmPageConstructorOptions = {
     transformerOptions?: TransformerOptions;
 };
 
-export const YfmPageConstructorExtension: ExtensionAuto<YfmPageConstructorOptions> = (
+export const YfmPageConstructorExtension: ExtensionAuto<YfmPageConstructorExtensionOptions> = (
     builder,
     options,
 ) => {
-    builder.use(YfmPageConstructorSpecs);
+    builder.use(YfmPageConstructorSpecsExtension);
 
     builder.addPlugin(() => {
         return new Plugin({

packages/page-constructor-extension/src/index.ts

@@ -1,2 +1,5 @@
 export {YfmPageConstructorExtension} from './extension';
-export type {YfmPageConstructorOptions, YfmPageConstructorTransformerOptions} from './extension';
+export type {
+    YfmPageConstructorExtensionOptions,
+    YfmPageConstructorTransformerOptions,
+} from './extension';

packages/page-constructor-extension/src/specs.ts

@@ -1,5 +1,4 @@
 export {
-    YfmPageConstructorSpecs,
     YfmPageConstructorSpecsExtension,
     YfmPageConstructorConsts,
     yfmPageConstructorNodeName,
@@ -10,4 +9,3 @@ export {
     yfmPageConstructorNodeType,
     defaultYfmPageConstructorEntityId,
 } from './extension/YfmPageConstructorSpecs/const';
-export {YfmPageConstructorAction} from './extension/const';