refactor(editor): extract notion html adapter to shared

toeverything · Dec 26, 2024 · 2998336 · 2998336
1 parent 6afa1d5
commit 2998336
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 21 deletions.
diff --git a/blocksuite/affine/shared/src/adapters/index.ts b/blocksuite/affine/shared/src/adapters/index.ts
@@ -33,6 +33,9 @@ export {
   BlockNotionHtmlAdapterMatcherIdentifier,
   type InlineDeltaToNotionHtmlAdapterMatcher,
   type NotionHtml,
+  NotionHtmlAdapter,
+  NotionHtmlAdapterFactoryExtension,
+  NotionHtmlAdapterFactoryIdentifier,
   NotionHtmlASTToDeltaExtension,
   type NotionHtmlASTToDeltaMatcher,
   NotionHtmlASTToDeltaMatcherIdentifier,

diff --git a/blocksuite/affine/shared/src/adapters/notion-html/index.ts b/blocksuite/affine/shared/src/adapters/notion-html/index.ts
@@ -1,3 +1,3 @@
 export * from './block-adapter.js';
 export * from './delta-converter.js';
-export * from './type.js';
+export * from './notion-html.js';
diff --git a/...ommon/adapters/notion-html/notion-html.ts → ...d/src/adapters/notion-html/notion-html.ts b/...ommon/adapters/notion-html/notion-html.ts → ...d/src/adapters/notion-html/notion-html.ts
@@ -2,17 +2,6 @@ import {
   DEFAULT_NOTE_BACKGROUND_COLOR,
   NoteDisplayMode,
 } from '@blocksuite/affine-model';
-import {
-  type AdapterContext,
-  AdapterFactoryIdentifier,
-  type BlockNotionHtmlAdapterMatcher,
-  BlockNotionHtmlAdapterMatcherIdentifier,
-  HastUtils,
-  type HtmlAST,
-  type NotionHtml,
-  NotionHtmlASTToDeltaMatcherIdentifier,
-  NotionHtmlDeltaConverter,
-} from '@blocksuite/affine-shared/adapters';
 import type { ExtensionType } from '@blocksuite/block-std';
 import type { ServiceProvider } from '@blocksuite/global/di';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
@@ -35,6 +24,23 @@ import {
 import rehypeParse from 'rehype-parse';
 import { unified } from 'unified';
 
+import {
+  type AdapterContext,
+  AdapterFactoryIdentifier,
+} from '../types/adapter';
+import type { HtmlAST } from '../types/hast';
+import { HastUtils } from '../utils/hast';
+import {
+  type BlockNotionHtmlAdapterMatcher,
+  BlockNotionHtmlAdapterMatcherIdentifier,
+} from './block-adapter';
+import {
+  NotionHtmlASTToDeltaMatcherIdentifier,
+  NotionHtmlDeltaConverter,
+} from './delta-converter';
+
+export type NotionHtml = string;
+
 type NotionHtmlToSliceSnapshotPayload = {
   file: NotionHtml;
   assets?: AssetsManager;

diff --git a/blocksuite/affine/shared/src/adapters/notion-html/type.ts b/blocksuite/affine/shared/src/adapters/notion-html/type.ts
diff --git a/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts b/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts
@@ -2,6 +2,7 @@ import {
   DEFAULT_NOTE_BACKGROUND_COLOR,
   NoteDisplayMode,
 } from '@blocksuite/affine-model';
+import { NotionHtmlAdapter } from '@blocksuite/affine-shared/adapters';
 import { Container } from '@blocksuite/global/di';
 import {
   AssetsManager,
@@ -12,7 +13,6 @@ import { describe, expect, test } from 'vitest';
 
 import { defaultBlockNotionHtmlAdapterMatchers } from '../../_common/adapters/notion-html/block-matcher.js';
 import { notionHtmlInlineToDeltaMatchers } from '../../_common/adapters/notion-html/delta-converter/html-inline.js';
-import { NotionHtmlAdapter } from '../../_common/adapters/notion-html/notion-html.js';
 import { nanoidReplacement } from '../../_common/test-utils/test-utils.js';
 import { createJob } from '../utils/create-job.js';
 

diff --git a/blocksuite/blocks/src/_common/adapters/extension.ts b/blocksuite/blocks/src/_common/adapters/extension.ts
@@ -1,5 +1,6 @@
 import {
   HtmlAdapterFactoryExtension,
+  NotionHtmlAdapterFactoryExtension,
   PlainTextAdapterFactoryExtension,
 } from '@blocksuite/affine-shared/adapters';
 import type { ExtensionType } from '@blocksuite/block-std';
@@ -11,7 +12,6 @@ import { ImageAdapterFactoryExtension } from './image.js';
 import { MarkdownAdapterFactoryExtension } from './markdown/markdown.js';
 import { MixTextAdapterFactoryExtension } from './mix-text.js';
 import { notionHtmlInlineToDeltaMatchers } from './notion-html/delta-converter/html-inline.js';
-import { NotionHtmlAdapterFactoryExtension } from './notion-html/notion-html.js';
 import { NotionTextAdapterFactoryExtension } from './notion-text.js';
 import { inlineDeltaToPlainTextAdapterMatchers } from './plain-text/delta-converter/inline-delta.js';
 

diff --git a/blocksuite/blocks/src/_common/adapters/notion-html/index.ts b/blocksuite/blocks/src/_common/adapters/notion-html/index.ts
@@ -1,6 +1,2 @@
 export { defaultBlockNotionHtmlAdapterMatchers } from './block-matcher.js';
-export {
-  NotionHtmlAdapter,
-  NotionHtmlAdapterFactoryExtension,
-  NotionHtmlAdapterFactoryIdentifier,
-} from './notion-html.js';
+export { notionHtmlInlineToDeltaMatchers } from './delta-converter/html-inline.js';
diff --git a/blocksuite/blocks/src/_common/transformers/notion-html.ts b/blocksuite/blocks/src/_common/transformers/notion-html.ts
@@ -1,10 +1,10 @@
+import { NotionHtmlAdapter } from '@blocksuite/affine-shared/adapters';
 import { Container } from '@blocksuite/global/di';
 import { sha } from '@blocksuite/global/utils';
 import { type DocCollection, extMimeMap, Job } from '@blocksuite/store';
 
 import { defaultBlockNotionHtmlAdapterMatchers } from '../adapters/notion-html/block-matcher.js';
 import { notionHtmlInlineToDeltaMatchers } from '../adapters/notion-html/delta-converter/html-inline.js';
-import { NotionHtmlAdapter } from '../adapters/notion-html/notion-html.js';
 import { defaultImageProxyMiddleware } from './middlewares.js';
 import { Unzip } from './utils.js';
 

diff --git a/blocksuite/blocks/src/index.ts b/blocksuite/blocks/src/index.ts
@@ -103,6 +103,9 @@ export {
   HtmlAdapter,
   HtmlAdapterFactoryExtension,
   HtmlAdapterFactoryIdentifier,
+  NotionHtmlAdapter,
+  NotionHtmlAdapterFactoryExtension,
+  NotionHtmlAdapterFactoryIdentifier,
   PlainTextAdapter,
   PlainTextAdapterFactoryExtension,
   PlainTextAdapterFactoryIdentifier,