refactor: reorganize specs and adapter extensions (#10359)

### TL;DR
Refactored `SpecProvider` singleton access pattern and reorganized adapter/extension code structure.

### What changed?
- Changed `SpecProvider.getInstance()` to `SpecProvider._` for cleaner singleton access
- Moved adapter/extension code from `_common` directory to dedicated `adapters` and `extensions` folders
- Consolidated adapter extensions into a single file
- Removed unused dependencies from package.json
- Deleted unnecessary schema files
- Extracted `MobileSpecsPatches` class into the mobile patching code
- Updated all references to use the new `SpecProvider._` accessor

### How to test?
- Verify all specs are properly registered and accessible via `SpecProvider._`
- Test adapter functionality for HTML, Markdown, Notion HTML and plain text
- Check mobile-specific features and patches work correctly
- Ensure preview functionality works in both page and edgeless modes

### Why make this change?
- Improves code organization by properly separating adapters and extensions
- Simplifies singleton access pattern
- Removes unnecessary dependencies and files
- Makes the codebase more maintainable by consolidating related functionality

blocksuite/blocks/src/__tests__/adapters/html.unit.spec.ts

@@ -1,13 +1,8 @@
-import {
-  HtmlInlineToDeltaAdapterExtensions,
-  InlineDeltaToHtmlAdapterExtensions,
-} from '@blocksuite/affine-components/rich-text';
 import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';
 import {
   embedSyncedDocMiddleware,
   HtmlAdapter,
 } from '@blocksuite/affine-shared/adapters';
-import { Container } from '@blocksuite/global/di';
 import type {
   BlockSnapshot,
   DocSnapshot,
@@ -16,19 +11,11 @@ import type {
 import { AssetsManager, MemoryBlobCRUD } from '@blocksuite/store';
 import { describe, expect, test } from 'vitest';
 
-import { defaultBlockHtmlAdapterMatchers } from '../../_common/adapters/html/block-matcher.js';
 import { createJob } from '../utils/create-job.js';
+import { getProvider } from '../utils/get-provider.js';
 import { nanoidReplacement } from '../utils/nanoid-replacement.js';
 
-const container = new Container();
-[
-  ...HtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockHtmlAdapterMatchers,
-  ...InlineDeltaToHtmlAdapterExtensions,
-].forEach(ext => {
-  ext.setup(container);
-});
-const provider = container.provider();
+const provider = getProvider();
 
 describe('snapshot to html', () => {
   const template = (html: string, title?: string) => {

blocksuite/blocks/src/__tests__/adapters/markdown.unit.spec.ts

@@ -1,7 +1,3 @@
-import {
-  InlineDeltaToMarkdownAdapterExtensions,
-  MarkdownInlineToDeltaAdapterExtensions,
-} from '@blocksuite/affine-components/rich-text';
 import {
   DefaultTheme,
   NoteDisplayMode,
@@ -11,7 +7,6 @@ import {
   embedSyncedDocMiddleware,
   MarkdownAdapter,
 } from '@blocksuite/affine-shared/adapters';
-import { Container } from '@blocksuite/global/di';
 import type {
   BlockSnapshot,
   DocSnapshot,
@@ -21,20 +16,11 @@ import type {
 import { AssetsManager, MemoryBlobCRUD } from '@blocksuite/store';
 import { describe, expect, test } from 'vitest';
 
-import { defaultBlockMarkdownAdapterMatchers } from '../../_common/adapters/markdown/block-matcher.js';
 import { createJob } from '../utils/create-job.js';
+import { getProvider } from '../utils/get-provider.js';
 import { nanoidReplacement } from '../utils/nanoid-replacement.js';
 
-const container = new Container();
-[
-  ...MarkdownInlineToDeltaAdapterExtensions,
-  ...defaultBlockMarkdownAdapterMatchers,
-  ...InlineDeltaToMarkdownAdapterExtensions,
-].forEach(ext => {
-  ext.setup(container);
-});
-
-const provider = container.provider();
+const provider = getProvider();
 
 describe('snapshot to markdown', () => {
   test('code', async () => {

blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts

@@ -1,7 +1,5 @@
-import { NotionHtmlInlineToDeltaAdapterExtensions } from '@blocksuite/affine-components/rich-text';
 import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';
 import { NotionHtmlAdapter } from '@blocksuite/affine-shared/adapters';
-import { Container } from '@blocksuite/global/di';
 import {
   AssetsManager,
   type BlockSnapshot,
@@ -9,19 +7,11 @@ import {
 } from '@blocksuite/store';
 import { describe, expect, test } from 'vitest';
 
-import { defaultBlockNotionHtmlAdapterMatchers } from '../../_common/adapters/notion-html/block-matcher.js';
 import { createJob } from '../utils/create-job.js';
+import { getProvider } from '../utils/get-provider.js';
 import { nanoidReplacement } from '../utils/nanoid-replacement.js';
 
-const container = new Container();
-[
-  ...NotionHtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockNotionHtmlAdapterMatchers,
-].forEach(ext => {
-  ext.setup(container);
-});
-
-const provider = container.provider();
+const provider = getProvider();
 
 describe('notion html to snapshot', () => {
   test('code', async () => {

blocksuite/blocks/src/__tests__/adapters/plain-text.unit.spec.ts

@@ -1,10 +1,8 @@
-import { InlineDeltaToPlainTextAdapterExtensions } from '@blocksuite/affine-components/rich-text';
 import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';
 import {
   embedSyncedDocMiddleware,
   PlainTextAdapter,
 } from '@blocksuite/affine-shared/adapters';
-import { Container } from '@blocksuite/global/di';
 import type {
   BlockSnapshot,
   DocSnapshot,
@@ -12,17 +10,10 @@ import type {
 } from '@blocksuite/store';
 import { describe, expect, test } from 'vitest';
 
-import { defaultBlockPlainTextAdapterMatchers } from '../../_common/adapters/plain-text/block-matcher.js';
 import { createJob } from '../utils/create-job.js';
+import { getProvider } from '../utils/get-provider.js';
 
-const container = new Container();
-[
-  ...defaultBlockPlainTextAdapterMatchers,
-  ...InlineDeltaToPlainTextAdapterExtensions,
-].forEach(ext => {
-  ext.setup(container);
-});
-const provider = container.provider();
+const provider = getProvider();
 
 describe('snapshot to plain text', () => {
   test('paragraph', async () => {

blocksuite/blocks/src/__tests__/utils/get-provider.ts

@@ -0,0 +1,15 @@
+import { SpecProvider } from '@blocksuite/affine-shared/utils';
+import { Container } from '@blocksuite/global/di';
+
+import { registerSpecs } from '../../extensions/register';
+
+registerSpecs();
+
+export function getProvider() {
+  const container = new Container();
+  const exts = SpecProvider._.getSpec('store').value;
+  exts.forEach(ext => {
+    ext.setup(container);
+  });
+  return container.provider();
+}

blocksuite/blocks/src/_common/adapters/extension.ts

@@ -1,22 +0,0 @@
-import {
-  AttachmentAdapterFactoryExtension,
-  HtmlAdapterFactoryExtension,
-  ImageAdapterFactoryExtension,
-  MarkdownAdapterFactoryExtension,
-  MixTextAdapterFactoryExtension,
-  NotionHtmlAdapterFactoryExtension,
-  NotionTextAdapterFactoryExtension,
-  PlainTextAdapterFactoryExtension,
-} from '@blocksuite/affine-shared/adapters';
-import type { ExtensionType } from '@blocksuite/store';
-
-export const AdapterFactoryExtensions: ExtensionType[] = [
-  AttachmentAdapterFactoryExtension,
-  ImageAdapterFactoryExtension,
-  MarkdownAdapterFactoryExtension,
-  PlainTextAdapterFactoryExtension,
-  HtmlAdapterFactoryExtension,
-  NotionTextAdapterFactoryExtension,
-  NotionHtmlAdapterFactoryExtension,
-  MixTextAdapterFactoryExtension,
-];

blocksuite/blocks/src/_specs/index.ts

@@ -1,6 +0,0 @@
-export * from './common.js';
-export * from './preset/edgeless-specs.js';
-export * from './preset/mobile-patch.js';
-export * from './preset/page-specs.js';
-export * from './preset/preview-specs.js';
-export { SpecBuilder, SpecProvider } from '@blocksuite/affine-shared/utils';

blocksuite/blocks/src/_specs/preset/adapters.ts

@@ -1,31 +0,0 @@
-import {
-  HtmlInlineToDeltaAdapterExtensions,
-  InlineDeltaToHtmlAdapterExtensions,
-  InlineDeltaToMarkdownAdapterExtensions,
-  MarkdownInlineToDeltaAdapterExtensions,
-  NotionHtmlInlineToDeltaAdapterExtensions,
-} from '@blocksuite/affine-components/rich-text';
-import type { ExtensionType } from '@blocksuite/store';
-
-import {
-  defaultBlockHtmlAdapterMatchers,
-  defaultBlockMarkdownAdapterMatchers,
-  defaultBlockNotionHtmlAdapterMatchers,
-} from '../../_common/adapters';
-
-export const HtmlAdapterExtension: ExtensionType[] = [
-  ...HtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockHtmlAdapterMatchers,
-  ...InlineDeltaToHtmlAdapterExtensions,
-];
-
-export const MarkdownAdapterExtension: ExtensionType[] = [
-  ...MarkdownInlineToDeltaAdapterExtensions,
-  ...defaultBlockMarkdownAdapterMatchers,
-  ...InlineDeltaToMarkdownAdapterExtensions,
-];
-
-export const NotionHtmlAdapterExtension: ExtensionType[] = [
-  ...NotionHtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockNotionHtmlAdapterMatchers,
-];

blocksuite/blocks/src/_specs/preset/edgeless-specs.ts

@@ -1,9 +0,0 @@
-import { EdgelessBuiltInSpecs } from '@blocksuite/affine-block-root';
-import type { ExtensionType } from '@blocksuite/store';
-
-import { EdgelessFirstPartyBlockSpecs } from '../common';
-
-export const EdgelessEditorBlockSpecs: ExtensionType[] = [
-  EdgelessBuiltInSpecs,
-  EdgelessFirstPartyBlockSpecs,
-].flat();

blocksuite/blocks/src/_specs/preset/mobile-patch.ts

@@ -1,74 +0,0 @@
-import type { CodeBlockConfig } from '@blocksuite/affine-block-code';
-import { ParagraphBlockService } from '@blocksuite/affine-block-paragraph';
-import {
-  type ReferenceNodeConfig,
-  ReferenceNodeConfigIdentifier,
-} from '@blocksuite/affine-components/rich-text';
-import { FeatureFlagService } from '@blocksuite/affine-shared/services';
-import {
-  type BlockStdScope,
-  ConfigIdentifier,
-  LifeCycleWatcher,
-} from '@blocksuite/block-std';
-import type { Container } from '@blocksuite/global/di';
-
-export class MobileSpecsPatches extends LifeCycleWatcher {
-  static override key = 'mobile-patches';
-
-  constructor(std: BlockStdScope) {
-    super(std);
-    const featureFlagService = std.get(FeatureFlagService);
-
-    featureFlagService.setFlag('enable_mobile_keyboard_toolbar', true);
-    featureFlagService.setFlag('enable_mobile_linked_doc_menu', true);
-  }
-
-  static override setup(di: Container) {
-    super.setup(di);
-
-    // Hide reference popup on mobile.
-    {
-      const prev = di.getFactory(ReferenceNodeConfigIdentifier);
-      di.override(ReferenceNodeConfigIdentifier, provider => {
-        return {
-          ...prev?.(provider),
-          hidePopup: true,
-        } satisfies ReferenceNodeConfig;
-      });
-    }
-
-    // Hide number lines for code block on mobile.
-    {
-      const codeConfigIdentifier = ConfigIdentifier('affine:code');
-      const prev = di.getFactory(codeConfigIdentifier);
-      di.override(codeConfigIdentifier, provider => {
-        return {
-          ...prev?.(provider),
-          showLineNumbers: false,
-        } satisfies CodeBlockConfig;
-      });
-    }
-  }
-
-  override mounted() {
-    // remove slash placeholder for mobile: `type / ...`
-    {
-      const paragraphService = this.std.get(ParagraphBlockService);
-      if (!paragraphService) return;
-
-      paragraphService.placeholderGenerator = model => {
-        const placeholders = {
-          text: '',
-          h1: 'Heading 1',
-          h2: 'Heading 2',
-          h3: 'Heading 3',
-          h4: 'Heading 4',
-          h5: 'Heading 5',
-          h6: 'Heading 6',
-          quote: '',
-        };
-        return placeholders[model.type];
-      };
-    }
-  }
-}

blocksuite/blocks/src/_specs/preset/page-specs.ts

@@ -1,9 +0,0 @@
-import { PageRootBlockSpec } from '@blocksuite/affine-block-root';
-import type { ExtensionType } from '@blocksuite/store';
-
-import { PageFirstPartyBlockSpecs } from '../common.js';
-
-export const PageEditorBlockSpecs: ExtensionType[] = [
-  PageRootBlockSpec,
-  ...PageFirstPartyBlockSpecs,
-].flat();

blocksuite/blocks/src/_specs/register-specs.ts

@@ -1,23 +0,0 @@
-import { SpecProvider } from '@blocksuite/affine-shared/utils';
-
-import { StoreExtensions } from './common.js';
-import { EdgelessEditorBlockSpecs } from './preset/edgeless-specs.js';
-import { PageEditorBlockSpecs } from './preset/page-specs.js';
-import {
-  PreviewEdgelessEditorBlockSpecs,
-  PreviewPageEditorBlockSpecs,
-} from './preset/preview-specs.js';
-
-export function registerSpecs() {
-  SpecProvider.getInstance().addSpec('store', StoreExtensions);
-  SpecProvider.getInstance().addSpec('page', PageEditorBlockSpecs);
-  SpecProvider.getInstance().addSpec('edgeless', EdgelessEditorBlockSpecs);
-  SpecProvider.getInstance().addSpec(
-    'preview:page',
-    PreviewPageEditorBlockSpecs
-  );
-  SpecProvider.getInstance().addSpec(
-    'preview:edgeless',
-    PreviewEdgelessEditorBlockSpecs
-  );
-}

blocksuite/blocks/src/adapters/extension.ts

@@ -0,0 +1,57 @@
+import {
+  HtmlInlineToDeltaAdapterExtensions,
+  InlineDeltaToHtmlAdapterExtensions,
+  InlineDeltaToMarkdownAdapterExtensions,
+  InlineDeltaToPlainTextAdapterExtensions,
+  MarkdownInlineToDeltaAdapterExtensions,
+  NotionHtmlInlineToDeltaAdapterExtensions,
+} from '@blocksuite/affine-components/rich-text';
+import {
+  AttachmentAdapterFactoryExtension,
+  HtmlAdapterFactoryExtension,
+  ImageAdapterFactoryExtension,
+  MarkdownAdapterFactoryExtension,
+  MixTextAdapterFactoryExtension,
+  NotionHtmlAdapterFactoryExtension,
+  NotionTextAdapterFactoryExtension,
+  PlainTextAdapterFactoryExtension,
+} from '@blocksuite/affine-shared/adapters';
+import type { ExtensionType } from '@blocksuite/store';
+
+import { defaultBlockHtmlAdapterMatchers } from './html/block-matcher';
+import { defaultBlockMarkdownAdapterMatchers } from './markdown/block-matcher';
+import { defaultBlockNotionHtmlAdapterMatchers } from './notion-html/block-matcher';
+import { defaultBlockPlainTextAdapterMatchers } from './plain-text/block-matcher';
+
+export const AdapterFactoryExtensions: ExtensionType[] = [
+  AttachmentAdapterFactoryExtension,
+  ImageAdapterFactoryExtension,
+  MarkdownAdapterFactoryExtension,
+  PlainTextAdapterFactoryExtension,
+  HtmlAdapterFactoryExtension,
+  NotionTextAdapterFactoryExtension,
+  NotionHtmlAdapterFactoryExtension,
+  MixTextAdapterFactoryExtension,
+];
+
+export const HtmlAdapterExtension: ExtensionType[] = [
+  ...HtmlInlineToDeltaAdapterExtensions,
+  ...defaultBlockHtmlAdapterMatchers,
+  ...InlineDeltaToHtmlAdapterExtensions,
+];
+
+export const MarkdownAdapterExtension: ExtensionType[] = [
+  ...MarkdownInlineToDeltaAdapterExtensions,
+  ...defaultBlockMarkdownAdapterMatchers,
+  ...InlineDeltaToMarkdownAdapterExtensions,
+];
+
+export const NotionHtmlAdapterExtension: ExtensionType[] = [
+  ...NotionHtmlInlineToDeltaAdapterExtensions,
+  ...defaultBlockNotionHtmlAdapterMatchers,
+];
+
+export const PlainTextAdapterExtension: ExtensionType[] = [
+  ...defaultBlockPlainTextAdapterMatchers,
+  ...InlineDeltaToPlainTextAdapterExtensions,
+];

blocksuite/blocks/src/effects.ts

@@ -45,7 +45,7 @@ import { effects as stdEffects } from '@blocksuite/block-std/effects';
 import { effects as dataViewEffects } from '@blocksuite/data-view/effects';
 import { effects as inlineEffects } from '@blocksuite/inline/effects';
 
-import { registerSpecs } from './_specs/register-specs.js';
+import { registerSpecs } from './extensions/register.js';
 
 export function effects() {
   registerSpecs();
@@ -73,6 +73,7 @@ export function effects() {
   blockCodeEffects();
   blockTableEffects();
   blockRootEffects();
+
   componentCaptionEffects();
   componentContextMenuEffects();
   componentDatePickerEffects();

blocksuite/blocks/src/extensions/common.ts

@@ -55,12 +55,13 @@ import {
 } from '@blocksuite/block-std';
 import type { ExtensionType } from '@blocksuite/store';
 
-import { AdapterFactoryExtensions } from '../_common/adapters/extension.js';
 import {
+  AdapterFactoryExtensions,
   HtmlAdapterExtension,
   MarkdownAdapterExtension,
   NotionHtmlAdapterExtension,
-} from './preset/adapters.js';
+  PlainTextAdapterExtension,
+} from '../adapters/extension.js';
 
 export const CommonBlockSpecs: ExtensionType[] = [
   DocDisplayMetaService,
@@ -119,4 +120,5 @@ export const StoreExtensions: ExtensionType[] = [
   HtmlAdapterExtension,
   MarkdownAdapterExtension,
   NotionHtmlAdapterExtension,
+  PlainTextAdapterExtension,
 ].flat();

blocksuite/blocks/src/extensions/editor-specs.ts

@@ -0,0 +1,20 @@
+import {
+  EdgelessBuiltInSpecs,
+  PageRootBlockSpec,
+} from '@blocksuite/affine-block-root';
+import type { ExtensionType } from '@blocksuite/store';
+
+import {
+  EdgelessFirstPartyBlockSpecs,
+  PageFirstPartyBlockSpecs,
+} from './common';
+
+export const EdgelessEditorBlockSpecs: ExtensionType[] = [
+  EdgelessBuiltInSpecs,
+  EdgelessFirstPartyBlockSpecs,
+].flat();
+
+export const PageEditorBlockSpecs: ExtensionType[] = [
+  PageRootBlockSpec,
+  PageFirstPartyBlockSpecs,
+].flat();

blocksuite/blocks/src/extensions/index.ts

@@ -0,0 +1,3 @@
+export * from './common.js';
+export * from './editor-specs.js';
+export * from './preview-specs.js';

blocksuite/blocks/src/extensions/preview-specs.ts

@@ -7,7 +7,7 @@ import type { ExtensionType } from '@blocksuite/store';
 import {
   EdgelessFirstPartyBlockSpecs,
   PageFirstPartyBlockSpecs,
-} from '../common.js';
+} from './common.js';
 
 export const PreviewEdgelessEditorBlockSpecs: ExtensionType[] = [
   PreviewEdgelessRootBlockSpec,

blocksuite/blocks/src/extensions/register.ts

@@ -0,0 +1,19 @@
+import { SpecProvider } from '@blocksuite/affine-shared/utils';
+
+import { StoreExtensions } from './common.js';
+import {
+  EdgelessEditorBlockSpecs,
+  PageEditorBlockSpecs,
+} from './editor-specs.js';
+import {
+  PreviewEdgelessEditorBlockSpecs,
+  PreviewPageEditorBlockSpecs,
+} from './preview-specs.js';
+
+export function registerSpecs() {
+  SpecProvider._.addSpec('store', StoreExtensions);
+  SpecProvider._.addSpec('page', PageEditorBlockSpecs);
+  SpecProvider._.addSpec('edgeless', EdgelessEditorBlockSpecs);
+  SpecProvider._.addSpec('preview:page', PreviewPageEditorBlockSpecs);
+  SpecProvider._.addSpec('preview:edgeless', PreviewEdgelessEditorBlockSpecs);
+}

blocksuite/blocks/src/index.ts

@@ -1,8 +1,5 @@
-/* oxlint-disable @typescript-eslint/triple-slash-reference */
-/// <reference path="./effects.ts" />
-
-export * from './_common/adapters/index.js';
-export * from './_specs/index.js';
+export * from './adapters/index.js';
+export * from './extensions/index.js';
 export * from './schemas.js';
 export * from '@blocksuite/affine-block-attachment';
 export * from '@blocksuite/affine-block-bookmark';
@@ -105,6 +102,7 @@ export {
   printToPdf,
   referenceToNode,
   type Signal,
+  SpecBuilder,
   SpecProvider,
 } from '@blocksuite/affine-shared/utils';
 export type { DragBlockPayload } from '@blocksuite/affine-widget-drag-handle';