diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json index f3fd9c10ff..a641644233 100644 --- a/blocksuite/affine/all/package.json +++ b/blocksuite/affine/all/package.json @@ -73,7 +73,6 @@ "./inline/consts": "./src/inline/consts.ts", "./inline/effects": "./src/inline/effects.ts", "./inline/types": "./src/inline/types.ts", - "./blocks": "./src/blocks/index.ts", "./blocks/attachment": "./src/blocks/attachment.ts", "./blocks/bookmark": "./src/blocks/bookmark.ts", "./blocks/callout": "./src/blocks/callout.ts", @@ -141,6 +140,7 @@ "./shared/theme": "./src/shared/theme.ts", "./shared/types": "./src/shared/types.ts", "./shared/utils": "./src/shared/utils.ts", + "./shared/viewport-renderer": "./src/shared/viewport-renderer.ts", "./schemas": "./src/schemas.ts", "./model": "./src/model/index.ts", "./sync": "./src/sync/index.ts", diff --git a/blocksuite/affine/all/src/blocks/index.ts b/blocksuite/affine/all/src/blocks/index.ts deleted file mode 100644 index 51c41d4eee..0000000000 --- a/blocksuite/affine/all/src/blocks/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -export * from '../adapters/index.js'; -export * from '../extensions/index.js'; -export * from '@blocksuite/affine-block-attachment'; -export * from '@blocksuite/affine-block-bookmark'; -export * from '@blocksuite/affine-block-code'; -export * from '@blocksuite/affine-block-data-view'; -export * from '@blocksuite/affine-block-database'; -export * from '@blocksuite/affine-block-divider'; -export * from '@blocksuite/affine-block-edgeless-text'; -export * from '@blocksuite/affine-block-embed'; -export * from '@blocksuite/affine-block-frame'; -export * from '@blocksuite/affine-block-image'; -export * from '@blocksuite/affine-block-latex'; -export * from '@blocksuite/affine-block-list'; -export * from '@blocksuite/affine-block-note'; -export * from '@blocksuite/affine-block-paragraph'; -export * from '@blocksuite/affine-block-root'; -export * from '@blocksuite/affine-block-surface'; -export * from '@blocksuite/affine-block-surface-ref'; -export * from '@blocksuite/affine-block-table'; -export { - DocTitle, - getDocTitleByEditorHost, -} from '@blocksuite/affine-fragment-doc-title'; -export * from '@blocksuite/affine-fragment-frame-panel'; -export * from '@blocksuite/affine-fragment-outline'; -export * from '@blocksuite/affine-model'; -export * from '@blocksuite/affine-rich-text'; -export * from '@blocksuite/affine-shared/adapters'; -export * from '@blocksuite/affine-shared/commands'; -export { - ViewportTurboRendererExtension, - ViewportTurboRendererIdentifier, -} from '@blocksuite/affine-shared/viewport-renderer'; -export type { DragBlockPayload } from '@blocksuite/affine-widget-drag-handle'; -export * from '@blocksuite/affine-widget-slash-menu'; -export { toolbarWidget } from '@blocksuite/affine-widget-toolbar'; diff --git a/blocksuite/affine/all/src/shared/viewport-renderer.ts b/blocksuite/affine/all/src/shared/viewport-renderer.ts new file mode 100644 index 0000000000..5bb573260c --- /dev/null +++ b/blocksuite/affine/all/src/shared/viewport-renderer.ts @@ -0,0 +1 @@ +export * from '@blocksuite/affine-shared/viewport-renderer'; diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts index 028d519041..d8b32af816 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/auto-complete-panel.ts @@ -662,9 +662,3 @@ export class EdgelessAutoCompletePanel extends WithDisposable(LitElement) { }) accessor std!: BlockStdScope; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-auto-complete-panel': EdgelessAutoCompletePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts index 82e915c588..38882a7479 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/auto-complete/edgeless-auto-complete.ts @@ -750,9 +750,3 @@ export class EdgelessAutoComplete extends WithDisposable(LitElement) { }) accessor std!: BlockStdScope; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-auto-complete': EdgelessAutoComplete; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/tool-icon-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/tool-icon-button.ts index f85c1a575d..e83a2fca15 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/tool-icon-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/tool-icon-button.ts @@ -190,9 +190,3 @@ export class EdgelessToolIconButton extends LitElement { @property({ attribute: false }) accessor withHover: boolean | undefined = undefined; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-tool-icon-button': EdgelessToolIconButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/toolbar-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/toolbar-button.ts index 01aee4e52d..d572e22f6a 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/toolbar-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/buttons/toolbar-button.ts @@ -37,9 +37,3 @@ export class EdgelessToolbarButton extends EdgelessToolIconButton { return html` ${super.render()} `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-toolbar-button': EdgelessToolbarButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/connector/connector-handle.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/connector/connector-handle.ts index 7c665f909a..632a5265cc 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/connector/connector-handle.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/connector/connector-handle.ts @@ -162,9 +162,3 @@ export class EdgelessConnectorHandle extends WithDisposable(LitElement) { }) accessor std!: BlockStdScope; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-connector-handle': EdgelessConnectorHandle; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/frame/frame-preview.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/frame/frame-preview.ts index c47a516e60..93360b2147 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/frame/frame-preview.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/frame/frame-preview.ts @@ -238,9 +238,3 @@ export class FramePreview extends WithDisposable(ShadowlessElement) { @property({ attribute: false }) accessor surfaceWidth: number = DEFAULT_PREVIEW_CONTAINER_WIDTH; } - -declare global { - interface HTMLElementTagNameMap { - 'frame-preview': FramePreview; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts index 8994c93430..cd6477fc13 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/note-slicer/index.ts @@ -433,9 +433,3 @@ export class NoteSlicer extends WidgetComponent< @state() private accessor _isResizing = false; } - -declare global { - interface HTMLElementTagNameMap { - 'note-slicer': NoteSlicer; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/align-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/align-panel.ts index b60e69bffd..0c88b5cfc7 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/align-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/align-panel.ts @@ -68,9 +68,3 @@ export class EdgelessAlignPanel extends LitElement { @property({ attribute: false }) accessor value: TextAlign = TextAlign.Left; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-align-panel': EdgelessAlignPanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/card-style-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/card-style-panel.ts index 258595ac10..d5e67a268c 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/card-style-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/card-style-panel.ts @@ -63,9 +63,3 @@ export class CardStylePanel extends WithDisposable(LitElement) { @property({ attribute: false }) accessor value: EmbedCardStyle | undefined = undefined; } - -declare global { - interface HTMLElementTagNameMap { - 'card-style-panel': CardStylePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/color-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/color-panel.ts index 3659a5d7a4..b0eab1d776 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/color-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/color-panel.ts @@ -312,11 +312,3 @@ export class EdgelessTextColorIcon extends LitElement { @property({ attribute: false }) accessor color!: string; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-color-panel': EdgelessColorPanel; - 'edgeless-color-button': EdgelessColorButton; - 'edgeless-text-color-icon': EdgelessTextColorIcon; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-family-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-family-panel.ts index 6b2190f07d..cff52ee044 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-family-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-family-panel.ts @@ -55,9 +55,3 @@ export class EdgelessFontFamilyPanel extends LitElement { @property({ attribute: false }) accessor value: FontFamily = FontFamily.Inter; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-font-family-panel': EdgelessFontFamilyPanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-weight-and-style-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-weight-and-style-panel.ts index 23170344fc..4e85e73855 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-weight-and-style-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/font-weight-and-style-panel.ts @@ -161,9 +161,3 @@ export class EdgelessFontWeightAndStylePanel extends LitElement { | ((fontWeight: FontWeight, fontStyle: FontStyle) => void) | undefined; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-font-weight-and-style-panel': EdgelessFontWeightAndStylePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/line-width-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/line-width-panel.ts index 70e6e34a93..0a04968e0f 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/line-width-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/line-width-panel.ts @@ -251,9 +251,3 @@ export class EdgelessLineWidthPanel extends WithDisposable(LitElement) { @property({ attribute: false }) accessor selectedSize: LineWidth = LineWidth.Two; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-line-width-panel': EdgelessLineWidthPanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-display-mode-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-display-mode-panel.ts index de18dd12d9..805c296fb6 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-display-mode-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-display-mode-panel.ts @@ -102,9 +102,3 @@ export class NoteDisplayModePanel extends WithDisposable(LitElement) { @property({ attribute: false }) accessor panelWidth = 240; } - -declare global { - interface HTMLElementTagNameMap { - 'note-display-mode-panel': NoteDisplayModePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-shadow-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-shadow-panel.ts index db89b39d56..d777709968 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-shadow-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/note-shadow-panel.ts @@ -142,9 +142,3 @@ export class EdgelessNoteShadowPanel extends WithDisposable(LitElement) { @property({ attribute: false }) accessor value!: string; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-note-shadow-panel': EdgelessNoteShadowPanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/scale-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/scale-panel.ts index 24c7b2230d..186ae8c30b 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/scale-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/scale-panel.ts @@ -129,9 +129,3 @@ export class EdgelessScalePanel extends LitElement { @property({ attribute: false }) accessor scaleList: readonly number[] = SCALE_LIST; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-scale-panel': EdgelessScalePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-panel.ts index 0e5149a68e..8617770417 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-panel.ts @@ -63,9 +63,3 @@ export class EdgelessShapePanel extends LitElement { @property({ attribute: false }) accessor shapeStyle: ShapeStyle = ShapeStyle.Scribbled; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-panel': EdgelessShapePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-style-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-style-panel.ts index 23766723e7..cda08567bb 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-style-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/shape-style-panel.ts @@ -57,9 +57,3 @@ export class EdgelessShapeStylePanel extends LitElement { @property({ attribute: false }) accessor value!: ShapeStyle; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-style-panel': EdgelessShapeStylePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/size-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/size-panel.ts index 7aee6b7aff..ca323b492e 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/size-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/size-panel.ts @@ -160,9 +160,3 @@ export class EdgelessSizePanel extends LitElement { @property({ attribute: 'data-type' }) accessor type: 'normal' | 'check' = 'normal'; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-size-panel': EdgelessSizePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/stroke-style-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/stroke-style-panel.ts index 4b2402adbf..407c924129 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/stroke-style-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/panel/stroke-style-panel.ts @@ -68,9 +68,3 @@ export class StrokeStylePanel extends WithDisposable(LitElement) { @property({ attribute: false }) accessor theme!: ColorScheme; } - -declare global { - interface HTMLElementTagNameMap { - 'stroke-style-panel': StrokeStylePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/presentation/edgeless-navigator-black-background.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/presentation/edgeless-navigator-black-background.ts index 44d4598899..823972e619 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/presentation/edgeless-navigator-black-background.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/presentation/edgeless-navigator-black-background.ts @@ -114,9 +114,3 @@ export class EdgelessNavigatorBlackBackgroundWidget extends WidgetComponent< @state() private accessor show = false; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-navigator-black-background': EdgelessNavigatorBlackBackgroundWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts index ee7bea3606..563f5a84e1 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-dragging-area-rect.ts @@ -56,9 +56,3 @@ export class EdgelessDraggingAreaRectWidget extends WidgetComponent< `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-dragging-area-rect': EdgelessDraggingAreaRectWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts index 52941fed3e..d686f372bd 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/rects/edgeless-selected-rect.ts @@ -1554,9 +1554,3 @@ export class EdgelessSelectedRectWidget extends WidgetComponent< @state() accessor autoCompleteOff = false; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-selected-rect': EdgelessSelectedRectWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts index 6ff85d997b..45aa011dcc 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-connector-label-editor.ts @@ -321,9 +321,3 @@ export class EdgelessConnectorLabelEditor extends WithDisposable( @query('rich-text') accessor richText!: RichText; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-connector-label-editor': EdgelessConnectorLabelEditor; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts index 4cfaee42af..96f4b531f2 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-frame-title-editor.ts @@ -175,9 +175,3 @@ export class EdgelessFrameTitleEditor extends WithDisposable( @query('rich-text') accessor richText: RichText | null = null; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-frame-title-editor': EdgelessFrameTitleEditor; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts index 1e38126f28..36218b3ae8 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-group-title-editor.ts @@ -145,9 +145,3 @@ export class EdgelessGroupTitleEditor extends WithDisposable( @query('rich-text') accessor richText!: RichText; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-group-title-editor': EdgelessGroupTitleEditor; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts index 3e795ed6e5..20a5350d7d 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-shape-text-editor.ts @@ -360,9 +360,3 @@ export class EdgelessShapeTextEditor extends WithDisposable(ShadowlessElement) { @query('rich-text') accessor richText!: RichText; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-text-editor': EdgelessShapeTextEditor; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-text-editor.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-text-editor.ts index f5bb921020..28936e11b0 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-text-editor.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/text/edgeless-text-editor.ts @@ -413,9 +413,3 @@ export class EdgelessTextEditor extends WithDisposable(ShadowlessElement) { @query('rich-text') accessor richText!: RichText; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-text-editor': EdgelessTextEditor; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts index 482a0ef9f4..a34ab309c3 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-menu.ts @@ -80,9 +80,3 @@ export class EdgelessBrushMenu extends EdgelessToolbarToolMixin( @property({ attribute: false }) accessor onChange!: (props: Record) => void; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-brush-menu': EdgelessBrushMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts index 7e519460fe..3840ca82a2 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/brush/brush-tool-button.ts @@ -89,9 +89,3 @@ export class EdgelessBrushToolButton extends EdgelessToolbarToolMixin( `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-brush-tool-button': EdgelessBrushToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/slide-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/slide-menu.ts index 6b8b781e4c..f7ae613475 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/slide-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/slide-menu.ts @@ -174,9 +174,3 @@ export class EdgelessSlideMenu extends WithDisposable(LitElement) { @consume({ context: edgelessToolbarSlotsContext }) accessor toolbarSlots!: EdgelessToolbarSlots; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-slide-menu': EdgelessSlideMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts index c6741d9ef5..4c446b6a02 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/common/toolbar-arrow-up-icon.ts @@ -15,9 +15,3 @@ export class ToolbarArrowUpIcon extends ShadowlessElement { return html` ${ArrowUpSmallIcon()} `; } } - -declare global { - interface HTMLElementTagNameMap { - 'toolbar-arrow-up-icon': ToolbarArrowUpIcon; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts index ea006a9380..36f865bc75 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-menu.ts @@ -148,9 +148,3 @@ export class EdgelessConnectorMenu extends EdgelessToolbarToolMixin( @property({ attribute: false }) accessor onChange!: (props: Record) => void; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-connector-menu': EdgelessConnectorMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts index eef9363f75..5d3330de51 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/connector/connector-tool-button.ts @@ -74,9 +74,3 @@ export class EdgelessConnectorToolButton extends QuickToolMixin( `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-connector-tool-button': EdgelessConnectorToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts index 4c6fd3c08c..136d808132 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/default/default-tool-button.ts @@ -97,9 +97,3 @@ export class EdgelessDefaultToolButton extends QuickToolMixin(LitElement) { @query('.current-icon') accessor currentIcon!: HTMLInputElement; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-default-tool-button': EdgelessDefaultToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts index cd405f98bd..5e7b4c807d 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/edgeless-toolbar.ts @@ -693,9 +693,3 @@ export class EdgelessToolbarWidget extends WidgetComponent< @query('.edgeless-toolbar-container') accessor toolbarContainer!: HTMLElement; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-toolbar-widget': EdgelessToolbarWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/eraser/eraser-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/eraser/eraser-tool-button.ts index 0b01a82836..c4373a68cb 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/eraser/eraser-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/eraser/eraser-tool-button.ts @@ -70,9 +70,3 @@ export class EdgelessEraserToolButton extends EdgelessToolbarToolMixin( `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-eraser-tool-button': EdgelessEraserToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-menu.ts index 6cca38fd0a..068ceddf86 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-menu.ts @@ -96,9 +96,3 @@ export class EdgelessFrameMenu extends EdgelessToolbarToolMixin(LitElement) { `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-frame-menu': EdgelessFrameMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-tool-button.ts index a43f8dec0c..00467c4ba5 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/frame/frame-tool-button.ts @@ -43,9 +43,3 @@ export class EdgelessFrameToolButton extends QuickToolMixin(LitElement) { `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-frame-tool-button': EdgelessFrameToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts index 28b8c15a50..f49ffa99f8 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/lasso/lasso-tool-button.ts @@ -95,9 +95,3 @@ export class EdgelessLassoToolButton extends QuickToolMixin( @query('.current-icon') accessor currentIcon!: HTMLInputElement; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-lasso-tool-button': EdgelessLassoToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/link/link-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/link/link-tool-button.ts index aba3320655..ec010f5d41 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/link/link-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/link/link-tool-button.ts @@ -62,9 +62,3 @@ export class EdgelessLinkToolButton extends QuickToolMixin(LitElement) { `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-link-tool-button': EdgelessLinkToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-importing-placeholder.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-importing-placeholder.ts index 32635fd544..c35c4372df 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-importing-placeholder.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-importing-placeholder.ts @@ -52,9 +52,3 @@ export class MindMapPlaceholder extends ShadowlessElement { `; } } - -declare global { - interface HTMLElementTagNameMap { - 'mindmap-import-placeholder': MindMapPlaceholder; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts index d0429a05a5..17577b1c82 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-menu.ts @@ -395,9 +395,3 @@ export class EdgelessMindmapMenu extends EdgelessToolbarToolMixin( @consume({ context: stdContext }) accessor std!: BlockStdScope; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-mindmap-menu': EdgelessMindmapMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts index 020be2ab5b..b94a6a3510 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/mindmap/mindmap-tool-button.ts @@ -446,9 +446,3 @@ export class EdgelessMindmapToolButton extends EdgelessToolbarToolMixin( @state() accessor readyToDrop = false; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-mindmap-tool-button': EdgelessMindmapToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-menu.ts index 10a5ebce9a..05fd9374c6 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-menu.ts @@ -204,9 +204,3 @@ export class EdgelessNoteMenu extends EdgelessToolbarToolMixin(LitElement) { @property({ attribute: false }) accessor tip!: string; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-note-menu': EdgelessNoteMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-tool-button.ts index 271237ff62..c4cca7cccf 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/note/note-tool-button.ts @@ -112,9 +112,3 @@ export class EdgelessNoteToolButton extends QuickToolMixin(LitElement) { @state() accessor tip = 'Text'; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-note-tool-button': EdgelessNoteToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts index dc42c77abe..72fc79cf09 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/frame-order-menu.ts @@ -257,9 +257,3 @@ export class EdgelessFrameOrderMenu extends SignalWatcher( @property({ attribute: false }) accessor embed = false; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-frame-order-menu': EdgelessFrameOrderMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts index b2c9c03fd5..313c468085 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/navigator-setting-button.ts @@ -195,9 +195,3 @@ export class EdgelessNavigatorSettingButton extends WithDisposable(LitElement) { @property({ attribute: false }) accessor setPopperShow: (show: boolean) => void = () => {}; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-navigator-setting-button': EdgelessNavigatorSettingButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/present-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/present-button.ts index 4bbcab3907..3fd9ff9329 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/present-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/present/present-button.ts @@ -38,9 +38,3 @@ export class EdgelessPresentButton extends QuickToolMixin( `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-present-button': EdgelessPresentButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts index 5d95fdf6b9..407dfd10dd 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/presentation-toolbar.ts @@ -447,9 +447,3 @@ export class PresentationToolbar extends EdgelessToolbarToolMixin( @property({ type: Boolean }) accessor settingMenuShow = false; } - -declare global { - interface HTMLElementTagNameMap { - 'presentation-toolbar': PresentationToolbar; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts index ac6c4e34b5..43d790d593 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-draggable.ts @@ -350,9 +350,3 @@ export class EdgelessToolbarShapeDraggable extends EdgelessToolbarToolMixin( @query('.edgeless-shape-draggable') accessor shapeContainer!: HTMLDivElement; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-toolbar-shape-draggable': EdgelessToolbarShapeDraggable; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts index 2f56f2b671..c6ce034cc4 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-menu.ts @@ -188,9 +188,3 @@ export class EdgelessShapeMenu extends SignalWatcher( @property({ attribute: false }) accessor onChange!: (name: ShapeName) => void; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-menu': EdgelessShapeMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts index 975da47d46..f6b58c13a3 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-button.ts @@ -84,9 +84,3 @@ export class EdgelessShapeToolButton extends EdgelessToolbarToolMixin( `; } } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-tool-button': EdgelessShapeToolButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts index e281b2bc0e..a7adca5be0 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/shape/shape-tool-element.ts @@ -318,9 +318,3 @@ export class EdgelessShapeToolElement extends WithDisposable(LitElement) { @property({ attribute: false }) accessor shapeType!: ShapeName; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-shape-tool-element': EdgelessShapeToolElement; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts index 273759c37c..7b17de0154 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/overlay-scrollbar.ts @@ -172,9 +172,3 @@ export class OverlayScrollbar extends LitElement { @query('.overlay-handle') private accessor _handle!: HTMLDivElement; } - -declare global { - interface HTMLElementTagNameMap { - 'overlay-scrollbar': OverlayScrollbar; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-loading.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-loading.ts index 5a5f222946..2ea1b7d7d1 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-loading.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-loading.ts @@ -48,9 +48,3 @@ export class AffineTemplateLoading extends LitElement { `; } } - -declare global { - interface HTMLElementTagNameMap { - 'affine-template-loading': AffineTemplateLoading; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts index f57cc94e54..38ee9fec55 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/template/template-panel.ts @@ -512,9 +512,3 @@ export class EdgelessTemplatePanel extends WithDisposable(LitElement) { @state() accessor isDragging = false; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-templates-panel': EdgelessTemplatePanel; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/text/text-menu.ts b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/text/text-menu.ts index 312f548255..177a5a5d9f 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/text/text-menu.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/components/toolbar/text/text-menu.ts @@ -47,9 +47,3 @@ export class EdgelessTextMenu extends EdgelessToolbarToolMixin(LitElement) { @property({ attribute: false }) accessor onChange!: (props: Record) => void; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-text-menu': EdgelessTextMenu; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts index d23b5a3791..ab19f5bdc9 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-block.ts @@ -626,9 +626,3 @@ export class EdgelessRootBlockComponent extends BlockComponent< @query('affine-surface') accessor surface!: SurfaceBlockComponent; } - -declare global { - interface HTMLElementTagNameMap { - 'affine-edgeless-root': EdgelessRootBlockComponent; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts index 759e843e3c..683319f925 100644 --- a/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts +++ b/blocksuite/affine/blocks/block-root/src/edgeless/edgeless-root-preview-block.ts @@ -283,9 +283,3 @@ export class EdgelessRootPreviewBlockComponent @query('affine-surface') accessor surface!: SurfaceBlockComponent; } - -declare global { - interface HTMLElementTagNameMap { - 'affine-edgeless-root-preview': EdgelessRootPreviewBlockComponent; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/effects.ts b/blocksuite/affine/blocks/block-root/src/effects.ts index e07d37690c..b7a1a6ce08 100644 --- a/blocksuite/affine/blocks/block-root/src/effects.ts +++ b/blocksuite/affine/blocks/block-root/src/effects.ts @@ -317,3 +317,78 @@ function registerMiscComponents() { // Connector components customElements.define('edgeless-connector-handle', EdgelessConnectorHandle); } + +declare global { + interface HTMLElementTagNameMap { + 'affine-edgeless-root': EdgelessRootBlockComponent; + 'affine-edgeless-root-preview': EdgelessRootPreviewBlockComponent; + 'edgeless-auto-complete-panel': EdgelessAutoCompletePanel; + 'edgeless-auto-complete': EdgelessAutoComplete; + 'edgeless-tool-icon-button': EdgelessToolIconButton; + 'edgeless-toolbar-button': EdgelessToolbarButton; + 'edgeless-connector-handle': EdgelessConnectorHandle; + 'frame-preview': FramePreview; + 'note-slicer': NoteSlicer; + 'edgeless-align-panel': EdgelessAlignPanel; + 'card-style-panel': CardStylePanel; + 'edgeless-color-panel': EdgelessColorPanel; + 'edgeless-color-button': EdgelessColorButton; + 'edgeless-text-color-icon': EdgelessTextColorIcon; + 'edgeless-font-family-panel': EdgelessFontFamilyPanel; + 'edgeless-font-weight-and-style-panel': EdgelessFontWeightAndStylePanel; + 'edgeless-line-width-panel': EdgelessLineWidthPanel; + 'note-display-mode-panel': NoteDisplayModePanel; + 'edgeless-note-shadow-panel': EdgelessNoteShadowPanel; + 'edgeless-scale-panel': EdgelessScalePanel; + 'edgeless-shape-panel': EdgelessShapePanel; + 'edgeless-shape-style-panel': EdgelessShapeStylePanel; + 'edgeless-size-panel': EdgelessSizePanel; + 'stroke-style-panel': StrokeStylePanel; + 'edgeless-navigator-black-background': EdgelessNavigatorBlackBackgroundWidget; + 'edgeless-dragging-area-rect': EdgelessDraggingAreaRectWidget; + 'edgeless-selected-rect': EdgelessSelectedRectWidget; + 'edgeless-connector-label-editor': EdgelessConnectorLabelEditor; + 'edgeless-frame-title-editor': EdgelessFrameTitleEditor; + 'edgeless-group-title-editor': EdgelessGroupTitleEditor; + 'edgeless-shape-text-editor': EdgelessShapeTextEditor; + 'edgeless-text-editor': EdgelessTextEditor; + 'edgeless-toolbar-widget': EdgelessToolbarWidget; + 'presentation-toolbar': PresentationToolbar; + 'edgeless-brush-menu': EdgelessBrushMenu; + 'edgeless-brush-tool-button': EdgelessBrushToolButton; + 'edgeless-slide-menu': EdgelessSlideMenu; + 'toolbar-arrow-up-icon': ToolbarArrowUpIcon; + 'edgeless-connector-menu': EdgelessConnectorMenu; + 'edgeless-connector-tool-button': EdgelessConnectorToolButton; + 'edgeless-default-tool-button': EdgelessDefaultToolButton; + 'edgeless-eraser-tool-button': EdgelessEraserToolButton; + 'edgeless-frame-menu': EdgelessFrameMenu; + 'edgeless-frame-tool-button': EdgelessFrameToolButton; + 'edgeless-lasso-tool-button': EdgelessLassoToolButton; + 'edgeless-link-tool-button': EdgelessLinkToolButton; + 'mindmap-import-placeholder': MindMapPlaceholder; + 'edgeless-mindmap-menu': EdgelessMindmapMenu; + 'edgeless-mindmap-tool-button': EdgelessMindmapToolButton; + 'edgeless-note-menu': EdgelessNoteMenu; + 'edgeless-note-tool-button': EdgelessNoteToolButton; + 'edgeless-frame-order-menu': EdgelessFrameOrderMenu; + 'edgeless-navigator-setting-button': EdgelessNavigatorSettingButton; + 'edgeless-present-button': EdgelessPresentButton; + 'edgeless-toolbar-shape-draggable': EdgelessToolbarShapeDraggable; + 'edgeless-shape-menu': EdgelessShapeMenu; + 'edgeless-shape-tool-button': EdgelessShapeToolButton; + 'edgeless-shape-tool-element': EdgelessShapeToolElement; + 'overlay-scrollbar': OverlayScrollbar; + 'affine-template-loading': AffineTemplateLoading; + 'edgeless-templates-panel': EdgelessTemplatePanel; + 'edgeless-text-menu': EdgelessTextMenu; + 'affine-page-root': PageRootBlockComponent; + 'zoom-bar-toggle-button': ZoomBarToggleButton; + 'edgeless-zoom-toolbar': EdgelessZoomToolbar; + 'affine-image-toolbar': AffineImageToolbar; + + [AFFINE_EDGELESS_ZOOM_TOOLBAR_WIDGET]: AffineEdgelessZoomToolbarWidget; + [AFFINE_IMAGE_TOOLBAR_WIDGET]: AffineImageToolbarWidget; + [AFFINE_INNER_MODAL_WIDGET]: AffineInnerModalWidget; + } +} diff --git a/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts b/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts index 3d3f1c9bc1..3f9e26682b 100644 --- a/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts +++ b/blocksuite/affine/blocks/block-root/src/page/page-root-block.ts @@ -452,9 +452,3 @@ export class PageRootBlockComponent extends BlockComponent< @query('.affine-page-root-block-container') accessor rootElementContainer!: HTMLDivElement; } - -declare global { - interface HTMLElementTagNameMap { - 'affine-page-root': PageRootBlockComponent; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts index 3559642455..e7727db58b 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/index.ts @@ -87,9 +87,3 @@ export class AffineEdgelessZoomToolbarWidget extends WidgetComponent< @state() private accessor _hide = false; } - -declare global { - interface HTMLElementTagNameMap { - [AFFINE_EDGELESS_ZOOM_TOOLBAR_WIDGET]: AffineEdgelessZoomToolbarWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts index 1d6f41c9ca..ff6588dc2d 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-bar-toggle-button.ts @@ -107,9 +107,3 @@ export class ZoomBarToggleButton extends WithDisposable(LitElement) { @property({ attribute: false }) accessor edgeless!: EdgelessRootBlockComponent; } - -declare global { - interface HTMLElementTagNameMap { - 'zoom-bar-toggle-button': ZoomBarToggleButton; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts index 761d3ece0c..503e757c9b 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/edgeless-zoom-toolbar/zoom-toolbar.ts @@ -208,9 +208,3 @@ export class EdgelessZoomToolbar extends WithDisposable(LitElement) { @property({ attribute: false }) accessor layout: 'horizontal' | 'vertical' = 'horizontal'; } - -declare global { - interface HTMLElementTagNameMap { - 'edgeless-zoom-toolbar': EdgelessZoomToolbar; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/components/image-toolbar.ts b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/components/image-toolbar.ts index 96cc075e05..82fe148c48 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/components/image-toolbar.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/components/image-toolbar.ts @@ -136,9 +136,3 @@ export class AffineImageToolbar extends LitElement { @property({ attribute: false }) accessor primaryGroups!: MenuItemGroup[]; } - -declare global { - interface HTMLElementTagNameMap { - 'affine-image-toolbar': AffineImageToolbar; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts index f2467a8b62..342190d3bf 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/image-toolbar/index.ts @@ -165,9 +165,3 @@ export class AffineImageToolbarWidget extends WidgetComponent< this._setHoverController(); } } - -declare global { - interface HTMLElementTagNameMap { - [AFFINE_IMAGE_TOOLBAR_WIDGET]: AffineImageToolbarWidget; - } -} diff --git a/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts b/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts index c95b8a2b4e..bf4e8e3bd0 100644 --- a/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts +++ b/blocksuite/affine/blocks/block-root/src/widgets/inner-modal/inner-modal.ts @@ -56,9 +56,3 @@ export class AffineInnerModalWidget extends WidgetComponent { this._getTarget = fn; } } - -declare global { - interface HTMLElementTagNameMap { - [AFFINE_INNER_MODAL_WIDGET]: AffineInnerModalWidget; - } -} diff --git a/blocksuite/integration-test/src/__tests__/edgeless/color-picker.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/color-picker.spec.ts index 88b60e1578..2b320783b5 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/color-picker.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/color-picker.spec.ts @@ -1,9 +1,7 @@ import '@toeverything/theme/style.css'; -import { - ColorScheme, - type EdgelessRootBlockComponent, -} from '@blocksuite/affine/blocks'; +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; +import { ColorScheme } from '@blocksuite/affine/model'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; import { beforeEach, describe, expect, test } from 'vitest'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts index 27b27228ef..6bbf761bce 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/frame.spec.ts @@ -1,9 +1,9 @@ +import type { FrameBlockComponent } from '@blocksuite/affine/blocks/frame'; import type { AffineFrameTitleWidget, EdgelessRootBlockComponent, - FrameBlockComponent, - FrameBlockModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import type { FrameBlockModel } from '@blocksuite/affine/model'; import { assertType } from '@blocksuite/global/utils'; import { Text } from '@blocksuite/store'; import { beforeEach, describe, expect, test } from 'vitest'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/group.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/group.spec.ts index 3f3c23814f..1369574557 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/group.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/group.spec.ts @@ -1,9 +1,9 @@ +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; import { - type EdgelessRootBlockComponent, type GroupElementModel, LayoutType, NoteDisplayMode, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { MindmapElementModel } from '@blocksuite/affine-model'; import { beforeEach, describe, expect, test } from 'vitest'; import * as Y from 'yjs'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts index eb14f3ba67..f5ea712771 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/last-props.spec.ts @@ -1,13 +1,13 @@ +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; +import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; import { type BrushElementModel, type ConnectorElementModel, DEFAULT_NOTE_SHADOW, DefaultTheme, - type EdgelessRootBlockComponent, type EdgelessTextBlockModel, FontFamily, type FrameBlockModel, - getSurfaceBlock, LayoutType, type MindmapElementModel, MindmapStyle, @@ -16,7 +16,7 @@ import { type ShapeElementModel, ShapeType, type TextElementModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { EditPropsStore } from '@blocksuite/affine/shared/services'; import type { BlockStdScope } from '@blocksuite/block-std'; import { beforeEach, describe, expect, test } from 'vitest'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts index c6b0464424..a2ebba8370 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/layer.spec.ts @@ -1,9 +1,9 @@ +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; +import type { SurfaceElementModel } from '@blocksuite/affine/blocks/surface'; import type { - EdgelessRootBlockComponent, GroupElementModel, NoteBlockModel, - SurfaceElementModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { BlockComponent } from '@blocksuite/block-std'; import { generateKeyBetween } from '@blocksuite/block-std/gfx'; import type { BlockModel, Store } from '@blocksuite/store'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts index 22c622e566..ddd81775ae 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/mindmap.spec.ts @@ -1,5 +1,5 @@ -import { LayoutType, type MindMapView } from '@blocksuite/affine/blocks'; -import type { MindmapElementModel } from '@blocksuite/affine-model'; +import type { MindMapView } from '@blocksuite/affine/blocks/surface'; +import { LayoutType, type MindmapElementModel } from '@blocksuite/affine-model'; import type { GfxController } from '@blocksuite/block-std/gfx'; import { Bound } from '@blocksuite/global/gfx'; import { beforeEach, describe, expect, test } from 'vitest'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/surface-model.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/surface-model.spec.ts index 3840cc0572..127684708d 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/surface-model.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/surface-model.spec.ts @@ -1,10 +1,10 @@ +import type { SurfaceBlockModel } from '@blocksuite/affine/blocks/surface'; import type { BrushElementModel, GroupElementModel, ShapeElementModel, - SurfaceBlockModel, -} from '@blocksuite/affine/blocks'; -import { DefaultTheme } from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; +import { DefaultTheme } from '@blocksuite/affine/model'; import { beforeEach, describe, expect, test, vi } from 'vitest'; import { wait } from '../utils/common.js'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/surface-ref.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/surface-ref.spec.ts index 0a1e45f883..7f30c3e799 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/surface-ref.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/surface-ref.spec.ts @@ -1,9 +1,7 @@ import { type EdgelessRootBlockComponent, EdgelessRootService, - type FrameBlockComponent, - type SurfaceRefBlockComponent, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import type { DocSnapshot } from '@blocksuite/store'; import { beforeEach, describe, expect, test } from 'vitest'; @@ -276,6 +274,9 @@ describe('basic', () => { }); }); +import type { FrameBlockComponent } from '@blocksuite/affine/blocks/frame'; +import type { SurfaceRefBlockComponent } from '@blocksuite/affine/blocks/surface-ref'; + import snapshot from '../snapshots/edgeless/surface-ref.spec.ts/surface-ref.json' assert { type: 'json' }; describe('clipboard', () => { diff --git a/blocksuite/integration-test/src/__tests__/edgeless/template.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/template.spec.ts index 50f5b0a431..738a779748 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/template.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/template.spec.ts @@ -2,7 +2,7 @@ import { EdgelessTemplatePanel, type Template, type TemplateManager, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { beforeEach, expect, test } from 'vitest'; import { setupEditor } from '../utils/setup.js'; diff --git a/blocksuite/integration-test/src/__tests__/edgeless/tools.spec.ts b/blocksuite/integration-test/src/__tests__/edgeless/tools.spec.ts index c489778300..898f1c1b6e 100644 --- a/blocksuite/integration-test/src/__tests__/edgeless/tools.spec.ts +++ b/blocksuite/integration-test/src/__tests__/edgeless/tools.spec.ts @@ -1,7 +1,5 @@ -import type { - EdgelessRootBlockComponent, - SurfaceBlockComponent, -} from '@blocksuite/affine/blocks'; +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; +import type { SurfaceBlockComponent } from '@blocksuite/affine/blocks/surface'; import { beforeEach, describe, expect, test } from 'vitest'; import { click, drag, wait } from '../utils/common.js'; diff --git a/blocksuite/integration-test/src/__tests__/main/snapshot.spec.ts b/blocksuite/integration-test/src/__tests__/main/snapshot.spec.ts index 6723dfe589..4e3a6e6124 100644 --- a/blocksuite/integration-test/src/__tests__/main/snapshot.spec.ts +++ b/blocksuite/integration-test/src/__tests__/main/snapshot.spec.ts @@ -1,7 +1,5 @@ -import { - type SurfaceBlockModel, - ZipTransformer, -} from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; +import type { SurfaceBlockModel } from '@blocksuite/affine/blocks/surface'; import { AffineSchemas } from '@blocksuite/affine/schemas'; import type { PointLocation } from '@blocksuite/global/gfx'; import { Schema } from '@blocksuite/store'; diff --git a/blocksuite/integration-test/src/__tests__/utils/edgeless.ts b/blocksuite/integration-test/src/__tests__/utils/edgeless.ts index 8a881ae406..340b72cc79 100644 --- a/blocksuite/integration-test/src/__tests__/utils/edgeless.ts +++ b/blocksuite/integration-test/src/__tests__/utils/edgeless.ts @@ -1,8 +1,8 @@ import type { EdgelessRootBlockComponent, PageRootBlockComponent, - SurfaceBlockComponent, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import type { SurfaceBlockComponent } from '@blocksuite/affine/blocks/surface'; import type { Store } from '@blocksuite/store'; import type { TestAffineEditorContainer } from '../../index.js'; diff --git a/blocksuite/integration-test/src/__tests__/utils/misc.ts b/blocksuite/integration-test/src/__tests__/utils/misc.ts index 93bf41ad99..12dbc284eb 100644 --- a/blocksuite/integration-test/src/__tests__/utils/misc.ts +++ b/blocksuite/integration-test/src/__tests__/utils/misc.ts @@ -1,5 +1,5 @@ -import { replaceIdMiddleware } from '@blocksuite/affine/blocks'; import { AffineSchemas } from '@blocksuite/affine/schemas'; +import { replaceIdMiddleware } from '@blocksuite/affine/shared/adapters'; import { type DocSnapshot, Schema, diff --git a/blocksuite/integration-test/src/__tests__/utils/setup.ts b/blocksuite/integration-test/src/__tests__/utils/setup.ts index 70255bf741..aa52074318 100644 --- a/blocksuite/integration-test/src/__tests__/utils/setup.ts +++ b/blocksuite/integration-test/src/__tests__/utils/setup.ts @@ -10,11 +10,11 @@ blocksEffects(); effects(); import { - type DocMode, EdgelessEditorBlockSpecs, PageEditorBlockSpecs, StoreExtensions, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/extensions'; +import type { DocMode } from '@blocksuite/affine/model'; import { AffineSchemas } from '@blocksuite/affine/schemas'; import { CommunityCanvasTextFonts, diff --git a/blocksuite/integration-test/src/editors/editor-container.ts b/blocksuite/integration-test/src/editors/editor-container.ts index 68e9bfd672..63afa8b273 100644 --- a/blocksuite/integration-test/src/editors/editor-container.ts +++ b/blocksuite/integration-test/src/editors/editor-container.ts @@ -1,6 +1,6 @@ import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/block-std'; -import type { DocMode } from '@blocksuite/affine/blocks'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; +import type { DocMode } from '@blocksuite/affine/model'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; import { type BlockModel, diff --git a/blocksuite/playground/apps/_common/components/adapters-panel.ts b/blocksuite/playground/apps/_common/components/adapters-panel.ts index 18928cff55..af00f4aff2 100644 --- a/blocksuite/playground/apps/_common/components/adapters-panel.ts +++ b/blocksuite/playground/apps/_common/components/adapters-panel.ts @@ -2,8 +2,9 @@ import '@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js'; import { ShadowlessElement } from '@blocksuite/affine/block-std'; +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; +import { WithDisposable } from '@blocksuite/affine/global/lit'; import { - defaultImageProxyMiddleware, docLinkBaseURLMiddlewareBuilder, embedSyncedDocMiddleware, type HtmlAdapter, @@ -13,8 +14,7 @@ import { type PlainTextAdapter, PlainTextAdapterFactoryIdentifier, titleMiddleware, -} from '@blocksuite/affine/blocks'; -import { WithDisposable } from '@blocksuite/affine/global/lit'; +} from '@blocksuite/affine/shared/adapters'; import type { DocSnapshot } from '@blocksuite/affine/store'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; import { effect } from '@preact/signals-core'; diff --git a/blocksuite/playground/apps/_common/components/starter-debug-menu.ts b/blocksuite/playground/apps/_common/components/starter-debug-menu.ts index 6d1e414a4a..af1db36856 100644 --- a/blocksuite/playground/apps/_common/components/starter-debug-menu.ts +++ b/blocksuite/playground/apps/_common/components/starter-debug-menu.ts @@ -18,23 +18,16 @@ import './left-side-panel.js'; import { ShadowlessElement } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; import { - ColorScheme, createAssetsArchive, - defaultImageProxyMiddleware, - docLinkBaseURLMiddleware, - type DocMode, download, - ExportManager, - HtmlAdapterFactoryIdentifier, HtmlTransformer, - MarkdownAdapterFactoryIdentifier, MarkdownTransformer, NotionHtmlTransformer, - PlainTextAdapterFactoryIdentifier, - titleMiddleware, ZipTransformer, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import { ExportManager } from '@blocksuite/affine/blocks/surface'; import { toast } from '@blocksuite/affine/components/toast'; import { BlockSuiteError, @@ -42,6 +35,14 @@ import { } from '@blocksuite/affine/global/exceptions'; import type { SerializedXYWH } from '@blocksuite/affine/global/gfx'; import type { DeltaInsert } from '@blocksuite/affine/inline/types'; +import { ColorScheme, type DocMode } from '@blocksuite/affine/model'; +import { + docLinkBaseURLMiddleware, + HtmlAdapterFactoryIdentifier, + MarkdownAdapterFactoryIdentifier, + PlainTextAdapterFactoryIdentifier, + titleMiddleware, +} from '@blocksuite/affine/shared/adapters'; import { DocModeProvider } from '@blocksuite/affine/shared/services'; import { ColorVariables, diff --git a/blocksuite/playground/apps/_common/mock-services.ts b/blocksuite/playground/apps/_common/mock-services.ts index 99ecf2d042..af78cf0173 100644 --- a/blocksuite/playground/apps/_common/mock-services.ts +++ b/blocksuite/playground/apps/_common/mock-services.ts @@ -1,10 +1,10 @@ +import { toast } from '@blocksuite/affine/components/toast'; +import { Slot } from '@blocksuite/affine/global/slot'; import { ColorScheme, type DocMode, type ReferenceParams, -} from '@blocksuite/affine/blocks'; -import { toast } from '@blocksuite/affine/components/toast'; -import { Slot } from '@blocksuite/affine/global/slot'; +} from '@blocksuite/affine/model'; import { type DocModeProvider, type EditorSetting, diff --git a/blocksuite/playground/apps/_common/setup.ts b/blocksuite/playground/apps/_common/setup.ts index 64848fed78..f1cbd7c289 100644 --- a/blocksuite/playground/apps/_common/setup.ts +++ b/blocksuite/playground/apps/_common/setup.ts @@ -2,8 +2,8 @@ import type { Template, TemplateCategory, TemplateManager, -} from '@blocksuite/affine/blocks'; -import { EdgelessTemplatePanel } from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import { EdgelessTemplatePanel } from '@blocksuite/affine/blocks/root'; export function setupEdgelessTemplate() { const playgroundTemplates = [ diff --git a/blocksuite/playground/apps/comment/comment-input.ts b/blocksuite/playground/apps/comment/comment-input.ts index 17eea4c1eb..f09d3ab734 100644 --- a/blocksuite/playground/apps/comment/comment-input.ts +++ b/blocksuite/playground/apps/comment/comment-input.ts @@ -1,6 +1,6 @@ import { ShadowlessElement, TextSelection } from '@blocksuite/affine/block-std'; -import type { RichText } from '@blocksuite/affine/blocks'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { RichText } from '@blocksuite/affine/rich-text'; import { css, html, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; import * as Y from 'yjs'; diff --git a/blocksuite/playground/apps/starter/data/affine-snapshot.ts b/blocksuite/playground/apps/starter/data/affine-snapshot.ts index 8aa9f87f86..3f22c1bc39 100644 --- a/blocksuite/playground/apps/starter/data/affine-snapshot.ts +++ b/blocksuite/playground/apps/starter/data/affine-snapshot.ts @@ -1,4 +1,4 @@ -import { ZipTransformer } from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; import { AffineSchemas } from '@blocksuite/affine/schemas'; import { Schema, Text, type Workspace } from '@blocksuite/affine/store'; export async function affineSnapshot(collection: Workspace, id: string) { diff --git a/blocksuite/playground/apps/starter/data/database.ts b/blocksuite/playground/apps/starter/data/database.ts index bf0f33af6d..a8edb4221e 100644 --- a/blocksuite/playground/apps/starter/data/database.ts +++ b/blocksuite/playground/apps/starter/data/database.ts @@ -1,10 +1,12 @@ import { databaseBlockColumns, DatabaseBlockDataSource, +} from '@blocksuite/affine/blocks/database'; +import { type DatabaseBlockModel, type ListType, type ParagraphType, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { Text, type Workspace } from '@blocksuite/affine/store'; import { groupTraitKey } from '@blocksuite/data-view'; import { propertyPresets } from '@blocksuite/data-view/property-presets'; diff --git a/blocksuite/playground/apps/starter/data/preset.ts b/blocksuite/playground/apps/starter/data/preset.ts index 1dea554b93..7047a22bfa 100644 --- a/blocksuite/playground/apps/starter/data/preset.ts +++ b/blocksuite/playground/apps/starter/data/preset.ts @@ -1,4 +1,4 @@ -import { MarkdownTransformer } from '@blocksuite/affine/blocks'; +import { MarkdownTransformer } from '@blocksuite/affine/blocks/root'; import { Text, type Workspace } from '@blocksuite/affine/store'; import type { InitFn } from './utils.js'; diff --git a/blocksuite/playground/apps/starter/data/synced.ts b/blocksuite/playground/apps/starter/data/synced.ts index c68ebb6ce6..415d228936 100644 --- a/blocksuite/playground/apps/starter/data/synced.ts +++ b/blocksuite/playground/apps/starter/data/synced.ts @@ -1,4 +1,4 @@ -import { MarkdownTransformer } from '@blocksuite/affine/blocks'; +import { MarkdownTransformer } from '@blocksuite/affine/blocks/root'; import { Text, type Workspace } from '@blocksuite/affine/store'; import type { InitFn } from './utils'; diff --git a/blocksuite/playground/apps/starter/main.ts b/blocksuite/playground/apps/starter/main.ts index e45833063e..5479b64ac8 100644 --- a/blocksuite/playground/apps/starter/main.ts +++ b/blocksuite/playground/apps/starter/main.ts @@ -1,7 +1,8 @@ import '../../style.css'; import * as blockStd from '@blocksuite/affine/block-std'; -import * as blocks from '@blocksuite/affine/blocks'; +import * as databaseBlocks from '@blocksuite/affine/blocks/database'; +import * as noteBlocks from '@blocksuite/affine/blocks/note'; import { effects as blocksEffects } from '@blocksuite/affine/effects'; import * as globalUtils from '@blocksuite/affine/global/utils'; import * as services from '@blocksuite/affine/shared/services'; @@ -36,7 +37,10 @@ async function main() { Object.defineProperty(window, '$blocksuite', { value: Object.freeze({ store, - blocks, + blocks: { + database: databaseBlocks, + note: noteBlocks, + }, global: { utils: globalUtils }, services, editor, diff --git a/blocksuite/playground/apps/starter/utils/extensions.ts b/blocksuite/playground/apps/starter/utils/extensions.ts index 1211ac9cbd..9cddb81181 100644 --- a/blocksuite/playground/apps/starter/utils/extensions.ts +++ b/blocksuite/playground/apps/starter/utils/extensions.ts @@ -1,8 +1,8 @@ import { EdgelessEditorBlockSpecs, PageEditorBlockSpecs, - RefNodeSlotsProvider, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/extensions'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { CommunityCanvasTextFonts, DocModeProvider, diff --git a/blocksuite/tests-legacy/e2e/database/actions.ts b/blocksuite/tests-legacy/e2e/database/actions.ts index 2a11c52bb3..a2eba54359 100644 --- a/blocksuite/tests-legacy/e2e/database/actions.ts +++ b/blocksuite/tests-legacy/e2e/database/actions.ts @@ -1,7 +1,7 @@ import type { RichTextCell, RichTextCellEditing, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/database'; import { ZERO_WIDTH_SPACE } from '@blocksuite/affine/inline'; import { expect, type Locator, type Page } from '@playwright/test'; diff --git a/blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts b/blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts index 905c1ffe9d..4cb7e5504f 100644 --- a/blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts +++ b/blocksuite/tests-legacy/e2e/edgeless/edgeless-text.spec.ts @@ -1,4 +1,4 @@ -import type { EdgelessTextBlockComponent } from '@blocksuite/affine/blocks'; +import type { EdgelessTextBlockComponent } from '@blocksuite/affine/blocks/edgeless-text'; import { Bound } from '@blocksuite/affine/global/gfx'; import { expect, type Page } from '@playwright/test'; diff --git a/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts b/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts index 4c021bd363..e58d2a6c72 100644 --- a/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts +++ b/blocksuite/tests-legacy/e2e/embed-synced-doc.spec.ts @@ -1,4 +1,4 @@ -import type { DatabaseBlockModel } from '@blocksuite/affine/blocks'; +import type { DatabaseBlockModel } from '@blocksuite/affine/model'; import { expect, type Page } from '@playwright/test'; import { switchEditorMode } from './utils/actions/edgeless.js'; @@ -253,7 +253,7 @@ test.describe('Embed synced doc', () => { ); const model = doc2.getBlockById(databaseId) as DatabaseBlockModel; const datasource = - new window.$blocksuite.blocks.DatabaseBlockDataSource(model); + new window.$blocksuite.blocks.database.DatabaseBlockDataSource(model); datasource.viewManager.viewAdd('table'); }); diff --git a/blocksuite/tests-legacy/e2e/utils/actions/block.ts b/blocksuite/tests-legacy/e2e/utils/actions/block.ts index f3f3b7f49d..fee7ba2ebc 100644 --- a/blocksuite/tests-legacy/e2e/utils/actions/block.ts +++ b/blocksuite/tests-legacy/e2e/utils/actions/block.ts @@ -9,12 +9,15 @@ export async function updateBlockType( ) { await page.evaluate( ([flavour, type]) => { - window.host.std.command.exec(window.$blocksuite.blocks.updateBlockType, { - flavour, - props: { - type, - }, - }); + window.host.std.command.exec( + window.$blocksuite.blocks.note.updateBlockType, + { + flavour, + props: { + type, + }, + } + ); }, [flavour, type] as [string, string?] ); diff --git a/blocksuite/tests-legacy/e2e/utils/actions/misc.ts b/blocksuite/tests-legacy/e2e/utils/actions/misc.ts index 1da3c9b2f9..31ee0db9ab 100644 --- a/blocksuite/tests-legacy/e2e/utils/actions/misc.ts +++ b/blocksuite/tests-legacy/e2e/utils/actions/misc.ts @@ -1,11 +1,8 @@ import '../declare-test-window.js'; -import type { - DatabaseBlockModel, - ListType, - RichText, -} from '@blocksuite/affine/blocks'; import type { InlineRange, InlineRootElement } from '@blocksuite/affine/inline'; +import type { DatabaseBlockModel, ListType } from '@blocksuite/affine/model'; +import type { RichText } from '@blocksuite/affine/rich-text'; import type { BlockModel } from '@blocksuite/affine/store'; import { uuidv4 } from '@blocksuite/affine/store'; import type { TestAffineEditorContainer } from '@blocksuite/integration-test'; @@ -341,9 +338,8 @@ export async function initEmptyDatabaseState(page: Page, rootId?: string) { noteId ); const model = doc.getBlockById(databaseId) as DatabaseBlockModel; - const datasource = new window.$blocksuite.blocks.DatabaseBlockDataSource( - model - ); + const datasource = + new window.$blocksuite.blocks.database.DatabaseBlockDataSource(model); datasource.viewManager.viewAdd('table'); doc.captureSync(); return { rootId, noteId, databaseId }; @@ -378,9 +374,8 @@ export async function initKanbanViewState( noteId ); const model = doc.getBlockById(databaseId) as DatabaseBlockModel; - const datasource = new window.$blocksuite.blocks.DatabaseBlockDataSource( - model - ); + const datasource = + new window.$blocksuite.blocks.database.DatabaseBlockDataSource(model); const rowIds = config.rows.map(rowText => { const rowId = doc.addBlock( 'affine:paragraph', @@ -435,9 +430,8 @@ export async function initEmptyDatabaseWithParagraphState( noteId ); const model = doc.getBlockById(databaseId) as DatabaseBlockModel; - const datasource = new window.$blocksuite.blocks.DatabaseBlockDataSource( - model - ); + const datasource = + new window.$blocksuite.blocks.database.DatabaseBlockDataSource(model); datasource.viewManager.viewAdd('table'); doc.addBlock('affine:paragraph', {}, noteId); doc.captureSync(); diff --git a/blocksuite/tests-legacy/e2e/utils/asserts.ts b/blocksuite/tests-legacy/e2e/utils/asserts.ts index 4b22607ca9..5ebd4af67d 100644 --- a/blocksuite/tests-legacy/e2e/utils/asserts.ts +++ b/blocksuite/tests-legacy/e2e/utils/asserts.ts @@ -5,14 +5,13 @@ import type { EditorHost, TextSelection, } from '@blocksuite/affine/block-std'; +import type { EdgelessNoteBackground } from '@blocksuite/affine/blocks/note'; +import type { InlineRootElement } from '@blocksuite/affine/inline'; +import type { NoteBlockModel, RootBlockModel } from '@blocksuite/affine/model'; import type { AffineInlineEditor, - EdgelessNoteBackground, - NoteBlockModel, RichText, - RootBlockModel, -} from '@blocksuite/affine/blocks'; -import type { InlineRootElement } from '@blocksuite/affine/inline'; +} from '@blocksuite/affine/rich-text'; import type { BlockModel } from '@blocksuite/affine/store'; import { expect, type Locator, type Page } from '@playwright/test'; diff --git a/blocksuite/tests-legacy/e2e/utils/declare-test-window.ts b/blocksuite/tests-legacy/e2e/utils/declare-test-window.ts index b4d6a4e460..08f534cf06 100644 --- a/blocksuite/tests-legacy/e2e/utils/declare-test-window.ts +++ b/blocksuite/tests-legacy/e2e/utils/declare-test-window.ts @@ -12,7 +12,10 @@ declare global { */ $blocksuite: { store: typeof import('@blocksuite/affine/store'); - blocks: typeof import('@blocksuite/affine/blocks'); + blocks: { + database: typeof import('@blocksuite/affine/blocks/database'); + note: typeof import('@blocksuite/affine/blocks/note'); + }; global: { utils: typeof import('@blocksuite/affine/global/utils'); }; diff --git a/blocksuite/tests-legacy/e2e/utils/mindmap.ts b/blocksuite/tests-legacy/e2e/utils/mindmap.ts index 48857582cf..53c50dcc5b 100644 --- a/blocksuite/tests-legacy/e2e/utils/mindmap.ts +++ b/blocksuite/tests-legacy/e2e/utils/mindmap.ts @@ -2,7 +2,7 @@ import type { MindmapElementModel, MindmapNode, ShapeElementModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { Page } from '@playwright/test'; import { clickView } from './actions/click.js'; diff --git a/packages/frontend/apps/android/src/app.tsx b/packages/frontend/apps/android/src/app.tsx index 4413ae960e..c39506d737 100644 --- a/packages/frontend/apps/android/src/app.tsx +++ b/packages/frontend/apps/android/src/app.tsx @@ -25,15 +25,17 @@ import { WorkspacesService } from '@affine/core/modules/workspace'; import { configureBrowserWorkspaceFlavours } from '@affine/core/modules/workspace-engine'; import { I18n } from '@affine/i18n'; import { StoreManagerClient } from '@affine/nbstore/worker/client'; -import { - defaultBlockMarkdownAdapterMatchers, - docLinkBaseURLMiddleware, - InlineDeltaToMarkdownAdapterExtensions, - MarkdownAdapter, - MarkdownInlineToDeltaAdapterExtensions, - titleMiddleware, -} from '@blocksuite/affine/blocks'; +import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; import { Container } from '@blocksuite/affine/global/di'; +import { + InlineDeltaToMarkdownAdapterExtensions, + MarkdownInlineToDeltaAdapterExtensions, +} from '@blocksuite/affine/rich-text'; +import { + docLinkBaseURLMiddleware, + MarkdownAdapter, + titleMiddleware, +} from '@blocksuite/affine/shared/adapters'; import { App as CapacitorApp } from '@capacitor/app'; import { Keyboard } from '@capacitor/keyboard'; import { StatusBar, Style } from '@capacitor/status-bar'; diff --git a/packages/frontend/apps/ios/src/app.tsx b/packages/frontend/apps/ios/src/app.tsx index a6544274f5..a839bb4dcc 100644 --- a/packages/frontend/apps/ios/src/app.tsx +++ b/packages/frontend/apps/ios/src/app.tsx @@ -31,15 +31,17 @@ import { WorkspacesService } from '@affine/core/modules/workspace'; import { configureBrowserWorkspaceFlavours } from '@affine/core/modules/workspace-engine'; import { I18n } from '@affine/i18n'; import { StoreManagerClient } from '@affine/nbstore/worker/client'; -import { - defaultBlockMarkdownAdapterMatchers, - docLinkBaseURLMiddleware, - InlineDeltaToMarkdownAdapterExtensions, - MarkdownAdapter, - MarkdownInlineToDeltaAdapterExtensions, - titleMiddleware, -} from '@blocksuite/affine/blocks'; +import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; import { Container } from '@blocksuite/affine/global/di'; +import { + InlineDeltaToMarkdownAdapterExtensions, + MarkdownInlineToDeltaAdapterExtensions, +} from '@blocksuite/affine/rich-text'; +import { + docLinkBaseURLMiddleware, + MarkdownAdapter, + titleMiddleware, +} from '@blocksuite/affine/shared/adapters'; import { App as CapacitorApp } from '@capacitor/app'; import { Browser } from '@capacitor/browser'; import { Haptics } from '@capacitor/haptics'; diff --git a/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts b/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts index 6e3655f31b..922080047e 100644 --- a/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts +++ b/packages/frontend/core/src/blocksuite/ai/_common/chat-actions-handle.ts @@ -6,19 +6,20 @@ import { TextSelection, } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import type { DocMode, ImageSelection } from '@blocksuite/affine/blocks'; -import { - EdgelessCRUDIdentifier, - getSelectedBlocksCommand, - NoteDisplayMode, - ParagraphBlockModel, - RefNodeSlotsProvider, -} from '@blocksuite/affine/blocks'; +import { EdgelessCRUDIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound, getCommonBoundWithRotation, type SerializedXYWH, } from '@blocksuite/affine/global/gfx'; +import { + type DocMode, + NoteDisplayMode, + ParagraphBlockModel, +} from '@blocksuite/affine/model'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; +import { getSelectedBlocksCommand } from '@blocksuite/affine/shared/commands'; +import type { ImageSelection } from '@blocksuite/affine/shared/selection'; import { DocModeProvider, EditPropsStore, diff --git a/packages/frontend/core/src/blocksuite/ai/_common/config.ts b/packages/frontend/core/src/blocksuite/ai/_common/config.ts index 2c4a91ca8a..b2c9a7b228 100644 --- a/packages/frontend/core/src/blocksuite/ai/_common/config.ts +++ b/packages/frontend/core/src/blocksuite/ai/_common/config.ts @@ -1,11 +1,11 @@ import type { Chain, InitCommandCtx } from '@blocksuite/affine/block-std'; import { CodeBlockModel, - getSelectedModelsCommand, ImageBlockModel, ListBlockModel, ParagraphBlockModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; +import { getSelectedModelsCommand } from '@blocksuite/affine/shared/commands'; import { matchModels } from '@blocksuite/affine/shared/utils'; import { CommentIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts b/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts index ae2f36f0d7..0f4cef6cdc 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/answer-renderer.ts @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import type { MindmapElementModel } from '@blocksuite/affine/blocks'; +import type { MindmapElementModel } from '@blocksuite/affine/model'; import { createAIScrollableTextRenderer } from '../components/ai-scrollable-text-renderer'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts index 2db1a71151..ef1a692ca9 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-handler.ts @@ -3,6 +3,7 @@ import { GfxControllerIdentifier, type GfxModel, } from '@blocksuite/affine/block-std/gfx'; +import { splitElements } from '@blocksuite/affine/blocks/root'; import { CodeBlockModel, EdgelessTextBlockModel, @@ -10,9 +11,8 @@ import { ImageBlockModel, NoteBlockModel, ShapeElementModel, - splitElements, TextElementModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { matchModels } from '@blocksuite/affine/shared/utils'; import { Slice } from '@blocksuite/affine/store'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts index a75459f697..b150d698bd 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/edgeless-response.ts @@ -1,24 +1,30 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import type { - EdgelessElementToolbarWidget, - MindmapElementModel, - ShapeElementModel, -} from '@blocksuite/affine/blocks'; import { - addImages, - EDGELESS_ELEMENT_TOOLBAR_WIDGET, EDGELESS_TEXT_BLOCK_MIN_HEIGHT, EDGELESS_TEXT_BLOCK_MIN_WIDTH, - EdgelessTextBlockModel, +} from '@blocksuite/affine/blocks/edgeless-text'; +import { addImages } from '@blocksuite/affine/blocks/image'; +import { + EDGELESS_ELEMENT_TOOLBAR_WIDGET, + type EdgelessElementToolbarWidget, +} from '@blocksuite/affine/blocks/root'; +import { fitContent, getSurfaceBlock, - ImageBlockModel, MindmapUtils, - NoteDisplayMode, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; import { LightLoadingIcon } from '@blocksuite/affine/components/icons'; import { Bound } from '@blocksuite/affine/global/gfx'; +import type { + MindmapElementModel, + ShapeElementModel, +} from '@blocksuite/affine/model'; +import { + EdgelessTextBlockModel, + ImageBlockModel, + NoteDisplayMode, +} from '@blocksuite/affine/model'; import { TelemetryProvider } from '@blocksuite/affine/shared/services'; import { ChatWithAiIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts index ea0f8a5168..e4c1f8efa9 100644 --- a/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts +++ b/packages/frontend/core/src/blocksuite/ai/actions/page-response.ts @@ -4,17 +4,17 @@ import { type GfxModel, LayerManager, } from '@blocksuite/affine/block-std/gfx'; -import type { - MindmapElementModel, - ShapeElementModel, -} from '@blocksuite/affine/blocks'; +import { uploadBlobForImage } from '@blocksuite/affine/blocks/image'; import { fitContent, getSurfaceBlock, SurfaceBlockModel, - uploadBlobForImage, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx'; +import type { + MindmapElementModel, + ShapeElementModel, +} from '@blocksuite/affine/model'; import { TelemetryProvider } from '@blocksuite/affine/shared/services'; import { type BlockProps, Text } from '@blocksuite/affine/store'; import * as Y from 'yjs'; diff --git a/packages/frontend/core/src/blocksuite/ai/ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/ai-panel.ts index f02149830b..a1da843e7f 100644 --- a/packages/frontend/core/src/blocksuite/ai/ai-panel.ts +++ b/packages/frontend/core/src/blocksuite/ai/ai-panel.ts @@ -1,12 +1,12 @@ import { AINetworkSearchService } from '@affine/core/modules/ai-button/services/network-search'; import type { EditorHost } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; +import { Bound } from '@blocksuite/affine/global/gfx'; import { ImageBlockModel, NoteBlockModel, NoteDisplayMode, -} from '@blocksuite/affine/blocks'; -import { Bound } from '@blocksuite/affine/global/gfx'; +} from '@blocksuite/affine/model'; import { isInsideEdgelessEditor, matchModels, diff --git a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/chat-images.ts b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/chat-images.ts index 2f87c77d07..71ade14f0f 100644 --- a/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/chat-images.ts +++ b/packages/frontend/core/src/blocksuite/ai/blocks/ai-chat-block/components/chat-images.ts @@ -1,4 +1,4 @@ -import { LoadingIcon } from '@blocksuite/affine/blocks'; +import { LoadingIcon } from '@blocksuite/affine/blocks/image'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; import { choose } from 'lit/directives/choose.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-config.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-config.ts index 8cfde6e69f..1311d97e68 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-config.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-config.ts @@ -1,5 +1,5 @@ import type { SearchDocMenuAction } from '@affine/core/modules/doc-search-menu/services'; -import type { LinkedMenuGroup } from '@blocksuite/affine/blocks'; +import type { LinkedMenuGroup } from '@blocksuite/affine/blocks/root'; import type { Store } from '@blocksuite/affine/store'; import type { Signal } from '@preact/signals-core'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts index be76aa4d63..b0286a5596 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/add-popover.ts @@ -1,5 +1,5 @@ import { ShadowlessElement } from '@blocksuite/affine/block-std'; -import { type LinkedMenuGroup } from '@blocksuite/affine/blocks'; +import type { LinkedMenuGroup } from '@blocksuite/affine/blocks/root'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { scrollbarStyle } from '@blocksuite/affine/shared/styles'; import { SearchIcon } from '@blocksuite/icons/lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/utils.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/utils.ts index bb76fb5b3e..8ccc2fbc2b 100644 --- a/packages/frontend/core/src/blocksuite/ai/chat-panel/components/utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/components/utils.ts @@ -1,5 +1,5 @@ import type { CopilotContextDoc, CopilotContextFile } from '@affine/graphql'; -import { LoadingIcon } from '@blocksuite/affine/blocks'; +import { LoadingIcon } from '@blocksuite/affine/blocks/image'; import { WarningIcon } from '@blocksuite/icons/lit'; import { type TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts index 237b56814c..25bcd0de88 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/ai-item/types.ts @@ -3,7 +3,7 @@ import type { EditorHost, InitCommandCtx, } from '@blocksuite/affine/block-std'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { TemplateResult } from 'lit'; export interface AIItemGroupConfig { diff --git a/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts b/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts index d266060d61..6370ddf539 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/chat-action-list.ts @@ -3,7 +3,7 @@ import type { EditorHost, TextSelection, } from '@blocksuite/affine/block-std'; -import { type ImageSelection } from '@blocksuite/affine/blocks'; +import type { ImageSelection } from '@blocksuite/affine/shared/selection'; import { NotificationProvider } from '@blocksuite/affine/shared/services'; import { css, html, LitElement, nothing } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts index be347f3ec7..a03f4dd07a 100644 --- a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts +++ b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts @@ -1,20 +1,20 @@ import { createReactComponentFromLit } from '@affine/component'; +import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; import { BlockStdScope, BlockViewIdentifier, type EditorHost, ShadowlessElement, } from '@blocksuite/affine/block-std'; -import { - codeBlockWrapMiddleware, - defaultBlockMarkdownAdapterMatchers, - defaultImageProxyMiddleware, - InlineDeltaToMarkdownAdapterExtensions, - MarkdownInlineToDeltaAdapterExtensions, - PageEditorBlockSpecs, -} from '@blocksuite/affine/blocks'; +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; +import { PageEditorBlockSpecs } from '@blocksuite/affine/extensions'; import { Container, type ServiceProvider } from '@blocksuite/affine/global/di'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { + InlineDeltaToMarkdownAdapterExtensions, + MarkdownInlineToDeltaAdapterExtensions, +} from '@blocksuite/affine/rich-text'; +import { codeBlockWrapMiddleware } from '@blocksuite/affine/shared/adapters'; import type { ExtensionType, Query, diff --git a/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts b/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts index 2420ceb546..34772f1eb7 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/code-toolbar/setup-code-toolbar.ts @@ -1,6 +1,5 @@ import '../../components/ask-ai-button'; -import type { AffineCodeToolbarWidget } from '@blocksuite/affine/blocks'; import { html } from 'lit'; const AICodeItemGroups = buildAICodeItemGroups(); @@ -10,6 +9,7 @@ const buttonOptions: AskAIButtonOptions = { }; import { BlockSelection } from '@blocksuite/affine/block-std'; +import type { AffineCodeToolbarWidget } from '@blocksuite/affine/blocks/code'; import { buildAICodeItemGroups } from '../../_common/config'; import type { AskAIButtonOptions } from '../../components/ask-ai-button'; diff --git a/packages/frontend/core/src/blocksuite/ai/entries/edgeless/actions-config.ts b/packages/frontend/core/src/blocksuite/ai/entries/edgeless/actions-config.ts index 3d25ebe2bf..38e476987c 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/edgeless/actions-config.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/edgeless/actions-config.ts @@ -1,10 +1,10 @@ +import { splitElements } from '@blocksuite/affine/blocks/root'; +import { AIStarIconWithAnimation } from '@blocksuite/affine/components/icons'; import { MindmapElementModel, ShapeElementModel, - splitElements, TextElementModel, -} from '@blocksuite/affine/blocks'; -import { AIStarIconWithAnimation } from '@blocksuite/affine/components/icons'; +} from '@blocksuite/affine/model'; import { CommentIcon, ExplainIcon, diff --git a/packages/frontend/core/src/blocksuite/ai/entries/edgeless/index.ts b/packages/frontend/core/src/blocksuite/ai/entries/edgeless/index.ts index 10e12308ee..e001443547 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/edgeless/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/edgeless/index.ts @@ -1,9 +1,9 @@ import type { - DocMode, EdgelessElementToolbarWidget, EdgelessRootBlockComponent, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { noop } from '@blocksuite/affine/global/utils'; +import type { DocMode } from '@blocksuite/affine/model'; import { html } from 'lit'; import type { AIItemGroupConfig } from '../../components/ai-item/types'; diff --git a/packages/frontend/core/src/blocksuite/ai/entries/image-toolbar/setup-image-toolbar.ts b/packages/frontend/core/src/blocksuite/ai/entries/image-toolbar/setup-image-toolbar.ts index 72dc768288..4fe2c721b2 100644 --- a/packages/frontend/core/src/blocksuite/ai/entries/image-toolbar/setup-image-toolbar.ts +++ b/packages/frontend/core/src/blocksuite/ai/entries/image-toolbar/setup-image-toolbar.ts @@ -1,9 +1,7 @@ import '../../components/ask-ai-button'; -import { - type AffineImageToolbarWidget, - ImageSelection, -} from '@blocksuite/affine/blocks'; +import type { AffineImageToolbarWidget } from '@blocksuite/affine/blocks/root'; +import { ImageSelection } from '@blocksuite/affine/shared/selection'; import { html } from 'lit'; import { buildAIImageItemGroups } from '../../_common/config'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts index 254ccf2f9a..ab7d15eedb 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts @@ -2,7 +2,7 @@ import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; import { AffineCodeToolbarWidget, CodeBlockSpec, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/code'; import type { ExtensionType } from '@blocksuite/affine/store'; import { setupCodeToolbarAIEntry } from '../entries/code-toolbar/setup-code-toolbar'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts index a9c18288b7..e053dd291e 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-edgeless-root.ts @@ -5,7 +5,7 @@ import { import { EdgelessElementToolbarWidget, EdgelessRootBlockSpec, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts index 11722fcd12..95fa9635a3 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-image.ts @@ -1,8 +1,6 @@ import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; -import { - AffineImageToolbarWidget, - ImageBlockSpec, -} from '@blocksuite/affine/blocks'; +import { ImageBlockSpec } from '@blocksuite/affine/blocks/image'; +import { AffineImageToolbarWidget } from '@blocksuite/affine/blocks/root'; import type { ExtensionType } from '@blocksuite/affine/store'; import { setupImageToolbarAIEntry } from '../entries/image-toolbar/setup-image-toolbar'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts index accfdbd5de..46149f615f 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-page-root.ts @@ -2,7 +2,7 @@ import { BlockFlavourIdentifier, LifeCycleWatcher, } from '@blocksuite/affine/block-std'; -import { PageRootBlockSpec } from '@blocksuite/affine/blocks'; +import { PageRootBlockSpec } from '@blocksuite/affine/blocks/root'; import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-paragraph.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-paragraph.ts index adfeb8260c..7fee821937 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-paragraph.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-paragraph.ts @@ -2,7 +2,7 @@ import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; import { ParagraphBlockService, ParagraphBlockSpec, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/paragraph'; import type { ExtensionType } from '@blocksuite/affine/store'; class AIParagraphBlockWatcher extends LifeCycleWatcher { diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/ai-slash-menu.ts b/packages/frontend/core/src/blocksuite/ai/extensions/ai-slash-menu.ts index 21f9030a26..74ad26191a 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-slash-menu.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-slash-menu.ts @@ -1,12 +1,12 @@ +import { AIStarIcon } from '@blocksuite/affine/components/icons'; +import { DocModeProvider } from '@blocksuite/affine/shared/services'; import { type SlashMenuActionItem, SlashMenuConfigExtension, type SlashMenuContext, type SlashMenuItem, type SlashMenuSubMenu, -} from '@blocksuite/affine/blocks'; -import { AIStarIcon } from '@blocksuite/affine/components/icons'; -import { DocModeProvider } from '@blocksuite/affine/shared/services'; +} from '@blocksuite/affine/widgets/slash-menu'; import { MoreHorizontalIcon } from '@blocksuite/icons/lit'; import { html } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/extensions/enable-ai.ts b/packages/frontend/core/src/blocksuite/ai/extensions/enable-ai.ts index 61f608a0ed..7508374719 100644 --- a/packages/frontend/core/src/blocksuite/ai/extensions/enable-ai.ts +++ b/packages/frontend/core/src/blocksuite/ai/extensions/enable-ai.ts @@ -1,10 +1,10 @@ +import { CodeBlockSpec } from '@blocksuite/affine/blocks/code'; +import { ImageBlockSpec } from '@blocksuite/affine/blocks/image'; +import { ParagraphBlockSpec } from '@blocksuite/affine/blocks/paragraph'; import { - CodeBlockSpec, EdgelessRootBlockSpec, - ImageBlockSpec, PageRootBlockSpec, - ParagraphBlockSpec, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts b/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts index 32726a8030..7638257158 100644 --- a/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts +++ b/packages/frontend/core/src/blocksuite/ai/messages/mindmap.ts @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import type { MindmapStyle } from '@blocksuite/affine/blocks'; +import type { MindmapStyle } from '@blocksuite/affine/model'; import { html, nothing } from 'lit'; import { markdownToMindmap } from '../mini-mindmap'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts index fbf6bb4200..7dc7e5f064 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts @@ -1,9 +1,9 @@ +import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; +import { Container } from '@blocksuite/affine/global/di'; import { - defaultBlockMarkdownAdapterMatchers, InlineDeltaToMarkdownAdapterExtensions, MarkdownInlineToDeltaAdapterExtensions, -} from '@blocksuite/affine/blocks'; -import { Container } from '@blocksuite/affine/global/di'; +} from '@blocksuite/affine/rich-text'; import { TestWorkspace } from '@blocksuite/affine/store/test'; import { describe, expect, test } from 'vitest'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts index f3260f008a..037664ec73 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-preview.ts @@ -1,17 +1,19 @@ import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace.js'; import { BlockStdScope, type EditorHost } from '@blocksuite/affine/block-std'; import { - MarkdownAdapter, - type MindmapElementModel, - MindmapStyle, MindmapStyleFour, MindmapStyleOne, MindmapStyleThree, MindmapStyleTwo, type SurfaceBlockModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; import type { ServiceProvider } from '@blocksuite/affine/global/di'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { + type MindmapElementModel, + MindmapStyle, +} from '@blocksuite/affine/model'; +import { MarkdownAdapter } from '@blocksuite/affine/shared/adapters'; import { Schema, type Store } from '@blocksuite/affine/store'; import { css, html, LitElement, nothing } from 'lit'; import { property, query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts index 02321b2433..9e564ca4f0 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-root-block.ts @@ -1,5 +1,5 @@ import { BlockComponent } from '@blocksuite/affine/block-std'; -import type { RootBlockModel } from '@blocksuite/affine/blocks'; +import type { RootBlockModel } from '@blocksuite/affine/model'; import { html } from 'lit'; export class MindmapRootBlock extends BlockComponent { diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts index 5e8259057c..2fe57e6635 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/mindmap-service.ts @@ -1,6 +1,6 @@ import { BlockService } from '@blocksuite/affine/block-std'; -import { RootBlockSchema } from '@blocksuite/affine/blocks'; import { Slot } from '@blocksuite/affine/global/slot'; +import { RootBlockSchema } from '@blocksuite/affine/model'; export class MindmapService extends BlockService { static override readonly flavour = RootBlockSchema.model.flavour; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts index f4b1b1bbcf..0767012dc5 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/spec.ts @@ -4,9 +4,9 @@ import { } from '@blocksuite/affine/block-std'; import { MindMapView, - RootBlockSchema, SurfaceBlockSchema, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; +import { RootBlockSchema } from '@blocksuite/affine/model'; import { DocModeService, ThemeService, diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts index c652b9c82a..e0cfe7d895 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-block.ts @@ -1,17 +1,14 @@ /* oxlint-disable @typescript-eslint/no-non-null-assertion */ import { BlockComponent } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import type { - Color, - ShapeElementModel, - SurfaceBlockModel, -} from '@blocksuite/affine/blocks'; import { CanvasRenderer, elementRenderers, fitContent, -} from '@blocksuite/affine/blocks'; + type SurfaceBlockModel, +} from '@blocksuite/affine/blocks/surface'; import type { Bound } from '@blocksuite/affine/global/gfx'; +import type { Color, ShapeElementModel } from '@blocksuite/affine/model'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; import { html } from 'lit'; import { query } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts index 2825698f26..5b97a93922 100644 --- a/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts +++ b/packages/frontend/core/src/blocksuite/ai/mini-mindmap/surface-service.ts @@ -1,5 +1,5 @@ import { BlockService } from '@blocksuite/affine/block-std'; -import { SurfaceBlockSchema } from '@blocksuite/affine/blocks'; +import { SurfaceBlockSchema } from '@blocksuite/affine/blocks/surface'; export class MindmapSurfaceBlockService extends BlockService { static override readonly flavour = SurfaceBlockSchema.model.flavour; diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts index 6bd4af2d5a..d582d9b242 100644 --- a/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts +++ b/packages/frontend/core/src/blocksuite/ai/peek-view/chat-block-peek-view.ts @@ -1,10 +1,10 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; import { CanvasElementType, - ConnectorMode, EdgelessCRUDIdentifier, getSurfaceBlock, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; +import { ConnectorMode } from '@blocksuite/affine/model'; import { DocModeProvider, NotificationProvider, diff --git a/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts b/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts index 3eb3038679..bdc8e0d3a1 100644 --- a/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/peek-view/utils.ts @@ -2,7 +2,7 @@ import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { EdgelessCRUDIdentifier, getSurfaceBlock, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/surface'; import { Bound } from '@blocksuite/affine/global/gfx'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/utils/connector.ts b/packages/frontend/core/src/blocksuite/ai/utils/connector.ts index 8426e8c2b0..169052bdd4 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/connector.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/connector.ts @@ -1,8 +1,6 @@ -import { - type ConnectorElementModel, - type EdgelessRootService, - SurfaceBlockComponent, -} from '@blocksuite/affine/blocks'; +import type { EdgelessRootService } from '@blocksuite/affine/blocks/root'; +import { SurfaceBlockComponent } from '@blocksuite/affine/blocks/surface'; +import type { ConnectorElementModel } from '@blocksuite/affine/model'; export const getConnectorFromId = ( id: string, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/context.ts b/packages/frontend/core/src/blocksuite/ai/utils/context.ts index ad3ddfbc72..caea674e16 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/context.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/context.ts @@ -1,6 +1,6 @@ import type { GfxModel } from '@blocksuite/affine/block-std/gfx'; -import type { MindmapStyle } from '@blocksuite/affine/blocks'; import type { SerializedXYWH } from '@blocksuite/affine/global/gfx'; +import type { MindmapStyle } from '@blocksuite/affine/model'; import type { TemplateImage } from '../slides/template'; diff --git a/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts b/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts index 52067bad48..808d0e7494 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/edgeless.ts @@ -1,12 +1,12 @@ import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std'; import type { GfxModel } from '@blocksuite/affine/block-std/gfx'; +import { SurfaceBlockModel } from '@blocksuite/affine/blocks/surface'; import { MindmapElementModel, NoteBlockModel, RootBlockModel, type ShapeElementModel, - SurfaceBlockModel, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { matchModels } from '@blocksuite/affine/shared/utils'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts b/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts index b6d6999d56..11d1dd9585 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/editor-actions.ts @@ -5,10 +5,8 @@ import { SurfaceSelection, type TextSelection, } from '@blocksuite/affine/block-std'; -import { - defaultImageProxyMiddleware, - deleteTextCommand, -} from '@blocksuite/affine/blocks'; +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; +import { deleteTextCommand } from '@blocksuite/affine/rich-text'; import { isInsideEdgelessEditor } from '@blocksuite/affine/shared/utils'; import { type BlockModel, Slice } from '@blocksuite/affine/store'; diff --git a/packages/frontend/core/src/blocksuite/ai/utils/extract.ts b/packages/frontend/core/src/blocksuite/ai/utils/extract.ts index 303717230b..ce8a7bb3c6 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/extract.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/extract.ts @@ -1,16 +1,20 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; +import type { ServiceProvider } from '@blocksuite/affine/global/di'; import { DatabaseBlockModel, - embedSyncedDocMiddleware, - getImageSelectionsCommand, - getSelectedBlocksCommand, ImageBlockModel, - MarkdownAdapter, type NoteBlockModel, NoteDisplayMode, +} from '@blocksuite/affine/model'; +import { + embedSyncedDocMiddleware, + MarkdownAdapter, titleMiddleware, -} from '@blocksuite/affine/blocks'; -import type { ServiceProvider } from '@blocksuite/affine/global/di'; +} from '@blocksuite/affine/shared/adapters'; +import { + getImageSelectionsCommand, + getSelectedBlocksCommand, +} from '@blocksuite/affine/shared/commands'; import { DocModeProvider } from '@blocksuite/affine/shared/services'; import { isInsideEdgelessEditor, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/image.ts b/packages/frontend/core/src/blocksuite/ai/utils/image.ts index f9eed67b15..c963b49c9c 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/image.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/image.ts @@ -1,4 +1,4 @@ -import { FetchUtils } from '@blocksuite/affine/blocks'; +import { FetchUtils } from '@blocksuite/affine/shared/adapters'; export async function fetchImageToFile( url: string, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts b/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts index f255db52e2..ea85ec0c27 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/selection-utils.ts @@ -3,20 +3,23 @@ import { GfxControllerIdentifier, type GfxModel, } from '@blocksuite/affine/block-std/gfx'; +import { isCanvasElement, splitElements } from '@blocksuite/affine/blocks/root'; +import { + getSurfaceBlock, + type SurfaceBlockComponent, +} from '@blocksuite/affine/blocks/surface'; import { DatabaseBlockModel, type FrameBlockModel, + ImageBlockModel, +} from '@blocksuite/affine/model'; +import { getBlockSelectionsCommand, getImageSelectionsCommand, getSelectedBlocksCommand, getSelectedModelsCommand, - getSurfaceBlock, getTextSelectionCommand, - ImageBlockModel, - isCanvasElement, - splitElements, - type SurfaceBlockComponent, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/shared/commands'; import { matchModels } from '@blocksuite/affine/shared/utils'; import { type BlockModel, diff --git a/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts b/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts index 288979c22d..3832675960 100644 --- a/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts +++ b/packages/frontend/core/src/blocksuite/ai/utils/template-job.ts @@ -1,10 +1,10 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; import { GfxController, LayerManager } from '@blocksuite/affine/block-std/gfx'; import { - getSurfaceBlock, TemplateJob, TemplateMiddlewares, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; import { Bound, getCommonBound } from '@blocksuite/affine/global/gfx'; export function createTemplateJob(host: EditorHost) { diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts index c47efed170..e1f5f04c87 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/ai-panel.ts @@ -6,7 +6,7 @@ import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; import { AFFINE_VIEWPORT_OVERLAY_WIDGET, type AffineViewportOverlayWidget, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { DocModeProvider, NotificationProvider, diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts index f6775c41c0..bae797fe51 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/generating-placeholder.ts @@ -1,9 +1,9 @@ -import { ColorScheme } from '@blocksuite/affine/blocks'; import { DarkLoadingIcon, LightLoadingIcon, } from '@blocksuite/affine/components/icons'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import { ColorScheme } from '@blocksuite/affine/model'; import { unsafeCSSVar } from '@blocksuite/affine/shared/theme'; import { baseTheme } from '@toeverything/theme'; import { diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts index fb037f05b0..539e01c155 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/ai-panel/components/state/generating.ts @@ -1,9 +1,9 @@ -import type { ColorScheme } from '@blocksuite/affine/blocks'; import { AIStarIconWithAnimation, AIStopIcon, } from '@blocksuite/affine/components/icons'; import { WithDisposable } from '@blocksuite/affine/global/lit'; +import type { ColorScheme } from '@blocksuite/affine/model'; import { baseTheme } from '@toeverything/theme'; import { css, html, LitElement, nothing, unsafeCSS } from 'lit'; import { property } from 'lit/decorators.js'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts index 8a358e4c5c..e88b3b6185 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot-panel/toolbar-entry.ts @@ -3,7 +3,7 @@ import { GfxControllerIdentifier, isGfxGroupCompatibleModel, } from '@blocksuite/affine/block-std/gfx'; -import { sortEdgelessElements } from '@blocksuite/affine/blocks'; +import { sortEdgelessElements } from '@blocksuite/affine/blocks/root'; import { AIStarIcon } from '@blocksuite/affine/components/icons'; import { WithDisposable } from '@blocksuite/affine/global/lit'; import { css, html, LitElement } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts index b590599827..0e65653136 100644 --- a/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts +++ b/packages/frontend/core/src/blocksuite/ai/widgets/edgeless-copilot/index.ts @@ -3,12 +3,12 @@ import { WidgetViewExtension, } from '@blocksuite/affine/block-std'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import type { RootBlockModel } from '@blocksuite/affine/blocks'; -import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine/blocks'; +import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound, getCommonBoundWithRotation, } from '@blocksuite/affine/global/gfx'; +import type { RootBlockModel } from '@blocksuite/affine/model'; import { MOUSE_BUTTON, requestConnectedFrame, diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx index 13892bd081..8a01e86ef9 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor-container.tsx @@ -4,13 +4,10 @@ import type { } from '@affine/core/blocksuite/editors'; import { FeatureFlagService } from '@affine/core/modules/feature-flag'; import type { BlockStdScope, EditorHost } from '@blocksuite/affine/block-std'; -import { - appendParagraphCommand, - type DocMode, - type DocTitle, - focusBlockEnd, - type RootBlockModel, -} from '@blocksuite/affine/blocks'; +import { appendParagraphCommand } from '@blocksuite/affine/blocks/paragraph'; +import type { DocTitle } from '@blocksuite/affine/fragments/doc-title'; +import type { DocMode, RootBlockModel } from '@blocksuite/affine/model'; +import { focusBlockEnd } from '@blocksuite/affine/shared/commands'; import { getLastNoteBlock } from '@blocksuite/affine/shared/utils'; import { type Store } from '@blocksuite/affine/store'; import { useLiveData, useService } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx index 0eccf50828..b3db10de58 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/blocksuite-editor.tsx @@ -7,10 +7,10 @@ import { } from '@affine/core/modules/editor-setting'; import { customImageProxyMiddleware, - type DocMode, ImageProxyService, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/image'; import { DisposableGroup } from '@blocksuite/affine/global/slot'; +import type { DocMode } from '@blocksuite/affine/model'; import { LinkPreviewerService } from '@blocksuite/affine/shared/services'; import type { Store } from '@blocksuite/affine/store'; import { Slot } from '@radix-ui/react-slot'; diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx index daaf329907..84461f5217 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/lit-adaper.tsx @@ -23,11 +23,9 @@ import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-vi import { MemberSearchService } from '@affine/core/modules/permissions'; import { WorkspaceService } from '@affine/core/modules/workspace'; import track from '@affine/track'; -import { - type DocMode, - type DocTitle, - ViewportTurboRendererExtension, -} from '@blocksuite/affine/blocks'; +import type { DocTitle } from '@blocksuite/affine/fragments/doc-title'; +import type { DocMode } from '@blocksuite/affine/model'; +import { ViewportTurboRendererExtension } from '@blocksuite/affine/shared/viewport-renderer'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/register-templates.ts b/packages/frontend/core/src/blocksuite/block-suite-editor/register-templates.ts index 739a30dd09..2929388af0 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/register-templates.ts +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/register-templates.ts @@ -3,7 +3,7 @@ import { builtInTemplates as builtInStickersTemplates } from '@affine/templates/ import { EdgelessTemplatePanel, type TemplateManager, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; export function registerTemplates() { EdgelessTemplatePanel.templates.extend( diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/starter-bar.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/starter-bar.tsx index 95e5017561..5591c08656 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-editor/starter-bar.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-editor/starter-bar.tsx @@ -13,7 +13,7 @@ import { } from '@affine/core/modules/template-doc/view/template-list-menu'; import { useI18n } from '@affine/i18n'; import track from '@affine/track'; -import { PageRootBlockComponent } from '@blocksuite/affine/blocks'; +import { PageRootBlockComponent } from '@blocksuite/affine/blocks/root'; import type { Store } from '@blocksuite/affine/store'; import { AiIcon, diff --git a/packages/frontend/core/src/blocksuite/block-suite-mode-switch/index.tsx b/packages/frontend/core/src/blocksuite/block-suite-mode-switch/index.tsx index f3e7b0ee3e..641cbcf6f3 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-mode-switch/index.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-mode-switch/index.tsx @@ -4,7 +4,7 @@ import { EditorService } from '@affine/core/modules/editor'; import { ViewService, WorkbenchService } from '@affine/core/modules/workbench'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc'; import { useLiveData, diff --git a/packages/frontend/core/src/blocksuite/block-suite-page-list/utils.tsx b/packages/frontend/core/src/blocksuite/block-suite-page-list/utils.tsx index 4b586fdf18..d13a7c82a0 100644 --- a/packages/frontend/core/src/blocksuite/block-suite-page-list/utils.tsx +++ b/packages/frontend/core/src/blocksuite/block-suite-page-list/utils.tsx @@ -5,7 +5,7 @@ import { DocsService } from '@affine/core/modules/doc'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { WorkbenchService } from '@affine/core/modules/workbench'; import { getAFFiNEWorkspaceSchema } from '@affine/core/modules/workspace'; -import { type DocMode } from '@blocksuite/affine/blocks'; +import { type DocMode } from '@blocksuite/affine/model'; import type { Workspace } from '@blocksuite/affine/store'; import { useServices } from '@toeverything/infra'; import { useCallback, useMemo } from 'react'; @@ -81,7 +81,9 @@ export const usePageHelper = (docCollection: Workspace) => { const importFileAndOpen = useMemo( () => async () => { - const { showImportModal } = await import('@blocksuite/affine/blocks'); + const { showImportModal } = await import( + '@blocksuite/affine/blocks/root' + ); const { promise, resolve, reject } = Promise.withResolvers< Parameters< diff --git a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts index fd81011911..bcad360b08 100644 --- a/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts +++ b/packages/frontend/core/src/blocksuite/editors/edgeless-editor.ts @@ -1,5 +1,5 @@ import { BlockStdScope, ShadowlessElement } from '@blocksuite/affine/block-std'; -import { EdgelessEditorBlockSpecs } from '@blocksuite/affine/blocks'; +import { EdgelessEditorBlockSpecs } from '@blocksuite/affine/extensions'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; import type { Store } from '@blocksuite/affine/store'; diff --git a/packages/frontend/core/src/blocksuite/editors/index.ts b/packages/frontend/core/src/blocksuite/editors/index.ts index 966293269e..657f60d47f 100644 --- a/packages/frontend/core/src/blocksuite/editors/index.ts +++ b/packages/frontend/core/src/blocksuite/editors/index.ts @@ -1,5 +1,5 @@ import { createReactComponentFromLit } from '@affine/component'; -import { DocTitle } from '@blocksuite/affine/blocks'; +import { DocTitle } from '@blocksuite/affine/fragments/doc-title'; import React from 'react'; import { EdgelessEditor } from './edgeless-editor'; diff --git a/packages/frontend/core/src/blocksuite/editors/page-editor.ts b/packages/frontend/core/src/blocksuite/editors/page-editor.ts index d0bbe79ea9..4efabaab4e 100644 --- a/packages/frontend/core/src/blocksuite/editors/page-editor.ts +++ b/packages/frontend/core/src/blocksuite/editors/page-editor.ts @@ -3,7 +3,7 @@ import { EditorHost, ShadowlessElement, } from '@blocksuite/affine/block-std'; -import { PageEditorBlockSpecs } from '@blocksuite/affine/blocks'; +import { PageEditorBlockSpecs } from '@blocksuite/affine/extensions'; import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit'; import { noop } from '@blocksuite/affine/global/utils'; import { ThemeProvider } from '@blocksuite/affine/shared/services'; diff --git a/packages/frontend/core/src/blocksuite/extensions/attachment-embed-view.tsx b/packages/frontend/core/src/blocksuite/extensions/attachment-embed-view.tsx index 86a9f5e8ee..8b79a5560b 100644 --- a/packages/frontend/core/src/blocksuite/extensions/attachment-embed-view.tsx +++ b/packages/frontend/core/src/blocksuite/extensions/attachment-embed-view.tsx @@ -1,6 +1,6 @@ import type { ElementOrFactory } from '@affine/component'; import { AttachmentEmbedPreview } from '@affine/core/components/attachment-viewer/pdf-viewer-embedded'; -import { AttachmentEmbedConfigIdentifier } from '@blocksuite/affine/blocks'; +import { AttachmentEmbedConfigIdentifier } from '@blocksuite/affine/blocks/attachment'; import { Bound } from '@blocksuite/affine/global/gfx'; import type { ExtensionType } from '@blocksuite/affine/store'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/extensions/doc-mode-service.ts b/packages/frontend/core/src/blocksuite/extensions/doc-mode-service.ts index 8389f66a6f..c8e2a6e083 100644 --- a/packages/frontend/core/src/blocksuite/extensions/doc-mode-service.ts +++ b/packages/frontend/core/src/blocksuite/extensions/doc-mode-service.ts @@ -1,6 +1,6 @@ import type { DocService, DocsService } from '@affine/core/modules/doc'; import type { EditorService } from '@affine/core/modules/editor'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { DocModeExtension, type DocModeProvider, diff --git a/packages/frontend/core/src/blocksuite/extensions/doc-url.ts b/packages/frontend/core/src/blocksuite/extensions/doc-url.ts index 67ff4921d0..7414a039d4 100644 --- a/packages/frontend/core/src/blocksuite/extensions/doc-url.ts +++ b/packages/frontend/core/src/blocksuite/extensions/doc-url.ts @@ -2,7 +2,7 @@ import { generateUrl } from '@affine/core/components/hooks/affine/use-share-url' import { WorkspaceServerService } from '@affine/core/modules/cloud'; import { resolveLinkToDoc } from '@affine/core/modules/navigation/utils'; import { WorkspaceService } from '@affine/core/modules/workspace'; -import { type ReferenceParams } from '@blocksuite/affine/blocks'; +import { type ReferenceParams } from '@blocksuite/affine/model'; import { GenerateDocUrlExtension, ParseDocUrlExtension, diff --git a/packages/frontend/core/src/blocksuite/extensions/edgeless-clipboard.ts b/packages/frontend/core/src/blocksuite/extensions/edgeless-clipboard.ts index 7f1cc64b40..9ba97bf680 100644 --- a/packages/frontend/core/src/blocksuite/extensions/edgeless-clipboard.ts +++ b/packages/frontend/core/src/blocksuite/extensions/edgeless-clipboard.ts @@ -1,6 +1,6 @@ import { AIChatBlockSchema } from '@affine/core/blocksuite/ai/blocks'; import { LifeCycleWatcher } from '@blocksuite/affine/block-std'; -import { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks'; +import { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; import type { BlockSnapshot } from '@blocksuite/affine/store'; export class EdgelessClipboardWatcher extends LifeCycleWatcher { diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/database.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/database.ts index 46df234344..24eac2eceb 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/database.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/database.ts @@ -8,11 +8,11 @@ import { EditorService } from '@affine/core/modules/editor'; import { copyLinkToBlockStdScopeClipboard } from '@affine/core/utils/clipboard'; import { I18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { DatabaseBlockModel } from '@blocksuite/affine/blocks'; import { menu, type MenuOptions, } from '@blocksuite/affine/components/context-menu'; +import type { DatabaseBlockModel } from '@blocksuite/affine/model'; import { LinkIcon } from '@blocksuite/icons/lit'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/index.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/index.ts index 6c9c3a25c0..7945e973bf 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/index.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/index.ts @@ -1,9 +1,7 @@ import { WorkspaceServerService } from '@affine/core/modules/cloud'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; -import { - DatabaseConfigExtension, - RootBlockConfigExtension, -} from '@blocksuite/affine/blocks'; +import { DatabaseConfigExtension } from '@blocksuite/affine/blocks/database'; +import { RootBlockConfigExtension } from '@blocksuite/affine/blocks/root'; import { ToolbarMoreMenuConfigExtension } from '@blocksuite/affine/components/toolbar'; import { EditorSettingExtension } from '@blocksuite/affine/shared/services'; import type { ExtensionType } from '@blocksuite/affine/store'; diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/linked.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/linked.ts index 2aa40c1fb5..f7107190e7 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/linked.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/linked.ts @@ -1,5 +1,5 @@ import { AtMenuConfigService } from '@affine/core/modules/at-menu-config/services'; -import type { LinkedWidgetConfig } from '@blocksuite/affine/blocks'; +import type { LinkedWidgetConfig } from '@blocksuite/affine/blocks/root'; import { type FrameworkProvider } from '@toeverything/infra'; export function createLinkedWidgetConfig( diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts index d223c74429..b1fe176d70 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts @@ -17,23 +17,16 @@ import { GfxBlockElementModel, GfxPrimitiveElementModel, } from '@blocksuite/affine/block-std/gfx'; +import { BookmarkBlockComponent } from '@blocksuite/affine/blocks/bookmark'; import { - AffineReference, - BookmarkBlockComponent, - BookmarkBlockModel, EmbedFigmaBlockComponent, EmbedGithubBlockComponent, EmbedLinkedDocBlockComponent, - EmbedLinkedDocModel, EmbedLoomBlockComponent, EmbedSyncedDocBlockComponent, - EmbedSyncedDocModel, EmbedYoutubeBlockComponent, getDocContentWithMaxLength, - getSelectedModelsCommand, - ImageSelection, - toggleReferencePopup, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/embed'; import { toggleEmbedCardEditModal } from '@blocksuite/affine/components/embed-card-modal'; import { notifyLinkedDocClearedAliases, @@ -45,6 +38,17 @@ import type { MenuContext, MenuItemGroup, } from '@blocksuite/affine/components/toolbar'; +import { + BookmarkBlockModel, + EmbedLinkedDocModel, + EmbedSyncedDocModel, +} from '@blocksuite/affine/model'; +import { + AffineReference, + toggleReferencePopup, +} from '@blocksuite/affine/rich-text'; +import { getSelectedModelsCommand } from '@blocksuite/affine/shared/commands'; +import { ImageSelection } from '@blocksuite/affine/shared/selection'; import { ActionPlacement, GenerateDocUrlProvider, diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts index b40f5fccb0..f9ec442447 100644 --- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts +++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts @@ -5,24 +5,20 @@ import { LifeCycleWatcher, LifeCycleWatcherIdentifier, } from '@blocksuite/affine/block-std'; -import type { - CodeBlockConfig, - ReferenceNodeConfig, -} from '@blocksuite/affine/blocks'; -import { - codeToolbarWidget, - imageToolbarWidget, - ParagraphBlockService, - ReferenceNodeConfigIdentifier, - SlashMenuExtension, - surfaceRefToolbarWidget, - toolbarWidget, -} from '@blocksuite/affine/blocks'; +import type { CodeBlockConfig } from '@blocksuite/affine/blocks/code'; +import { codeToolbarWidget } from '@blocksuite/affine/blocks/code'; +import { imageToolbarWidget } from '@blocksuite/affine/blocks/image'; +import { ParagraphBlockService } from '@blocksuite/affine/blocks/paragraph'; +import { surfaceRefToolbarWidget } from '@blocksuite/affine/blocks/surface-ref'; import type { Container, ServiceIdentifier, } from '@blocksuite/affine/global/di'; import { DisposableGroup } from '@blocksuite/affine/global/slot'; +import { + type ReferenceNodeConfig, + ReferenceNodeConfigIdentifier, +} from '@blocksuite/affine/rich-text'; import { DocModeProvider, FeatureFlagService, @@ -30,6 +26,8 @@ import { } from '@blocksuite/affine/shared/services'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; import type { ExtensionType } from '@blocksuite/affine/store'; +import { SlashMenuExtension } from '@blocksuite/affine/widgets/slash-menu'; +import { toolbarWidget } from '@blocksuite/affine/widgets/toolbar'; import { batch, signal } from '@preact/signals-core'; import type { FrameworkProvider } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/blocksuite/extensions/footnote-config.ts b/packages/frontend/core/src/blocksuite/extensions/footnote-config.ts index 0e61213837..be29ff7e6a 100644 --- a/packages/frontend/core/src/blocksuite/extensions/footnote-config.ts +++ b/packages/frontend/core/src/blocksuite/extensions/footnote-config.ts @@ -1,4 +1,4 @@ -import { FootNoteNodeConfigExtension } from '@blocksuite/affine/blocks'; +import { FootNoteNodeConfigExtension } from '@blocksuite/affine/rich-text'; import type { SpecBuilder } from '@blocksuite/affine/shared/utils'; // Disable hover effect for footnote node diff --git a/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx b/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx index 49fc794474..92e7216319 100644 --- a/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx +++ b/packages/frontend/core/src/blocksuite/extensions/note-config/edgeless-note-header.tsx @@ -9,8 +9,8 @@ import { extractEmojiIcon } from '@affine/core/utils'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import { type NoteBlockModel } from '@blocksuite/affine/blocks'; import { Bound } from '@blocksuite/affine/global/gfx'; +import { type NoteBlockModel } from '@blocksuite/affine/model'; import { InformationIcon, LinkedPageIcon, diff --git a/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx b/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx index e2c267ccc0..6dbefe057a 100644 --- a/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx +++ b/packages/frontend/core/src/blocksuite/extensions/note-config/index.tsx @@ -1,6 +1,6 @@ import type { ElementOrFactory } from '@affine/component'; import { JournalService } from '@affine/core/modules/journal'; -import { NoteConfigExtension } from '@blocksuite/affine/blocks'; +import { NoteConfigExtension } from '@blocksuite/affine/blocks/note'; import type { FrameworkProvider } from '@toeverything/infra'; import { html, type TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/blocksuite/extensions/quick-search-service.ts b/packages/frontend/core/src/blocksuite/extensions/quick-search-service.ts index 3378006a8c..4bb7e2845b 100644 --- a/packages/frontend/core/src/blocksuite/extensions/quick-search-service.ts +++ b/packages/frontend/core/src/blocksuite/extensions/quick-search-service.ts @@ -10,18 +10,21 @@ import { import { ExternalLinksQuickSearchSession } from '@affine/core/modules/quicksearch/impls/external-links'; import { JournalsQuickSearchSession } from '@affine/core/modules/quicksearch/impls/journals'; import { track } from '@affine/track'; -import type { SlashMenuConfig, SlashMenuItem } from '@blocksuite/affine/blocks'; import { BookmarkSlashMenuConfigIdentifier, insertLinkByQuickSearchCommand, - LinkedDocSlashMenuConfigIdentifier, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/bookmark'; +import { LinkedDocSlashMenuConfigIdentifier } from '@blocksuite/affine/blocks/embed'; import type { ServiceIdentifier } from '@blocksuite/affine/global/di'; import { QuickSearchExtension, type QuickSearchResult, } from '@blocksuite/affine/shared/services'; import { type ExtensionType, Text } from '@blocksuite/affine/store'; +import type { + SlashMenuConfig, + SlashMenuItem, +} from '@blocksuite/affine/widgets/slash-menu'; import type { FrameworkProvider } from '@toeverything/infra'; import { pick } from 'lodash-es'; diff --git a/packages/frontend/core/src/blocksuite/extensions/reference-renderer.ts b/packages/frontend/core/src/blocksuite/extensions/reference-renderer.ts index 24f091b56b..6dc7b72772 100644 --- a/packages/frontend/core/src/blocksuite/extensions/reference-renderer.ts +++ b/packages/frontend/core/src/blocksuite/extensions/reference-renderer.ts @@ -1,7 +1,7 @@ import type { ElementOrFactory } from '@affine/component'; -import type { AffineReference } from '@blocksuite/affine/blocks'; -import { ReferenceNodeConfigExtension } from '@blocksuite/affine/blocks'; -import { type ExtensionType } from '@blocksuite/affine/store'; +import type { AffineReference } from '@blocksuite/affine/rich-text'; +import { ReferenceNodeConfigExtension } from '@blocksuite/affine/rich-text'; +import type { ExtensionType } from '@blocksuite/affine/store'; import type { TemplateResult } from 'lit'; export type ReferenceReactRenderer = ( diff --git a/packages/frontend/core/src/blocksuite/extensions/theme.ts b/packages/frontend/core/src/blocksuite/extensions/theme.ts index 15234f3905..f5e5f41d6e 100644 --- a/packages/frontend/core/src/blocksuite/extensions/theme.ts +++ b/packages/frontend/core/src/blocksuite/extensions/theme.ts @@ -1,8 +1,8 @@ import { DocService, DocsService } from '@affine/core/modules/doc'; import { AppThemeService } from '@affine/core/modules/theme'; import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/affine/block-std'; -import { ColorScheme } from '@blocksuite/affine/blocks'; import type { Container } from '@blocksuite/affine/global/di'; +import { ColorScheme } from '@blocksuite/affine/model'; import { type ThemeExtension, ThemeExtensionIdentifier, diff --git a/packages/frontend/core/src/blocksuite/initialization/index.ts b/packages/frontend/core/src/blocksuite/initialization/index.ts index 3886167ff2..85a4a8f969 100644 --- a/packages/frontend/core/src/blocksuite/initialization/index.ts +++ b/packages/frontend/core/src/blocksuite/initialization/index.ts @@ -4,7 +4,7 @@ import { type NoteProps, type ParagraphProps, type RootBlockProps, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { type Store, Text } from '@blocksuite/affine/store'; export interface DocProps { diff --git a/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx b/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx index bccd74ddb9..c2eeb1b1ea 100644 --- a/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx +++ b/packages/frontend/core/src/blocksuite/outline-viewer/index.tsx @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import { OutlineViewer } from '@blocksuite/affine/blocks'; +import { OutlineViewer } from '@blocksuite/affine/fragments/outline'; import { useCallback, useRef } from 'react'; import * as styles from './outline-viewer.css'; diff --git a/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts b/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts index bec7b0b135..a9fba114b5 100644 --- a/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts +++ b/packages/frontend/core/src/blocksuite/utils/markdown-utils.ts @@ -4,16 +4,16 @@ import { type TextRangePoint, TextSelection, } from '@blocksuite/affine/block-std'; +import { defaultImageProxyMiddleware } from '@blocksuite/affine/blocks/image'; +import { pasteMiddleware } from '@blocksuite/affine/blocks/root'; +import type { ServiceProvider } from '@blocksuite/affine/global/di'; import { - defaultImageProxyMiddleware, embedSyncedDocMiddleware, MarkdownAdapter, MixTextAdapter, - pasteMiddleware, PlainTextAdapter, titleMiddleware, -} from '@blocksuite/affine/blocks'; -import type { ServiceProvider } from '@blocksuite/affine/global/di'; +} from '@blocksuite/affine/shared/adapters'; import type { BlockModel, BlockSnapshot, diff --git a/packages/frontend/core/src/commands/affine-creation.tsx b/packages/frontend/core/src/commands/affine-creation.tsx index 4ae6d9d777..b76f844447 100644 --- a/packages/frontend/core/src/commands/affine-creation.tsx +++ b/packages/frontend/core/src/commands/affine-creation.tsx @@ -1,6 +1,6 @@ import type { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { ImportIcon, PlusIcon } from '@blocksuite/icons/rc'; import type { usePageHelper } from '../blocksuite/block-suite-page-list/utils'; diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx index 5e35ac1ddd..e5cfcafb9e 100644 --- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx +++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx @@ -13,7 +13,7 @@ import { WorkspaceQuotaService } from '@affine/core/modules/quota'; import { WorkspaceService } from '@affine/core/modules/workspace'; import { i18nTime, Trans, useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { Store, Workspace } from '@blocksuite/affine/store'; import { CloseIcon, ToggleRightIcon } from '@blocksuite/icons/rc'; import * as Collapsible from '@radix-ui/react-collapsible'; diff --git a/packages/frontend/core/src/components/affine/reference-link/index.tsx b/packages/frontend/core/src/components/affine/reference-link/index.tsx index e7b1fd1116..53ff573e63 100644 --- a/packages/frontend/core/src/components/affine/reference-link/index.tsx +++ b/packages/frontend/core/src/components/affine/reference-link/index.tsx @@ -5,7 +5,7 @@ import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-vi import { useInsidePeekView } from '@affine/core/modules/peek-view/view/modal-container'; import { WorkbenchLink } from '@affine/core/modules/workbench'; import { track } from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { Workspace } from '@blocksuite/affine/store'; import { LiveData, useLiveData, useService } from '@toeverything/infra'; import clsx from 'clsx'; diff --git a/packages/frontend/core/src/components/attachment-viewer/error.tsx b/packages/frontend/core/src/components/attachment-viewer/error.tsx index 5d56704dd3..b450f37a0d 100644 --- a/packages/frontend/core/src/components/attachment-viewer/error.tsx +++ b/packages/frontend/core/src/components/attachment-viewer/error.tsx @@ -1,6 +1,6 @@ import { Button } from '@affine/component'; import { useI18n } from '@affine/i18n'; -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { ArrowDownBigIcon } from '@blocksuite/icons/rc'; import clsx from 'clsx'; import type { PropsWithChildren, ReactElement } from 'react'; diff --git a/packages/frontend/core/src/components/attachment-viewer/titlebar.tsx b/packages/frontend/core/src/components/attachment-viewer/titlebar.tsx index 8f826513d8..61b64875e8 100644 --- a/packages/frontend/core/src/components/attachment-viewer/titlebar.tsx +++ b/packages/frontend/core/src/components/attachment-viewer/titlebar.tsx @@ -1,5 +1,5 @@ import { IconButton, Menu, MenuItem } from '@affine/component'; -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { //EditIcon, LocalDataIcon, diff --git a/packages/frontend/core/src/components/attachment-viewer/types.ts b/packages/frontend/core/src/components/attachment-viewer/types.ts index 956417afc9..0d43df9873 100644 --- a/packages/frontend/core/src/components/attachment-viewer/types.ts +++ b/packages/frontend/core/src/components/attachment-viewer/types.ts @@ -1,4 +1,4 @@ -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; export type AttachmentViewerProps = { model: AttachmentBlockModel; diff --git a/packages/frontend/core/src/components/attachment-viewer/utils.ts b/packages/frontend/core/src/components/attachment-viewer/utils.ts index f241e05b01..6c5cf34cd0 100644 --- a/packages/frontend/core/src/components/attachment-viewer/utils.ts +++ b/packages/frontend/core/src/components/attachment-viewer/utils.ts @@ -1,5 +1,5 @@ import type { PageSize } from '@affine/core/modules/pdf/renderer/types'; -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { filesize } from 'filesize'; import { downloadBlob } from '../../utils/resource'; diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx index ab5cb3642a..a06aba359b 100644 --- a/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx +++ b/packages/frontend/core/src/components/cloud/share-header-right-item/index.tsx @@ -1,5 +1,5 @@ import { AuthService } from '@affine/core/modules/cloud'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useLiveData, useService } from '@toeverything/infra'; import { ImportTemplateButton } from './import-template'; diff --git a/packages/frontend/core/src/components/doc-properties/types/doc-primary-mode.tsx b/packages/frontend/core/src/components/doc-properties/types/doc-primary-mode.tsx index 20d48a520e..362d04017b 100644 --- a/packages/frontend/core/src/components/doc-properties/types/doc-primary-mode.tsx +++ b/packages/frontend/core/src/components/doc-properties/types/doc-primary-mode.tsx @@ -6,7 +6,7 @@ import { } from '@affine/component'; import { DocService } from '@affine/core/modules/doc'; import { useI18n } from '@affine/i18n'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useLiveData, useService } from '@toeverything/infra'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts index 7c6fdf5f57..9ef813df35 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts @@ -3,7 +3,7 @@ import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite- import { useDocCollectionHelper } from '@affine/core/components/hooks/use-block-suite-workspace-helper'; import { DocsService } from '@affine/core/modules/doc'; import { WorkspaceService } from '@affine/core/modules/workspace'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useService } from '@toeverything/infra'; import { useCallback } from 'react'; import { applyUpdate, encodeStateAsUpdate } from 'yjs'; diff --git a/packages/frontend/core/src/components/hooks/affine/use-export-page.ts b/packages/frontend/core/src/components/hooks/affine/use-export-page.ts index 9b42bbc6d6..7e827e6923 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-export-page.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-export-page.ts @@ -10,17 +10,19 @@ import { track } from '@affine/track'; import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { createAssetsArchive, - docLinkBaseURLMiddleware, download, - embedSyncedDocMiddleware, - ExportManager, - HtmlAdapterFactoryIdentifier, HtmlTransformer, - MarkdownAdapterFactoryIdentifier, MarkdownTransformer, - titleMiddleware, ZipTransformer, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import { ExportManager } from '@blocksuite/affine/blocks/surface'; +import { + docLinkBaseURLMiddleware, + embedSyncedDocMiddleware, + HtmlAdapterFactoryIdentifier, + MarkdownAdapterFactoryIdentifier, + titleMiddleware, +} from '@blocksuite/affine/shared/adapters'; import { printToPdf } from '@blocksuite/affine/shared/utils'; import { type Store, Transformer } from '@blocksuite/affine/store'; import { useLiveData, useService } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/components/hooks/affine/use-share-url.ts b/packages/frontend/core/src/components/hooks/affine/use-share-url.ts index ca56bfb560..86e7fc4883 100644 --- a/packages/frontend/core/src/components/hooks/affine/use-share-url.ts +++ b/packages/frontend/core/src/components/hooks/affine/use-share-url.ts @@ -9,13 +9,13 @@ import { GfxBlockElementModel, GfxControllerIdentifier, } from '@blocksuite/affine/block-std/gfx'; +import { type DocMode } from '@blocksuite/affine/model'; import { - type DocMode, getBlockSelectionsCommand, getImageSelectionsCommand, getSelectedModelsCommand, getTextSelectionCommand, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/shared/commands'; import { useService } from '@toeverything/infra'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/components/hooks/use-navigate-helper.ts b/packages/frontend/core/src/components/hooks/use-navigate-helper.ts index a6a5927be7..94e1a0908e 100644 --- a/packages/frontend/core/src/components/hooks/use-navigate-helper.ts +++ b/packages/frontend/core/src/components/hooks/use-navigate-helper.ts @@ -1,6 +1,6 @@ import { toURLSearchParams } from '@affine/core/modules/navigation'; import { getOpenUrlInDesktopAppLink } from '@affine/core/modules/open-in-app'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { createContext, useCallback, useContext, useMemo } from 'react'; import type { NavigateFunction, NavigateOptions } from 'react-router-dom'; diff --git a/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts b/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts index da64640d82..b33fd1fdd2 100644 --- a/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts +++ b/packages/frontend/core/src/components/page-list/__tests__/use-block-suite-page-preview.spec.ts @@ -3,7 +3,7 @@ */ import 'fake-indexeddb/auto'; -import { StoreExtensions } from '@blocksuite/affine/blocks'; +import { StoreExtensions } from '@blocksuite/affine/extensions'; import { type Store, Text } from '@blocksuite/affine/store'; import { TestWorkspace } from '@blocksuite/affine/store/test'; import { renderHook } from '@testing-library/react'; diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx index fc048c44d6..81a2989ef2 100644 --- a/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx +++ b/packages/frontend/core/src/components/page-list/docs/page-list-header.tsx @@ -17,7 +17,7 @@ import { inferOpenMode } from '@affine/core/utils'; import type { Collection } from '@affine/env/filter'; import { useI18n } from '@affine/i18n'; import { track } from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { ArrowDownSmallIcon, SearchIcon, diff --git a/packages/frontend/core/src/components/providers/workspace-side-effects.tsx b/packages/frontend/core/src/components/providers/workspace-side-effects.tsx index ef4bc26b9a..997d9063b9 100644 --- a/packages/frontend/core/src/components/providers/workspace-side-effects.tsx +++ b/packages/frontend/core/src/components/providers/workspace-side-effects.tsx @@ -31,7 +31,8 @@ import { } from '@affine/core/modules/workspace'; import { useI18n } from '@affine/i18n'; import track from '@affine/track'; -import { type DocMode, ZipTransformer } from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; +import type { DocMode } from '@blocksuite/affine/model'; import { effect, fromPromise, diff --git a/packages/frontend/core/src/desktop/dialogs/import-template/index.tsx b/packages/frontend/core/src/desktop/dialogs/import-template/index.tsx index bc7b73b167..2b33d32ab9 100644 --- a/packages/frontend/core/src/desktop/dialogs/import-template/index.tsx +++ b/packages/frontend/core/src/desktop/dialogs/import-template/index.tsx @@ -17,7 +17,7 @@ import { WorkspacesService, } from '@affine/core/modules/workspace'; import { useI18n } from '@affine/i18n'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { AllDocsIcon } from '@blocksuite/icons/rc'; import { useLiveData, useService } from '@toeverything/infra'; import { cssVar } from '@toeverything/theme'; diff --git a/packages/frontend/core/src/desktop/dialogs/import/index.tsx b/packages/frontend/core/src/desktop/dialogs/import/index.tsx index fbdc23ddf5..88d60ad409 100644 --- a/packages/frontend/core/src/desktop/dialogs/import/index.tsx +++ b/packages/frontend/core/src/desktop/dialogs/import/index.tsx @@ -17,7 +17,7 @@ import { MarkdownTransformer, NotionHtmlTransformer, ZipTransformer, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { openFileOrFiles } from '@blocksuite/affine/shared/utils'; import type { Workspace } from '@blocksuite/affine/store'; import { diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx index e093abb64f..650cc92977 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx @@ -8,6 +8,7 @@ import { import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; +import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; import { ConnectorMode, DefaultTheme, @@ -15,11 +16,10 @@ import { FontFamilyMap, FontStyle, FontWeightMap, - getSurfaceBlock, PointStyle, StrokeStyle, TextAlign, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/frame.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/frame.tsx index eb4418819a..5df38d0f9e 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/frame.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/frame.tsx @@ -2,7 +2,7 @@ import { MenuItem, MenuTrigger } from '@affine/component'; import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; -import { DefaultTheme } from '@blocksuite/affine/blocks'; +import { DefaultTheme } from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/mind-map.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/mind-map.tsx index 8d24604001..3df96c5a17 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/mind-map.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/mind-map.tsx @@ -7,11 +7,8 @@ import { import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; -import { - getSurfaceBlock, - LayoutType, - MindmapStyle, -} from '@blocksuite/affine/blocks'; +import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; +import { LayoutType, MindmapStyle } from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/note.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/note.tsx index 4dbccef167..b5b6ca278c 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/note.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/note.tsx @@ -14,7 +14,7 @@ import { NoteShadow, NoteShadowMap, StrokeStyle, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx index 287db0d4b6..fad63197fb 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx @@ -2,7 +2,8 @@ import { MenuItem, MenuTrigger, Slider } from '@affine/component'; import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; -import { DefaultTheme, getSurfaceBlock } from '@blocksuite/affine/blocks'; +import { getSurfaceBlock } from '@blocksuite/affine/blocks/surface'; +import { DefaultTheme } from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx index 40d7daed81..f3cca3a11f 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx @@ -9,21 +9,23 @@ import { SettingRow } from '@affine/component/setting-components'; import { EditorSettingService } from '@affine/core/modules/editor-setting'; import { useI18n } from '@affine/i18n'; import type { EditorHost } from '@blocksuite/affine/block-std'; -import type { ShapeElementModel, ShapeName } from '@blocksuite/affine/blocks'; +import { + EdgelessCRUDIdentifier, + getSurfaceBlock, +} from '@blocksuite/affine/blocks/surface'; +import type { ShapeElementModel, ShapeName } from '@blocksuite/affine/model'; import { DefaultTheme, - EdgelessCRUDIdentifier, FontFamily, FontFamilyMap, FontStyle, FontWeightMap, getShapeName, - getSurfaceBlock, ShapeStyle, ShapeType, StrokeStyle, TextAlign, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx index 3021a7e8bb..da2dcc84ad 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/snapshot.tsx @@ -7,10 +7,8 @@ import { GfxControllerIdentifier, type GfxPrimitiveElementModel, } from '@blocksuite/affine/block-std/gfx'; -import { - EdgelessCRUDIdentifier, - type EdgelessRootPreviewBlockComponent, -} from '@blocksuite/affine/blocks'; +import type { EdgelessRootPreviewBlockComponent } from '@blocksuite/affine/blocks/root'; +import { EdgelessCRUDIdentifier } from '@blocksuite/affine/blocks/surface'; import { Bound } from '@blocksuite/affine/global/gfx'; import { SpecProvider } from '@blocksuite/affine/shared/utils'; import type { Block, Store } from '@blocksuite/affine/store'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx index aedbf522d7..4a3839ae7a 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx @@ -14,7 +14,7 @@ import { FontStyle, FontWeightMap, TextAlign, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; import { useFramework, useLiveData } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/utils.ts b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/utils.ts index 7ae2efca38..851078e693 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/utils.ts +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/utils.ts @@ -1,4 +1,4 @@ -import type { FrameBlockModel } from '@blocksuite/affine/blocks'; +import type { FrameBlockModel } from '@blocksuite/affine/model'; import type { Store } from '@blocksuite/affine/store'; export function getFrameBlock(doc: Store) { diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts index 3220031a8a..daf7805418 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts @@ -4,7 +4,7 @@ import { FontWeight, type Palette, resolveColor, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; import { isEqual } from 'lodash-es'; import { useTheme } from 'next-themes'; diff --git a/packages/frontend/core/src/desktop/pages/import-template/index.tsx b/packages/frontend/core/src/desktop/pages/import-template/index.tsx index 1bdd85e0b3..9cbe83a810 100644 --- a/packages/frontend/core/src/desktop/pages/import-template/index.tsx +++ b/packages/frontend/core/src/desktop/pages/import-template/index.tsx @@ -1,5 +1,5 @@ import { GlobalDialogService } from '@affine/core/modules/dialogs'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useService } from '@toeverything/infra'; import { useEffect } from 'react'; import { useSearchParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/attachment/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/attachment/index.tsx index 7e6e00b8e2..ae2a36d6f6 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/attachment/index.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/attachment/index.tsx @@ -1,6 +1,6 @@ import { Skeleton } from '@affine/component'; import { type Doc, DocsService } from '@affine/core/modules/doc'; -import { type AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import { type AttachmentBlockModel } from '@blocksuite/affine/model'; import { FrameworkScope, useLiveData, useService } from '@toeverything/infra'; import { type ReactElement, useLayoutEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx index ebc8c8efac..4b87dc59de 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx @@ -18,11 +18,11 @@ import { ViewService } from '@affine/core/modules/workbench'; import { WorkspaceService } from '@affine/core/modules/workspace'; import { isNewTabTrigger } from '@affine/core/utils'; import track from '@affine/track'; -import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks'; import { type Disposable, DisposableGroup, } from '@blocksuite/affine/global/slot'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { AiIcon, FrameIcon, diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx index 3941b08f7c..390cc3f5da 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/chat.tsx @@ -6,7 +6,7 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta'; import { DocSearchMenuService } from '@affine/core/modules/doc-search-menu/services'; import { WorkbenchService } from '@affine/core/modules/workbench'; import { WorkspaceService } from '@affine/core/modules/workspace'; -import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { DocModeProvider } from '@blocksuite/affine/shared/services'; import { createSignalFromObservable, diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx index f8d070257f..5cfb29dd0c 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/frame.tsx @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import { FramePanel } from '@blocksuite/affine/blocks'; +import { FramePanel } from '@blocksuite/affine/fragments/frame-panel'; import { useCallback, useEffect, useRef } from 'react'; import * as styles from './frame.css'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx index b00ba259fe..c2bf9b70e0 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/outline.tsx @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import { OutlinePanel } from '@blocksuite/affine/blocks'; +import { OutlinePanel } from '@blocksuite/affine/fragments/outline'; import { useCallback, useEffect, useRef } from 'react'; import * as styles from './outline.css'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/index.tsx index 2cdba10b26..a81fa48120 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/index.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/index.tsx @@ -15,7 +15,7 @@ import { type WorkspaceMetadata, WorkspacesService, } from '@affine/core/modules/workspace'; -import { ZipTransformer } from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; import { FrameworkScope, LiveData, diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx index 51c03011e6..9a19764806 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-header.tsx @@ -1,7 +1,7 @@ import { BlocksuiteHeaderTitle } from '@affine/core/blocksuite/block-suite-header/title'; import { EditorModeSwitch } from '@affine/core/blocksuite/block-suite-mode-switch'; import ShareHeaderRightItem from '@affine/core/components/cloud/share-header-right-item'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import * as styles from './share-header.css'; diff --git a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx index fe253df018..479114fe9e 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/share/share-page.tsx @@ -21,12 +21,9 @@ import { WorkspacesService, } from '@affine/core/modules/workspace'; import { useI18n } from '@affine/i18n'; -import { - type DocMode, - DocModes, - RefNodeSlotsProvider, -} from '@blocksuite/affine/blocks'; import { DisposableGroup } from '@blocksuite/affine/global/slot'; +import { type DocMode, DocModes } from '@blocksuite/affine/model'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { Logo1Icon } from '@blocksuite/icons/rc'; import { FrameworkScope, useLiveData, useService } from '@toeverything/infra'; import clsx from 'clsx'; diff --git a/packages/frontend/core/src/mobile/components/toc-menu/index.tsx b/packages/frontend/core/src/mobile/components/toc-menu/index.tsx index 809786bf3e..8c8f634616 100644 --- a/packages/frontend/core/src/mobile/components/toc-menu/index.tsx +++ b/packages/frontend/core/src/mobile/components/toc-menu/index.tsx @@ -1,5 +1,5 @@ import type { EditorHost } from '@blocksuite/affine/block-std'; -import { MobileOutlineMenu } from '@blocksuite/affine/blocks'; +import { MobileOutlineMenu } from '@blocksuite/affine/fragments/outline'; import { useCallback, useRef } from 'react'; export const MobileTocMenu = ({ editor }: { editor: EditorHost | null }) => { diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/mode-switch.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/mode-switch.tsx index 8af9aa1395..0fa7c65225 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/mode-switch.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/mode-switch.tsx @@ -5,7 +5,7 @@ import { } from '@affine/component'; import { EditorService } from '@affine/core/modules/editor'; import track from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useLiveData, useService } from '@toeverything/infra'; import { useCallback } from 'react'; diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx index f6293be401..5f12358b39 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx @@ -25,9 +25,9 @@ import { i18nTime } from '@affine/i18n'; import { customImageProxyMiddleware, ImageProxyService, - RefNodeSlotsProvider, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/image'; import { DisposableGroup } from '@blocksuite/affine/global/slot'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { LinkPreviewerService } from '@blocksuite/affine/shared/services'; import { FrameworkScope, diff --git a/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx b/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx index 78f0080cd1..94c1c3a938 100644 --- a/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx +++ b/packages/frontend/core/src/modules/app-sidebar/views/add-page-button/index.tsx @@ -10,7 +10,7 @@ import { WorkspaceService } from '@affine/core/modules/workspace'; import { inferOpenMode } from '@affine/core/utils'; import { useI18n } from '@affine/i18n'; import track from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { ArrowDownSmallIcon, EdgelessIcon, diff --git a/packages/frontend/core/src/modules/at-menu-config/services/index.ts b/packages/frontend/core/src/modules/at-menu-config/services/index.ts index b9ec20e7cf..a72ce19f2d 100644 --- a/packages/frontend/core/src/modules/at-menu-config/services/index.ts +++ b/packages/frontend/core/src/modules/at-menu-config/services/index.ts @@ -2,13 +2,13 @@ import { I18n, i18nTime } from '@affine/i18n'; import track from '@affine/track'; import type { EditorHost } from '@blocksuite/affine/block-std'; import { - type AffineInlineEditor, - type DocMode, type LinkedMenuGroup, type LinkedMenuItem, type LinkedWidgetConfig, LinkedWidgetUtils, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; +import type { DocMode } from '@blocksuite/affine/model'; +import type { AffineInlineEditor } from '@blocksuite/affine/rich-text'; import type { DocMeta } from '@blocksuite/affine/store'; import { Text } from '@blocksuite/affine/store'; import { diff --git a/packages/frontend/core/src/modules/dialogs/constant.ts b/packages/frontend/core/src/modules/dialogs/constant.ts index 00826d01e6..7509ce801d 100644 --- a/packages/frontend/core/src/modules/dialogs/constant.ts +++ b/packages/frontend/core/src/modules/dialogs/constant.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { WorkspaceMetadata } from '../workspace'; diff --git a/packages/frontend/core/src/modules/dnd/services/index.ts b/packages/frontend/core/src/modules/dnd/services/index.ts index 1610d7cf4d..803e776f80 100644 --- a/packages/frontend/core/src/modules/dnd/services/index.ts +++ b/packages/frontend/core/src/modules/dnd/services/index.ts @@ -7,12 +7,12 @@ import { } from '@affine/component'; import type { AffineDNDData } from '@affine/core/types/dnd'; import { BlockStdScope } from '@blocksuite/affine/block-std'; -import { type DragBlockPayload } from '@blocksuite/affine/blocks'; import { DNDAPIExtension, DndApiExtensionIdentifier, } from '@blocksuite/affine/shared/services'; -import { type SliceSnapshot } from '@blocksuite/affine/store'; +import type { SliceSnapshot } from '@blocksuite/affine/store'; +import type { DragBlockPayload } from '@blocksuite/affine/widgets/drag-handle'; import { Service } from '@toeverything/infra'; import type { DocsService } from '../../doc'; diff --git a/packages/frontend/core/src/modules/doc-info/services/doc-database-backlinks.ts b/packages/frontend/core/src/modules/doc-info/services/doc-database-backlinks.ts index 1fc59d01f7..050ddfb159 100644 --- a/packages/frontend/core/src/modules/doc-info/services/doc-database-backlinks.ts +++ b/packages/frontend/core/src/modules/doc-info/services/doc-database-backlinks.ts @@ -1,7 +1,5 @@ -import { - DatabaseBlockDataSource, - type DatabaseBlockModel, -} from '@blocksuite/affine/blocks'; +import { DatabaseBlockDataSource } from '@blocksuite/affine/blocks/database'; +import type { DatabaseBlockModel } from '@blocksuite/affine/model'; import { LiveData, Service } from '@toeverything/infra'; import { isEqual } from 'lodash-es'; import { combineLatest, distinctUntilChanged, map, Observable } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/doc-info/types.ts b/packages/frontend/core/src/modules/doc-info/types.ts index ca94358e93..9bf006a48e 100644 --- a/packages/frontend/core/src/modules/doc-info/types.ts +++ b/packages/frontend/core/src/modules/doc-info/types.ts @@ -1,4 +1,4 @@ -import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks'; +import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks/database'; import type { LiveData } from '@toeverything/infra'; import type { Doc } from '../doc'; diff --git a/packages/frontend/core/src/modules/doc-info/utils.ts b/packages/frontend/core/src/modules/doc-info/utils.ts index 25e592b376..42437634de 100644 --- a/packages/frontend/core/src/modules/doc-info/utils.ts +++ b/packages/frontend/core/src/modules/doc-info/utils.ts @@ -1,6 +1,6 @@ import { DebugLogger } from '@affine/debug'; import { BlockStdScope } from '@blocksuite/affine/block-std'; -import { PageEditorBlockSpecs } from '@blocksuite/affine/blocks'; +import { PageEditorBlockSpecs } from '@blocksuite/affine/extensions'; import type { Store } from '@blocksuite/affine/store'; import { useMemo } from 'react'; import { Observable } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx index de17893bd1..8c7e0e59a3 100644 --- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx +++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx @@ -4,7 +4,7 @@ import type { BlockStdScope } from '@blocksuite/affine/block-std'; import { DefaultInlineManagerExtension, RichText, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/rich-text'; import type { Store } from '@blocksuite/affine/store'; import { TextIcon } from '@blocksuite/icons/rc'; import { type LiveData, useLiveData } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx index cfe03c4c5a..edbbcd8221 100644 --- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx +++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx @@ -7,7 +7,7 @@ import { affineLabelToDatabaseTagColor, databaseTagColorToV2, } from '@affine/core/modules/tag/entities/utils'; -import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks'; +import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks/database'; import type { SelectTag } from '@blocksuite/data-view'; import { MultiSelectIcon, SingleSelectIcon } from '@blocksuite/icons/rc'; import { LiveData, useLiveData, useService } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx index 455a30decf..c298306f68 100644 --- a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx +++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx @@ -7,7 +7,7 @@ import { import { AffinePageReference } from '@affine/core/components/affine/reference-link'; import { DocService } from '@affine/core/modules/doc'; import { useI18n } from '@affine/i18n'; -import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks'; +import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks/database'; import { DatabaseTableViewIcon, PageIcon } from '@blocksuite/icons/rc'; import { LiveData, useLiveData, useService } from '@toeverything/infra'; import { Fragment, useMemo } from 'react'; diff --git a/packages/frontend/core/src/modules/doc-search-menu/services/index.ts b/packages/frontend/core/src/modules/doc-search-menu/services/index.ts index e202a424f5..31b086c6d1 100644 --- a/packages/frontend/core/src/modules/doc-search-menu/services/index.ts +++ b/packages/frontend/core/src/modules/doc-search-menu/services/index.ts @@ -3,7 +3,7 @@ import { I18n } from '@affine/i18n'; import type { LinkedMenuGroup, LinkedMenuItem, -} from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/blocks/root'; import { createSignalFromObservable } from '@blocksuite/affine/shared/utils'; import type { DocMeta } from '@blocksuite/affine/store'; import { computed } from '@preact/signals-core'; diff --git a/packages/frontend/core/src/modules/doc/entities/doc.ts b/packages/frontend/core/src/modules/doc/entities/doc.ts index 1a3a518b6f..7e04804f8b 100644 --- a/packages/frontend/core/src/modules/doc/entities/doc.ts +++ b/packages/frontend/core/src/modules/doc/entities/doc.ts @@ -1,4 +1,4 @@ -import type { DocMode, RootBlockModel } from '@blocksuite/affine/blocks'; +import type { DocMode, RootBlockModel } from '@blocksuite/affine/model'; import { Entity } from '@toeverything/infra'; import type { DocProperties } from '../../db'; diff --git a/packages/frontend/core/src/modules/doc/entities/record-list.ts b/packages/frontend/core/src/modules/doc/entities/record-list.ts index 35001dac84..3f8afd7a6d 100644 --- a/packages/frontend/core/src/modules/doc/entities/record-list.ts +++ b/packages/frontend/core/src/modules/doc/entities/record-list.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { Entity, LiveData } from '@toeverything/infra'; import { map } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/doc/entities/record.ts b/packages/frontend/core/src/modules/doc/entities/record.ts index 9b96551cce..2e58ce4c13 100644 --- a/packages/frontend/core/src/modules/doc/entities/record.ts +++ b/packages/frontend/core/src/modules/doc/entities/record.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { DocMeta } from '@blocksuite/affine/store'; import { Entity, LiveData } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/doc/services/docs.ts b/packages/frontend/core/src/modules/doc/services/docs.ts index 2dd34a0e54..c37f227fb5 100644 --- a/packages/frontend/core/src/modules/doc/services/docs.ts +++ b/packages/frontend/core/src/modules/doc/services/docs.ts @@ -1,7 +1,8 @@ import { DebugLogger } from '@affine/debug'; import { Unreachable } from '@affine/env/constant'; -import { type DocMode, replaceIdMiddleware } from '@blocksuite/affine/blocks'; import type { DeltaInsert } from '@blocksuite/affine/inline'; +import type { DocMode } from '@blocksuite/affine/model'; +import { replaceIdMiddleware } from '@blocksuite/affine/shared/adapters'; import type { AffineTextAttributes } from '@blocksuite/affine/shared/types'; import { Slice, Text, Transformer } from '@blocksuite/affine/store'; import { LiveData, ObjectPool, Service } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/doc/stores/docs.ts b/packages/frontend/core/src/modules/doc/stores/docs.ts index 352e0a138d..ede01f598b 100644 --- a/packages/frontend/core/src/modules/doc/stores/docs.ts +++ b/packages/frontend/core/src/modules/doc/stores/docs.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import type { DocMeta } from '@blocksuite/affine/store'; import { Store, diff --git a/packages/frontend/core/src/modules/docs-search/services/docs-search.ts b/packages/frontend/core/src/modules/docs-search/services/docs-search.ts index 1db80dd904..cdf86a7327 100644 --- a/packages/frontend/core/src/modules/docs-search/services/docs-search.ts +++ b/packages/frontend/core/src/modules/docs-search/services/docs-search.ts @@ -1,5 +1,5 @@ import { toURLSearchParams } from '@affine/core/modules/navigation'; -import type { ReferenceParams } from '@blocksuite/affine/blocks'; +import type { ReferenceParams } from '@blocksuite/affine/model'; import { fromPromise, OnEvent, Service } from '@toeverything/infra'; import { isEmpty, omit } from 'lodash-es'; import { map, type Observable, switchMap } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts b/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts index d9525eb0d7..d84a575410 100644 --- a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts +++ b/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts @@ -1,18 +1,18 @@ -import type { - AttachmentBlockModel, - BookmarkBlockModel, - EmbedBlockModel, - ImageBlockModel, - TableBlockModel, -} from '@blocksuite/affine/blocks'; -import { - defaultBlockMarkdownAdapterMatchers, - InlineDeltaToMarkdownAdapterExtensions, - MarkdownAdapter, - MarkdownInlineToDeltaAdapterExtensions, - TableModelFlavour, -} from '@blocksuite/affine/blocks'; +import { defaultBlockMarkdownAdapterMatchers } from '@blocksuite/affine/adapters'; import { Container } from '@blocksuite/affine/global/di'; +import { + type AttachmentBlockModel, + type BookmarkBlockModel, + type EmbedBlockModel, + type ImageBlockModel, + type TableBlockModel, + TableModelFlavour, +} from '@blocksuite/affine/model'; +import { + InlineDeltaToMarkdownAdapterExtensions, + MarkdownInlineToDeltaAdapterExtensions, +} from '@blocksuite/affine/rich-text'; +import { MarkdownAdapter } from '@blocksuite/affine/shared/adapters'; import type { AffineTextAttributes } from '@blocksuite/affine/shared/types'; import { createYProxy, diff --git a/packages/frontend/core/src/modules/editor/entities/editor.ts b/packages/frontend/core/src/modules/editor/entities/editor.ts index fbb17a8939..0c64b96600 100644 --- a/packages/frontend/core/src/modules/editor/entities/editor.ts +++ b/packages/frontend/core/src/modules/editor/entities/editor.ts @@ -1,11 +1,8 @@ import type { AffineEditorContainer } from '@affine/core/blocksuite/block-suite-editor'; import type { DefaultOpenProperty } from '@affine/core/components/doc-properties'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import type { - DocMode, - DocTitle, - ReferenceParams, -} from '@blocksuite/affine/blocks'; +import type { DocTitle } from '@blocksuite/affine/fragments/doc-title'; +import type { DocMode, ReferenceParams } from '@blocksuite/affine/model'; import { HighlightSelection } from '@blocksuite/affine/shared/selection'; import { FeatureFlagService as BSFeatureFlagService } from '@blocksuite/affine/shared/services'; import type { InlineEditor } from '@blocksuite/inline'; diff --git a/packages/frontend/core/src/modules/global-context/entities/global-context.ts b/packages/frontend/core/src/modules/global-context/entities/global-context.ts index caf240bda5..1716667a0a 100644 --- a/packages/frontend/core/src/modules/global-context/entities/global-context.ts +++ b/packages/frontend/core/src/modules/global-context/entities/global-context.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { Entity, LiveData, MemoryMemento } from '@toeverything/infra'; export class GlobalContext extends Entity { diff --git a/packages/frontend/core/src/modules/import-clipper/services/import.ts b/packages/frontend/core/src/modules/import-clipper/services/import.ts index ae8cd5bcd4..bc05f6391b 100644 --- a/packages/frontend/core/src/modules/import-clipper/services/import.ts +++ b/packages/frontend/core/src/modules/import-clipper/services/import.ts @@ -1,4 +1,4 @@ -import { MarkdownTransformer } from '@blocksuite/affine/blocks'; +import { MarkdownTransformer } from '@blocksuite/affine/blocks/root'; import { Service } from '@toeverything/infra'; import { DocsService } from '../../doc'; diff --git a/packages/frontend/core/src/modules/import-template/services/import.ts b/packages/frontend/core/src/modules/import-template/services/import.ts index 4bfedd518a..dbb0629380 100644 --- a/packages/frontend/core/src/modules/import-template/services/import.ts +++ b/packages/frontend/core/src/modules/import-template/services/import.ts @@ -1,4 +1,5 @@ -import { type DocMode, ZipTransformer } from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; +import type { DocMode } from '@blocksuite/affine/model'; import { Service } from '@toeverything/infra'; import { DocsService } from '../../doc'; diff --git a/packages/frontend/core/src/modules/navigation/utils.ts b/packages/frontend/core/src/modules/navigation/utils.ts index 6190276935..783a3b8856 100644 --- a/packages/frontend/core/src/modules/navigation/utils.ts +++ b/packages/frontend/core/src/modules/navigation/utils.ts @@ -1,5 +1,5 @@ import { channelToScheme } from '@affine/core/utils'; -import type { ReferenceParams } from '@blocksuite/affine/blocks'; +import type { ReferenceParams } from '@blocksuite/affine/model'; import { isNil, pick, pickBy } from 'lodash-es'; import type { ParsedQuery, ParseOptions } from 'query-string'; import queryString from 'query-string'; diff --git a/packages/frontend/core/src/modules/pdf/entities/pdf.ts b/packages/frontend/core/src/modules/pdf/entities/pdf.ts index 9cd009d505..8ea4953ce2 100644 --- a/packages/frontend/core/src/modules/pdf/entities/pdf.ts +++ b/packages/frontend/core/src/modules/pdf/entities/pdf.ts @@ -1,4 +1,4 @@ -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { Entity, LiveData, ObjectPool } from '@toeverything/infra'; import { catchError, from, map, of, startWith, switchMap } from 'rxjs'; diff --git a/packages/frontend/core/src/modules/pdf/renderer/utils.ts b/packages/frontend/core/src/modules/pdf/renderer/utils.ts index d2006f8f1e..47013d9bd1 100644 --- a/packages/frontend/core/src/modules/pdf/renderer/utils.ts +++ b/packages/frontend/core/src/modules/pdf/renderer/utils.ts @@ -1,4 +1,4 @@ -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; export async function downloadBlobToBuffer(model: AttachmentBlockModel) { const sourceId = model.sourceId; diff --git a/packages/frontend/core/src/modules/pdf/services/pdf.ts b/packages/frontend/core/src/modules/pdf/services/pdf.ts index 141b1731a9..e4d511a7ea 100644 --- a/packages/frontend/core/src/modules/pdf/services/pdf.ts +++ b/packages/frontend/core/src/modules/pdf/services/pdf.ts @@ -1,4 +1,4 @@ -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { ObjectPool, Service } from '@toeverything/infra'; import { PDF } from '../entities/pdf'; diff --git a/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts b/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts index fc7d6a3e68..2cbe35729f 100644 --- a/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts +++ b/packages/frontend/core/src/modules/peek-view/entities/peek-view.ts @@ -1,14 +1,14 @@ import type { BlockComponent, EditorHost } from '@blocksuite/affine/block-std'; +import type { SurfaceRefBlockComponent } from '@blocksuite/affine/blocks/surface-ref'; import type { AttachmentBlockModel, DocMode, EmbedLinkedDocModel, EmbedSyncedDocModel, ImageBlockModel, - SurfaceRefBlockComponent, SurfaceRefBlockModel, -} from '@blocksuite/affine/blocks'; -import { AffineReference } from '@blocksuite/affine/blocks'; +} from '@blocksuite/affine/model'; +import { AffineReference } from '@blocksuite/affine/rich-text'; import type { Block, BlockModel } from '@blocksuite/affine/store'; import { Entity, LiveData } from '@toeverything/infra'; import type { TemplateResult } from 'lit'; diff --git a/packages/frontend/core/src/modules/peek-view/view/attachment-preview/index.tsx b/packages/frontend/core/src/modules/peek-view/view/attachment-preview/index.tsx index f812144781..75bb54477f 100644 --- a/packages/frontend/core/src/modules/peek-view/view/attachment-preview/index.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/attachment-preview/index.tsx @@ -1,4 +1,4 @@ -import type { AttachmentBlockModel } from '@blocksuite/affine/blocks'; +import type { AttachmentBlockModel } from '@blocksuite/affine/model'; import { useMemo } from 'react'; import { AttachmentViewer } from '../../../../components/attachment-viewer'; diff --git a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx index 3b5763626b..1210136be6 100644 --- a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx @@ -9,12 +9,12 @@ import { EditorService } from '@affine/core/modules/editor'; import { GuardService } from '@affine/core/modules/permissions'; import { DebugLogger } from '@affine/debug'; import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx'; -import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks'; import { Bound } from '@blocksuite/affine/global/gfx'; import { type Disposable, DisposableGroup, } from '@blocksuite/affine/global/slot'; +import { RefNodeSlotsProvider } from '@blocksuite/affine/rich-text'; import { FrameworkScope, useLiveData, diff --git a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx index f38e5fe0db..b23377ee5c 100644 --- a/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/image-preview/index.tsx @@ -2,7 +2,7 @@ import { Divider, Loading, toast } from '@affine/component'; import { Button, IconButton } from '@affine/component/ui/button'; import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks'; import { useI18n } from '@affine/i18n'; -import type { ImageBlockModel } from '@blocksuite/affine/blocks'; +import type { ImageBlockModel } from '@blocksuite/affine/model'; import type { BlockModel, Workspace } from '@blocksuite/affine/store'; import { ArrowLeftSmallIcon, diff --git a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx index c79bc258e3..1dd334ce4f 100644 --- a/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/peek-view-controls.tsx @@ -1,7 +1,7 @@ import { IconButton } from '@affine/component'; import { useI18n } from '@affine/i18n'; import track from '@affine/track'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { CloseIcon, ExpandFullIcon, diff --git a/packages/frontend/core/src/modules/peek-view/view/utils.ts b/packages/frontend/core/src/modules/peek-view/view/utils.ts index 1e3f6d278a..c8be85b750 100644 --- a/packages/frontend/core/src/modules/peek-view/view/utils.ts +++ b/packages/frontend/core/src/modules/peek-view/view/utils.ts @@ -1,5 +1,5 @@ import type { DefaultOpenProperty } from '@affine/core/components/doc-properties'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { useLiveData, useService } from '@toeverything/infra'; import { useEffect, useLayoutEffect, useRef, useState } from 'react'; diff --git a/packages/frontend/core/src/modules/quicksearch/impls/commands.ts b/packages/frontend/core/src/modules/quicksearch/impls/commands.ts index b6480284d3..8a53b7fe70 100644 --- a/packages/frontend/core/src/modules/quicksearch/impls/commands.ts +++ b/packages/frontend/core/src/modules/quicksearch/impls/commands.ts @@ -4,7 +4,7 @@ import { type CommandCategory, PreconditionStrategy, } from '@affine/core/commands'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { Entity, LiveData } from '@toeverything/infra'; import Fuse from 'fuse.js'; diff --git a/packages/frontend/core/src/modules/quicksearch/impls/creation.ts b/packages/frontend/core/src/modules/quicksearch/impls/creation.ts index 74735df3f3..c8847546f6 100644 --- a/packages/frontend/core/src/modules/quicksearch/impls/creation.ts +++ b/packages/frontend/core/src/modules/quicksearch/impls/creation.ts @@ -1,4 +1,4 @@ -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { NewXxxEdgelessIcon, NewXxxPageIcon } from '@blocksuite/icons/rc'; import { Entity, LiveData } from '@toeverything/infra'; diff --git a/packages/frontend/core/src/modules/quicksearch/impls/links.ts b/packages/frontend/core/src/modules/quicksearch/impls/links.ts index 353163d8ad..3cc5ced5b2 100644 --- a/packages/frontend/core/src/modules/quicksearch/impls/links.ts +++ b/packages/frontend/core/src/modules/quicksearch/impls/links.ts @@ -1,4 +1,4 @@ -import type { ReferenceParams } from '@blocksuite/affine/blocks'; +import type { ReferenceParams } from '@blocksuite/affine/model'; import { BlockLinkIcon, EdgelessIcon, PageIcon } from '@blocksuite/icons/rc'; import { Entity, LiveData } from '@toeverything/infra'; import { omit, truncate } from 'lodash-es'; diff --git a/packages/frontend/core/src/modules/share-menu/view/share-menu/copy-link-button.tsx b/packages/frontend/core/src/modules/share-menu/view/share-menu/copy-link-button.tsx index ecdec749f6..2b37a21cac 100644 --- a/packages/frontend/core/src/modules/share-menu/view/share-menu/copy-link-button.tsx +++ b/packages/frontend/core/src/modules/share-menu/view/share-menu/copy-link-button.tsx @@ -5,7 +5,7 @@ import { } from '@affine/core/components/hooks/affine/use-share-url'; import { EditorService } from '@affine/core/modules/editor'; import { useI18n } from '@affine/i18n'; -import type { DocMode } from '@blocksuite/affine/blocks'; +import type { DocMode } from '@blocksuite/affine/model'; import { BlockIcon, EdgelessIcon, PageIcon } from '@blocksuite/icons/rc'; import { useLiveData, useService } from '@toeverything/infra'; import clsx from 'clsx'; diff --git a/packages/frontend/core/src/modules/workbench/entities/workbench.ts b/packages/frontend/core/src/modules/workbench/entities/workbench.ts index b5266ecd14..d22e42a0f1 100644 --- a/packages/frontend/core/src/modules/workbench/entities/workbench.ts +++ b/packages/frontend/core/src/modules/workbench/entities/workbench.ts @@ -1,6 +1,6 @@ import { toURLSearchParams } from '@affine/core/modules/navigation/utils'; import { Unreachable } from '@affine/env/constant'; -import type { ReferenceParams } from '@blocksuite/affine/blocks'; +import type { ReferenceParams } from '@blocksuite/affine/model'; import { Entity, LiveData } from '@toeverything/infra'; import { type To } from 'history'; import { omit } from 'lodash-es'; diff --git a/packages/frontend/core/src/utils/first-app-data.ts b/packages/frontend/core/src/utils/first-app-data.ts index facadfca77..2d92e34f20 100644 --- a/packages/frontend/core/src/utils/first-app-data.ts +++ b/packages/frontend/core/src/utils/first-app-data.ts @@ -4,7 +4,7 @@ import '../blocksuite/block-suite-editor'; import { DebugLogger } from '@affine/debug'; import { DEFAULT_WORKSPACE_NAME } from '@affine/env/constant'; import onboardingUrl from '@affine/templates/onboarding.zip'; -import { ZipTransformer } from '@blocksuite/affine/blocks'; +import { ZipTransformer } from '@blocksuite/affine/blocks/root'; import { DocsService } from '../modules/doc'; import { diff --git a/packages/frontend/templates/README.md b/packages/frontend/templates/README.md index f7f39be177..4ca7e90d0a 100644 --- a/packages/frontend/templates/README.md +++ b/packages/frontend/templates/README.md @@ -7,7 +7,7 @@ Manages template files for use in AFFiNE. For now we only support onboarding tem Before we offer a better solution, to update the onboarding templates: 1. run AFFiNE core locally (dev mode) -2. expose `ZipTransformer` to window. e.g., `import {ZipTransformer} from '@blocksuite/affine/blocks'; window.ZipTransformer = ZipTransformer;` +2. expose `ZipTransformer` to window. e.g., `import {ZipTransformer} from '@blocksuite/affine/blocks/root'; window.ZipTransformer = ZipTransformer;` 3. run the following script ```js (async () => { diff --git a/scripts/download-blocksuite-fonts.mjs b/scripts/download-blocksuite-fonts.mjs index 8dd71e34a9..05b1545e6b 100644 --- a/scripts/download-blocksuite-fonts.mjs +++ b/scripts/download-blocksuite-fonts.mjs @@ -2,7 +2,7 @@ import { writeFile } from 'node:fs/promises'; import { join } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { AffineCanvasTextFonts } from '@blocksuite/affine/blocks'; +import { AffineCanvasTextFonts } from '@blocksuite/affine/shared/services'; const fontPath = join( fileURLToPath(import.meta.url), diff --git a/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts b/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts index abfca9a8aa..c68d0c443f 100644 --- a/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts +++ b/tests/affine-local/e2e/blocksuite/edgeless/note.spec.ts @@ -27,11 +27,9 @@ import { type, waitForEditorLoad, } from '@affine-test/kit/utils/page-logic'; -import type { - EdgelessRootBlockComponent, - NoteBlockModel, -} from '@blocksuite/affine/blocks'; +import type { EdgelessRootBlockComponent } from '@blocksuite/affine/blocks/root'; import type { IVec } from '@blocksuite/affine/global/gfx'; +import type { NoteBlockModel } from '@blocksuite/affine/model'; import { expect, type Page } from '@playwright/test'; const title = 'Edgeless Note Header Test'; diff --git a/tests/kit/src/utils/editor.ts b/tests/kit/src/utils/editor.ts index 80c70a4e56..c05742555c 100644 --- a/tests/kit/src/utils/editor.ts +++ b/tests/kit/src/utils/editor.ts @@ -1,8 +1,8 @@ -import type * as BlocksuiteBlocks from '@blocksuite/affine/blocks'; +import type * as BlocksuiteEffects from '@blocksuite/affine/effects'; import type { IVec, XYWH } from '@blocksuite/affine/global/gfx'; import { expect, type Locator, type Page } from '@playwright/test'; -declare type _GLOBAL_ = typeof BlocksuiteBlocks; +declare type _GLOBAL_ = typeof BlocksuiteEffects; const EDGELESS_ELEMENT_TOOLBAR_WIDGET = 'edgeless-element-toolbar-widget'; const EDGELESS_TOOLBAR_WIDGET = 'edgeless-toolbar-widget'; diff --git a/vitest.config.ts b/vitest.config.ts index 66f131358a..a0732f24d7 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -71,10 +71,5 @@ export default defineConfig({ reporter: ['lcov'], reportsDirectory: resolve(rootDir, '.coverage/store'), }, - server: { - deps: { - inline: ['@blocksuite/affine/blocks'], - }, - }, }, });