refactor(editor): store should not rely on inline (#11017)

blocksuite/affine/blocks/block-code/src/adapters/html.ts

@@ -5,7 +5,7 @@ import {
   CODE_BLOCK_WRAP_KEY,
   HastUtils,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import { bundledLanguagesInfo, codeToHast } from 'shiki';
 

blocksuite/affine/blocks/block-code/src/adapters/markdown.ts

@@ -5,7 +5,7 @@ import {
   CODE_BLOCK_WRAP_KEY,
   type MarkdownAST,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import type { Code } from 'mdast';
 

blocksuite/affine/blocks/block-code/src/adapters/plain-text.ts

@@ -3,7 +3,7 @@ import {
   BlockPlainTextAdapterExtension,
   type BlockPlainTextAdapterMatcher,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 
 export const codeBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher = {
   flavour: CodeBlockSchema.model.flavour,

blocksuite/affine/blocks/block-code/src/highlight/affine-code-unit.ts

@@ -1,7 +1,8 @@
 import { affineTextStyles } from '@blocksuite/affine-rich-text';
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { ShadowlessElement } from '@blocksuite/block-std';
-import { type DeltaInsert, ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { html } from 'lit';
 import { property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';

blocksuite/affine/blocks/block-database/src/adapters/utils.ts

@@ -1,6 +1,5 @@
 import type { ColumnDataType, SerializedCells } from '@blocksuite/affine-model';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { BlockSnapshot } from '@blocksuite/store';
+import type { BlockSnapshot, DeltaInsert } from '@blocksuite/store';
 
 import { databaseBlockModels } from '../properties/model';
 

blocksuite/affine/blocks/block-database/src/detail-panel/note-renderer.ts

@@ -12,7 +12,7 @@ import { createDefaultDoc, matchModels } from '@blocksuite/affine-shared/utils';
 import { type EditorHost, ShadowlessElement } from '@blocksuite/block-std';
 import type { DetailSlotProps, SingleView } from '@blocksuite/data-view';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
-import type { BaseTextAttributes } from '@blocksuite/inline';
+import type { BaseTextAttributes } from '@blocksuite/store';
 import { computed } from '@preact/signals-core';
 import { css, html } from 'lit';
 import { property } from 'lit/decorators.js';

blocksuite/affine/blocks/block-database/src/properties/rich-text/cell-renderer.ts

@@ -18,8 +18,7 @@ import {
   createIcon,
 } from '@blocksuite/data-view';
 import { IS_MAC } from '@blocksuite/global/env';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { BlockSnapshot } from '@blocksuite/store';
+import type { BlockSnapshot, DeltaInsert } from '@blocksuite/store';
 import { Text } from '@blocksuite/store';
 import { computed, effect, signal } from '@preact/signals-core';
 import { ref } from 'lit/directives/ref.js';

blocksuite/affine/blocks/block-database/src/properties/rich-text/define.ts

@@ -1,6 +1,6 @@
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { propertyType, t } from '@blocksuite/data-view';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { Text } from '@blocksuite/store';
 import * as Y from 'yjs';
 import zod from 'zod';

blocksuite/affine/blocks/block-database/src/properties/title/text.ts

@@ -13,8 +13,7 @@ import {
 import { BaseCellRenderer } from '@blocksuite/data-view';
 import { IS_MAC } from '@blocksuite/global/env';
 import { LinkedPageIcon } from '@blocksuite/icons/lit';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { BlockSnapshot, Text } from '@blocksuite/store';
+import type { BlockSnapshot, DeltaInsert, Text } from '@blocksuite/store';
 import { signal } from '@preact/signals-core';
 import { property } from 'lit/decorators.js';
 import { createRef, ref } from 'lit/directives/ref.js';

blocksuite/affine/blocks/block-list/src/adapters/html.ts

@@ -5,7 +5,7 @@ import {
   type BlockHtmlAdapterMatcher,
   HastUtils,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import type { Element } from 'hast';
 

blocksuite/affine/blocks/block-list/src/adapters/markdown.ts

@@ -5,7 +5,7 @@ import {
   type BlockMarkdownAdapterMatcher,
   type MarkdownAST,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import type { List } from 'mdast';
 

blocksuite/affine/blocks/block-list/src/adapters/notion-html.ts

@@ -4,7 +4,7 @@ import {
   type BlockNotionHtmlAdapterMatcher,
   HastUtils,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 
 const listBlockMatchTags = new Set(['ul', 'ol', 'li']);

blocksuite/affine/blocks/block-list/src/adapters/plain-text.ts

@@ -3,7 +3,7 @@ import {
   BlockPlainTextAdapterExtension,
   type BlockPlainTextAdapterMatcher,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 
 export const listBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher = {
   flavour: ListBlockSchema.model.flavour,

blocksuite/affine/blocks/block-paragraph/src/adapters/html.ts

@@ -5,8 +5,8 @@ import {
   HastUtils,
   type HtmlAST,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
-import { nanoid, type NodeProps } from '@blocksuite/store';
+import type { DeltaInsert, NodeProps } from '@blocksuite/store';
+import { nanoid } from '@blocksuite/store';
 
 const paragraphBlockMatchTags = new Set([
   'p',

blocksuite/affine/blocks/block-paragraph/src/adapters/markdown.ts

@@ -4,7 +4,7 @@ import {
   type BlockMarkdownAdapterMatcher,
   type MarkdownAST,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import type { Heading } from 'mdast';
 

blocksuite/affine/blocks/block-paragraph/src/adapters/plain-text.ts

@@ -3,7 +3,7 @@ import {
   BlockPlainTextAdapterExtension,
   type BlockPlainTextAdapterMatcher,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 
 export const paragraphBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher =
   {

blocksuite/affine/blocks/block-root/src/adapters/markdown.ts

@@ -3,7 +3,7 @@ import {
   BlockMarkdownAdapterExtension,
   type BlockMarkdownAdapterMatcher,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 
 export const rootBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher = {
   flavour: RootBlockSchema.model.flavour,

blocksuite/affine/blocks/block-surface/src/adapters/utils/text.ts

@@ -1,4 +1,4 @@
-import type { DeltaInsert } from '@blocksuite/inline/types';
+import type { DeltaInsert } from '@blocksuite/store';
 
 import type { MindMapTreeNode } from '../types/mindmap.js';
 import { buildMindMapTree } from './mindmap.js';

blocksuite/affine/blocks/block-table/src/adapters/plain-text.ts

@@ -7,7 +7,7 @@ import {
   BlockPlainTextAdapterExtension,
   type BlockPlainTextAdapterMatcher,
 } from '@blocksuite/affine-shared/adapters';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 
 import { createTableProps, formatTable, processTable } from './utils.js';

blocksuite/affine/blocks/block-table/src/adapters/utils.ts

@@ -10,7 +10,7 @@ import {
 } from '@blocksuite/affine-shared/adapters';
 import { HastUtils } from '@blocksuite/affine-shared/adapters';
 import { generateFractionalIndexingKeyBetween } from '@blocksuite/affine-shared/utils';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { nanoid } from '@blocksuite/store';
 import type { Element } from 'hast';
 import type { Table as MarkdownTable } from 'mdast';

blocksuite/affine/fragments/fragment-outline/src/card/outline-preview.ts

@@ -14,8 +14,7 @@ import { ShadowlessElement } from '@blocksuite/block-std';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
 import { noop } from '@blocksuite/global/utils';
 import { LinkedPageIcon } from '@blocksuite/icons/lit';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { BlockModel } from '@blocksuite/store';
+import type { BlockModel, DeltaInsert } from '@blocksuite/store';
 import { consume } from '@lit/context';
 import { html, nothing } from 'lit';
 import { property } from 'lit/decorators.js';

blocksuite/affine/model/src/blocks/table/table-model.ts

@@ -1,5 +1,4 @@
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { Text } from '@blocksuite/store';
+import type { DeltaInsert, Text } from '@blocksuite/store';
 import {
   BlockModel,
   BlockSchemaExtension,

blocksuite/affine/rich-text/src/extension/inline-manager.ts

@@ -6,11 +6,13 @@ import {
 } from '@blocksuite/global/di';
 import {
   type AttributeRenderer,
-  baseTextAttributes,
-  type DeltaInsert,
   getDefaultAttributeRenderer,
 } from '@blocksuite/inline';
-import type { ExtensionType } from '@blocksuite/store';
+import {
+  baseTextAttributes,
+  type DeltaInsert,
+  type ExtensionType,
+} from '@blocksuite/store';
 import { z, type ZodObject, type ZodTypeAny } from 'zod';
 
 import { MarkdownMatcherIdentifier } from './markdown-matcher.js';

blocksuite/affine/rich-text/src/extension/type.ts

@@ -1,10 +1,9 @@
 import type {
   AttributeRenderer,
-  BaseTextAttributes,
-  DeltaInsert,
   InlineEditor,
   InlineRange,
 } from '@blocksuite/inline';
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 import type * as Y from 'yjs';
 import type { ZodTypeAny } from 'zod';
 

blocksuite/affine/rich-text/src/inline/presets/nodes/affine-text.ts

@@ -1,6 +1,7 @@
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { ShadowlessElement } from '@blocksuite/block-std';
-import { type DeltaInsert, ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { html } from 'lit';
 import { property } from 'lit/decorators.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';

blocksuite/affine/rich-text/src/inline/presets/nodes/footnote-node/footnote-node.ts

@@ -10,12 +10,12 @@ import {
 } from '@blocksuite/block-std';
 import { WithDisposable } from '@blocksuite/global/lit';
 import {
-  type DeltaInsert,
   INLINE_ROOT_ATTR,
   type InlineRootElement,
   ZERO_WIDTH_NON_JOINER,
   ZERO_WIDTH_SPACE,
 } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { shift } from '@floating-ui/dom';
 import { baseTheme } from '@toeverything/theme';
 import { css, html, nothing, unsafeCSS } from 'lit';

blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-editor-unit.ts

@@ -1,6 +1,7 @@
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { ShadowlessElement } from '@blocksuite/block-std';
-import { type DeltaInsert, ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import { ZERO_WIDTH_SPACE } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { html } from 'lit';
 import { property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';

blocksuite/affine/rich-text/src/inline/presets/nodes/latex-node/latex-node.ts

@@ -8,11 +8,11 @@ import {
 } from '@blocksuite/block-std';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
 import {
-  type DeltaInsert,
   type InlineEditor,
   ZERO_WIDTH_NON_JOINER,
   ZERO_WIDTH_SPACE,
 } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { signal } from '@preact/signals-core';
 import katex from 'katex';
 import { css, html, render } from 'lit';

blocksuite/affine/rich-text/src/inline/presets/nodes/link-node/affine-link.ts

@@ -9,11 +9,11 @@ import type { BlockComponent, BlockStdScope } from '@blocksuite/block-std';
 import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
 import { WithDisposable } from '@blocksuite/global/lit';
 import {
-  type DeltaInsert,
   INLINE_ROOT_ATTR,
   type InlineRootElement,
   ZERO_WIDTH_SPACE,
 } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { css, html } from 'lit';
 import { property } from 'lit/decorators.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';

blocksuite/affine/rich-text/src/inline/presets/nodes/reference-node/reference-node.ts

@@ -19,13 +19,12 @@ import { BLOCK_ID_ATTR, ShadowlessElement } from '@blocksuite/block-std';
 import { WithDisposable } from '@blocksuite/global/lit';
 import { LinkedPageIcon } from '@blocksuite/icons/lit';
 import {
-  type DeltaInsert,
   INLINE_ROOT_ATTR,
   type InlineRootElement,
   ZERO_WIDTH_NON_JOINER,
   ZERO_WIDTH_SPACE,
 } from '@blocksuite/inline';
-import type { DocMeta, Store } from '@blocksuite/store';
+import type { DeltaInsert, DocMeta, Store } from '@blocksuite/store';
 import { css, html, nothing } from 'lit';
 import { property, state } from 'lit/decorators.js';
 import { choose } from 'lit/directives/choose.js';

blocksuite/affine/rich-text/src/rich-text.ts

@@ -3,12 +3,12 @@ import { ShadowlessElement } from '@blocksuite/block-std';
 import { WithDisposable } from '@blocksuite/global/lit';
 import {
   type AttributeRenderer,
-  type DeltaInsert,
   InlineEditor,
   type InlineRange,
   type InlineRangeProvider,
   type VLine,
 } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import { Text } from '@blocksuite/store';
 import { effect, signal } from '@preact/signals-core';
 import { css, html, type TemplateResult } from 'lit';

blocksuite/affine/shared/src/adapters/html/delta-converter.ts

@@ -3,8 +3,7 @@ import {
   type ServiceIdentifier,
   type ServiceProvider,
 } from '@blocksuite/global/di';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { ExtensionType } from '@blocksuite/store';
+import type { DeltaInsert, ExtensionType } from '@blocksuite/store';
 
 import type { AffineTextAttributes } from '../../types/index.js';
 import {

blocksuite/affine/shared/src/adapters/markdown/delta-converter.ts

@@ -2,8 +2,7 @@ import {
   createIdentifier,
   type ServiceIdentifier,
 } from '@blocksuite/global/di';
-import type { DeltaInsert } from '@blocksuite/inline/types';
-import type { ExtensionType } from '@blocksuite/store';
+import type { DeltaInsert, ExtensionType } from '@blocksuite/store';
 import type { PhrasingContent } from 'mdast';
 
 import type { AffineTextAttributes } from '../../types/index.js';

blocksuite/affine/shared/src/adapters/mix-text.ts

@@ -1,12 +1,12 @@
 import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';
 import type { ServiceProvider } from '@blocksuite/global/di';
-import type { DeltaInsert } from '@blocksuite/inline';
 import {
   type AssetsManager,
   ASTWalker,
   BaseAdapter,
   type BlockSnapshot,
   BlockSnapshotSchema,
+  type DeltaInsert,
   type DocSnapshot,
   type ExtensionType,
   type FromBlockSnapshotPayload,

blocksuite/affine/shared/src/adapters/notion-html/delta-converter.ts

@@ -2,8 +2,7 @@ import {
   createIdentifier,
   type ServiceIdentifier,
 } from '@blocksuite/global/di';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { ExtensionType } from '@blocksuite/store';
+import type { DeltaInsert, ExtensionType } from '@blocksuite/store';
 import isEqual from 'lodash-es/isEqual';
 
 import type { AffineTextAttributes } from '../../types/index.js';

blocksuite/affine/shared/src/adapters/notion-text.ts

@@ -1,10 +1,10 @@
 import { DefaultTheme } from '@blocksuite/affine-model';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import type { DeltaInsert } from '@blocksuite/inline';
 import {
   type AssetsManager,
   BaseAdapter,
   type BlockSnapshot,
+  type DeltaInsert,
   type DocSnapshot,
   type ExtensionType,
   type FromBlockSnapshotResult,

blocksuite/affine/shared/src/adapters/plain-text/delta-converter.ts

@@ -2,8 +2,7 @@ import {
   createIdentifier,
   type ServiceIdentifier,
 } from '@blocksuite/global/di';
-import type { DeltaInsert } from '@blocksuite/inline';
-import type { ExtensionType } from '@blocksuite/store';
+import type { DeltaInsert, ExtensionType } from '@blocksuite/store';
 
 import type { AffineTextAttributes } from '../../types/index.js';
 import {

blocksuite/affine/shared/src/adapters/types/adapter.ts

@@ -1,12 +1,13 @@
 import { createIdentifier, type ServiceProvider } from '@blocksuite/global/di';
-import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/inline';
 import {
   type AssetsManager,
   type ASTWalker,
   type ASTWalkerContext,
   type BaseAdapter,
+  type BaseTextAttributes,
   type BlockSnapshot,
   BlockSnapshotSchema,
+  type DeltaInsert,
   type NodeProps,
   type Transformer,
 } from '@blocksuite/store';

blocksuite/affine/shared/src/adapters/utils/text.ts

@@ -1,5 +1,5 @@
 import type { ReferenceParams } from '@blocksuite/affine-model';
-import type { DeltaInsert } from '@blocksuite/inline';
+import type { DeltaInsert } from '@blocksuite/store';
 import isEqual from 'lodash-es/isEqual';
 
 const mergeDeltas = (

blocksuite/affine/widgets/widget-slash-menu/src/config.ts

@@ -15,8 +15,7 @@ import {
   TomorrowIcon,
   YesterdayIcon,
 } from '@blocksuite/icons/lit';
-import type { DeltaInsert } from '@blocksuite/inline';
-import { Slice, Text } from '@blocksuite/store';
+import { type DeltaInsert, Slice, Text } from '@blocksuite/store';
 
 import { slashMenuToolTips } from './tooltips';
 import type { SlashMenuConfig } from './types';