squash

Author: saxumcordis

packages/editor/src/bundle/types.ts

@@ -5,7 +5,9 @@ import type {ReactNode} from 'react';
 import type {MarkupString} from '../common';
 import type {EscapeConfig, Extension} from '../core';
 import type {Logger2} from '../logger';
-import type {CreateCodemirrorParams, LineRange, YfmLangOptions} from '../markup';
+import type {CreateCodemirrorParams} from '../markup/codemirror/create';
+import type {MarkupLineNumbersConfig} from '../markup/codemirror/line-highlight/types';
+import type {YfmLangOptions} from '../markup/codemirror/yfm';
 import type {FileUploadHandler} from '../utils';
 import type {DirectiveSyntaxContext, DirectiveSyntaxOption} from '../utils/directive';
 import type {ParseInsertedUrlAsImage} from '../utils/upload';
@@ -117,19 +119,7 @@ export type MarkdownEditorExperimentalOptions = {
      */
     preserveMarkupFormatting?: boolean;
 };
-
-export interface MarkupLineNumbersConfig {
-    /** Show line numbers in the gutter. Default: false */
-    enabled?: boolean;
-    /** Enable line highlighting (clickable line numbers + highlight decoration). Default: false */
-    highlightLines?: boolean;
-    /** Initial line range to highlight on mount (0-based, inclusive) */
-    initialSelectedLines?: LineRange;
-    /** Called when user clicks on a line number (only when highlightLines is true). 0-based line number. */
-    onLineClick?: (line: number) => void;
-    /** 0-based line number to scroll to on mount in markup mode */
-    scrollToLine?: number;
-}
+export type {MarkupLineNumbersConfig};
 
 export type MarkdownEditorMarkupConfig = {
     /**

packages/editor/src/markup/codemirror/create.ts

@@ -23,7 +23,6 @@ import {InputState} from 'src/utils/input-state';
 
 import {ActionName} from '../../bundle/config/action-names';
 import type {EventMap} from '../../bundle/events';
-import type {MarkupLineNumbersConfig} from '../../bundle/types';
 import type {ReactRenderStorage} from '../../extensions';
 import {type Logger2, globalLogger} from '../../logger';
 import {Action as A, formatter as f} from '../../shortcuts';
@@ -57,6 +56,7 @@ import {FilesUploadPlugin} from './files-upload-plugin';
 import {gravityHighlightStyle, gravityTheme} from './gravity';
 import {MarkdownConverter} from './html-to-markdown/converters';
 import {lineHighlight} from './line-highlight';
+import type {MarkupLineNumbersConfig} from './line-highlight/types';
 import {LoggerFacet} from './logger-facet';
 import {PairingCharactersExtension} from './pairing-chars';
 import {ReactRendererFacet} from './react-facet';

packages/editor/src/markup/codemirror/line-highlight/extension.ts

@@ -15,10 +15,7 @@ import {
     lineNumbers,
 } from '@codemirror/view';
 
-export interface LineRange {
-    from: number;
-    to: number;
-}
+import type {LineRange} from './types';
 
 export interface LineHighlightOptions {
     initialRange?: LineRange;

packages/editor/src/markup/codemirror/line-highlight/index.ts

@@ -1,2 +1,3 @@
-export type {LineRange, LineHighlightOptions} from './extension';
+export type {LineRange} from './types';
+export type {LineHighlightOptions} from './extension';
 export {lineHighlight, setHighlightedLine} from './extension';

packages/editor/src/markup/codemirror/line-highlight/types.ts

@@ -0,0 +1,17 @@
+export interface LineRange {
+    from: number;
+    to: number;
+}
+
+export interface MarkupLineNumbersConfig {
+    /** Show line numbers in the gutter. Default: false */
+    enabled?: boolean;
+    /** Enable line highlighting (clickable line numbers + highlight decoration). Default: false */
+    highlightLines?: boolean;
+    /** Initial line range to highlight on mount (0-based, inclusive) */
+    initialSelectedLines?: LineRange;
+    /** Called when user clicks on a line number (only when highlightLines is true). 0-based line number. */
+    onLineClick?: (line: number) => void;
+    /** 0-based line number to scroll to on mount in markup mode */
+    scrollToLine?: number;
+}