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

blocksuite/framework/inline/package.json

@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@blocksuite/global": "workspace:*",
+    "@blocksuite/store": "workspace:*",
     "@preact/signals-core": "^1.8.0",
     "lit": "^3.2.0",
     "rxjs": "^7.8.1",

blocksuite/framework/inline/src/__tests__/utils.ts

@@ -1,6 +1,7 @@
+import type { DeltaInsert } from '@blocksuite/store';
 import { expect, type Page } from '@playwright/test';
 
-import type { DeltaInsert, InlineEditor, InlineRange } from '../index.js';
+import type { InlineEditor, InlineRange } from '../index.js';
 
 const defaultPlaygroundURL = new URL(
   `http://localhost:${process.env.CI ? 4173 : 5173}/`

blocksuite/framework/inline/src/components/v-element.ts

@@ -1,6 +1,7 @@
 import { DisposableGroup } from '@blocksuite/global/disposable';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
 import { SignalWatcher } from '@blocksuite/global/lit';
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 import { effect, signal } from '@preact/signals-core';
 import { html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
@@ -8,8 +9,6 @@ import { styleMap } from 'lit/directives/style-map.js';
 
 import { ZERO_WIDTH_SPACE } from '../consts.js';
 import type { InlineEditor } from '../inline-editor.js';
-import type { DeltaInsert } from '../types.js';
-import type { BaseTextAttributes } from '../utils/base-attributes.js';
 import { isInlineRangeIntersect } from '../utils/inline-range.js';
 
 export class VElement<

blocksuite/framework/inline/src/components/v-line.ts

@@ -1,11 +1,11 @@
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
+import type { DeltaInsert } from '@blocksuite/store';
 import { html, LitElement, type TemplateResult } from 'lit';
 import { property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import { INLINE_ROOT_ATTR, ZERO_WIDTH_SPACE } from '../consts.js';
 import type { InlineRootElement } from '../inline-editor.js';
-import type { DeltaInsert } from '../types.js';
 import { EmbedGap } from './embed-gap.js';
 
 export class VLine extends LitElement {

blocksuite/framework/inline/src/inline-editor.ts

@@ -1,5 +1,6 @@
 import { DisposableGroup } from '@blocksuite/global/disposable';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 import { type Signal, signal } from '@preact/signals-core';
 import { nothing, render, type TemplateResult } from 'lit';
 import { Subject } from 'rxjs';
@@ -16,12 +17,8 @@ import {
 } from './services/index.js';
 import { RenderService } from './services/render.js';
 import { InlineTextService } from './services/text.js';
-import type { DeltaInsert, InlineRange } from './types.js';
-import {
-  type BaseTextAttributes,
-  nativePointToTextPoint,
-  textPointToDomPoint,
-} from './utils/index.js';
+import type { InlineRange } from './types.js';
+import { nativePointToTextPoint, textPointToDomPoint } from './utils/index.js';
 import { getTextNodesFromElement } from './utils/text.js';
 
 export type InlineRootElement<

blocksuite/framework/inline/src/services/attribute.ts

@@ -1,19 +1,16 @@
+import { type BaseTextAttributes, baseTextAttributes } from '@blocksuite/store';
 import type { z, ZodTypeDef } from 'zod';
 
 import type { InlineEditor } from '../inline-editor.js';
 import type { AttributeRenderer, InlineRange } from '../types.js';
-import type { BaseTextAttributes } from '../utils/index.js';
-import {
-  baseTextAttributes,
-  getDefaultAttributeRenderer,
-} from '../utils/index.js';
+import { getDefaultAttributeRenderer } from '../utils/index.js';
 
 export class AttributeService<TextAttributes extends BaseTextAttributes> {
   private _attributeRenderer: AttributeRenderer<TextAttributes> =
     getDefaultAttributeRenderer<TextAttributes>();
 
   private _attributeSchema: z.ZodSchema<TextAttributes, ZodTypeDef, unknown> =
-    baseTextAttributes as z.ZodSchema<TextAttributes, ZodTypeDef, unknown>;
+    baseTextAttributes as never;
 
   private _marks: TextAttributes | null = null;
 

blocksuite/framework/inline/src/services/delta.ts

@@ -1,6 +1,7 @@
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
+
 import type { InlineEditor } from '../inline-editor.js';
-import type { DeltaEntry, DeltaInsert, InlineRange } from '../types.js';
-import type { BaseTextAttributes } from '../utils/index.js';
+import type { DeltaEntry, InlineRange } from '../types.js';
 import { transformDeltasToEmbedDeltas } from '../utils/index.js';
 
 export class DeltaService<TextAttributes extends BaseTextAttributes> {

blocksuite/framework/inline/src/services/event.ts

@@ -1,7 +1,8 @@
+import type { BaseTextAttributes } from '@blocksuite/store';
+
 import type { InlineEditor } from '../inline-editor.js';
 import type { InlineRange } from '../types.js';
 import {
-  type BaseTextAttributes,
   isInEmbedElement,
   isInEmbedGap,
   isInEmptyLine,
@@ -115,7 +116,7 @@ export class EventService<TextAttributes extends BaseTextAttributes> {
       ctx.data,
       ctx.attributes,
       ctx.inlineRange,
-      this.editor as InlineEditor
+      this.editor as never
     );
 
     this.editor.slots.inputting.next();

blocksuite/framework/inline/src/services/hook.ts

@@ -1,6 +1,7 @@
+import type { BaseTextAttributes } from '@blocksuite/store';
+
 import type { InlineEditor } from '../inline-editor.js';
 import type { InlineRange } from '../types.js';
-import type { BaseTextAttributes } from '../utils/base-attributes.js';
 
 export interface BeforeinputHookCtx<TextAttributes extends BaseTextAttributes> {
   inlineEditor: InlineEditor<TextAttributes>;

blocksuite/framework/inline/src/services/range.ts

@@ -1,10 +1,10 @@
+import type { BaseTextAttributes } from '@blocksuite/store';
 import { effect } from '@preact/signals-core';
 import * as Y from 'yjs';
 
 import type { VLine } from '../components/v-line.js';
 import type { InlineEditor } from '../inline-editor.js';
 import type { InlineRange, TextPoint } from '../types.js';
-import type { BaseTextAttributes } from '../utils/base-attributes.js';
 import { isInEmbedGap } from '../utils/embed.js';
 import { isMaybeInlineRangeEqual } from '../utils/inline-range.js';
 import {

blocksuite/framework/inline/src/services/render.ts

@@ -1,4 +1,5 @@
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
+import type { BaseTextAttributes } from '@blocksuite/store';
 import { html, render } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
 import * as Y from 'yjs';
@@ -6,7 +7,6 @@ import * as Y from 'yjs';
 import type { VLine } from '../components/v-line.js';
 import type { InlineEditor } from '../inline-editor.js';
 import type { InlineRange } from '../types.js';
-import type { BaseTextAttributes } from '../utils/base-attributes.js';
 import { deltaInsertsToChunks } from '../utils/delta-convert.js';
 
 export class RenderService<TextAttributes extends BaseTextAttributes> {

blocksuite/framework/inline/src/services/text.ts

@@ -1,6 +1,7 @@
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
+
 import type { InlineEditor } from '../inline-editor.js';
-import type { DeltaInsert, InlineRange } from '../types.js';
-import type { BaseTextAttributes } from '../utils/base-attributes.js';
+import type { InlineRange } from '../types.js';
 import { intersectInlineRange } from '../utils/inline-range.js';
 
 export class InlineTextService<TextAttributes extends BaseTextAttributes> {

blocksuite/framework/inline/src/types.ts

@@ -1,14 +1,7 @@
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 import type { TemplateResult } from 'lit';
 
 import type { InlineEditor } from './inline-editor.js';
-import type { BaseTextAttributes } from './utils/index.js';
-
-export type DeltaInsert<
-  TextAttributes extends BaseTextAttributes = BaseTextAttributes,
-> = {
-  insert: string;
-  attributes?: TextAttributes;
-};
 
 export type AttributeRenderer<
   TextAttributes extends BaseTextAttributes = BaseTextAttributes,

blocksuite/framework/inline/src/utils/attribute-renderer.ts

@@ -1,8 +1,8 @@
+import type { BaseTextAttributes } from '@blocksuite/store';
 import { html } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import type { AttributeRenderer } from '../types.js';
-import type { BaseTextAttributes } from './base-attributes.js';
 
 function inlineTextStyles(
   props: BaseTextAttributes

blocksuite/framework/inline/src/utils/delta-convert.ts

@@ -1,5 +1,4 @@
-import type { DeltaInsert } from '../types.js';
-import type { BaseTextAttributes } from './base-attributes.js';
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 
 export function transformDelta<TextAttributes extends BaseTextAttributes>(
   delta: DeltaInsert<TextAttributes>

blocksuite/framework/inline/src/utils/embed.ts

@@ -1,7 +1,7 @@
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
+
 import { VElement } from '../components/v-element.js';
 import type { InlineEditor } from '../inline-editor.js';
-import type { DeltaInsert } from '../types.js';
-import type { BaseTextAttributes } from './base-attributes.js';
 
 export function isInEmbedElement(node: Node): boolean {
   if (node instanceof Element) {

blocksuite/framework/inline/src/utils/index.ts

@@ -1,5 +1,4 @@
 export * from './attribute-renderer.js';
-export * from './base-attributes.js';
 export * from './delta-convert.js';
 export * from './embed.js';
 export * from './guard.js';

blocksuite/framework/inline/src/utils/renderer.ts

@@ -1,8 +1,6 @@
+import type { BaseTextAttributes, DeltaInsert } from '@blocksuite/store';
 import { html, type TemplateResult } from 'lit';
 
-import type { DeltaInsert } from '../types.js';
-import type { BaseTextAttributes } from './base-attributes.js';
-
 export function renderElement<TextAttributes extends BaseTextAttributes>(
   delta: DeltaInsert<TextAttributes>,
   parseAttributes: (

blocksuite/framework/inline/src/utils/transform-input.ts

@@ -1,6 +1,7 @@
+import type { BaseTextAttributes } from '@blocksuite/store';
+
 import type { InlineEditor } from '../inline-editor.js';
 import type { InlineRange } from '../types.js';
-import type { BaseTextAttributes } from './base-attributes.js';
 
 function handleInsertText<TextAttributes extends BaseTextAttributes>(
   inlineRange: InlineRange,

blocksuite/framework/inline/tsconfig.json

@@ -6,5 +6,5 @@
     "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
   },
   "include": ["./src"],
-  "references": [{ "path": "../global" }]
+  "references": [{ "path": "../global" }, { "path": "../store" }]
 }

blocksuite/framework/store/package.json

@@ -11,7 +11,6 @@
   "license": "MIT",
   "dependencies": {
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/inline": "workspace:*",
     "@blocksuite/sync": "workspace:*",
     "@preact/signals-core": "^1.8.0",
     "@types/lodash.ismatch": "^4.4.9",

blocksuite/framework/store/src/__tests__/block.unit.spec.ts

@@ -10,7 +10,7 @@ import {
   internalPrimitives,
 } from '../model/block/index.js';
 import type { YBlock } from '../model/block/types.js';
-import type { Text } from '../reactive/text.js';
+import type { Text } from '../reactive/text/index.js';
 import { createAutoIncrementIdGenerator } from '../test/index.js';
 import { TestWorkspace } from '../test/test-workspace.js';
 

blocksuite/framework/store/src/__tests__/collection.unit.spec.ts

@@ -3,7 +3,7 @@ import { assert, beforeEach, describe, expect, it, vi } from 'vitest';
 import { applyUpdate, type Doc, encodeStateAsUpdate } from 'yjs';
 
 import type { BlockModel, DocMeta, Store } from '../index.js';
-import { Text } from '../reactive/text.js';
+import { Text } from '../reactive/text/index.js';
 import { createAutoIncrementIdGenerator } from '../test/index.js';
 import { TestWorkspace } from '../test/test-workspace.js';
 import {

blocksuite/framework/store/src/reactive/index.ts

@@ -4,5 +4,5 @@ export * from './is-pure-object.js';
 export * from './native-y.js';
 export * from './proxy.js';
 export * from './stash-pop.js';
-export * from './text.js';
+export * from './text/index.js';
 export * from './types.js';

blocksuite/framework/store/src/reactive/native-y.ts

@@ -2,7 +2,7 @@ import { Array as YArray, Map as YMap, Text as YText } from 'yjs';
 
 import { Boxed } from './boxed.js';
 import { isPureObject } from './is-pure-object.js';
-import { Text } from './text.js';
+import { Text } from './text/index.js';
 import type { Native2Y, TransformOptions } from './types.js';
 
 export function native2Y<T>(

blocksuite/framework/store/src/reactive/proxy.ts

@@ -6,7 +6,7 @@ import { BaseReactiveYData } from './base-reactive-data.js';
 import { Boxed, type OnBoxedChange } from './boxed.js';
 import { proxies } from './memory.js';
 import { native2Y, y2Native } from './native-y.js';
-import { type OnTextChange, Text } from './text.js';
+import { type OnTextChange, Text } from './text/index.js';
 import type { ProxyOptions, TransformOptions, UnRecord } from './types.js';
 
 export class ReactiveYArray extends BaseReactiveYData<

blocksuite/framework/store/src/reactive/text/index.ts

@@ -0,0 +1,3 @@
+export * from './attributes';
+export * from './text';
+export * from './types';

blocksuite/framework/store/src/reactive/text/text.ts

@@ -1,19 +1,8 @@
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
-import type { DeltaInsert } from '@blocksuite/inline';
 import { type Signal, signal } from '@preact/signals-core';
 import * as Y from 'yjs';
 
-export interface OptionalAttributes {
-  attributes?: Record<string, any>;
-}
-
-export type DeltaOperation = {
-  insert?: string;
-  delete?: number;
-  retain?: number;
-} & OptionalAttributes;
-
-export type OnTextChange = (data: Y.Text, isLocal: boolean) => void;
+import type { DeltaInsert, DeltaOperation, OnTextChange } from './types';
 
 /**
  * Text is an abstraction of Y.Text.

blocksuite/framework/store/src/reactive/text/types.ts

@@ -0,0 +1,22 @@
+import type * as Y from 'yjs';
+
+import type { BaseTextAttributes } from './attributes';
+
+export interface OptionalAttributes {
+  attributes?: Record<string, any>;
+}
+
+export type DeltaOperation = {
+  insert?: string;
+  delete?: number;
+  retain?: number;
+} & OptionalAttributes;
+
+export type OnTextChange = (data: Y.Text, isLocal: boolean) => void;
+
+export type DeltaInsert<
+  TextAttributes extends BaseTextAttributes = BaseTextAttributes,
+> = {
+  insert: string;
+  attributes?: TextAttributes;
+};

blocksuite/framework/store/tsconfig.json

@@ -6,9 +6,5 @@
     "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
   },
   "include": ["./src"],
-  "references": [
-    { "path": "../global" },
-    { "path": "../inline" },
-    { "path": "../sync" }
-  ]
+  "references": [{ "path": "../global" }, { "path": "../sync" }]
 }