Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

feat(editor): replace spec provider with extension manager (#11861)

Saul-Mirone6d6504e2af18
diff --git a/blocksuite/affine/all/package.json b/blocksuite/affine/all/package.json
index 42956c040d..acc45d5f44 100644
--- a/blocksuite/affine/all/package.json
+++ b/blocksuite/affine/all/package.json
@@ -208,7 +208,9 @@
"./model": "./src/model/index.ts",
"./sync": "./src/sync/index.ts",
"./adapters": "./src/adapters/index.ts",
- "./extensions": "./src/extensions/index.ts"
+ "./extensions": "./src/extensions/index.ts",
+ "./extensions/store": "./src/extensions/store.ts",
+ "./extensions/view": "./src/extensions/view.ts"
},
"files": [
"src",
diff --git a/blocksuite/affine/all/src/extensions/migrating.ts b/blocksuite/affine/all/src/extensions/migrating.ts
new file mode 100644
index 0000000000..aa6411a9c7
--- /dev/null
+++ b/blocksuite/affine/all/src/extensions/migrating.ts
@@ -0,0 +1,153 @@
+import { AttachmentBlockSpec } from '@blocksuite/affine-block-attachment';
+import { BookmarkBlockSpec } from '@blocksuite/affine-block-bookmark';
+import { CalloutBlockSpec } from '@blocksuite/affine-block-callout';
+import { CodeBlockSpec } from '@blocksuite/affine-block-code';
+import { DataViewBlockSpec } from '@blocksuite/affine-block-data-view';
+import { DatabaseBlockSpec } from '@blocksuite/affine-block-database';
+import { DividerBlockSpec } from '@blocksuite/affine-block-divider';
+import { EdgelessTextBlockSpec } from '@blocksuite/affine-block-edgeless-text';
+import { EmbedExtensions } from '@blocksuite/affine-block-embed';
+import { FrameBlockSpec } from '@blocksuite/affine-block-frame';
+import { ImageBlockSpec } from '@blocksuite/affine-block-image';
+import { LatexBlockSpec } from '@blocksuite/affine-block-latex';
+import { ListBlockSpec } from '@blocksuite/affine-block-list';
+import {
+ EdgelessNoteBlockSpec,
+ NoteBlockSpec,
+} from '@blocksuite/affine-block-note';
+import { ParagraphBlockSpec } from '@blocksuite/affine-block-paragraph';
+import {
+ EdgelessBuiltInSpecs,
+ PageRootBlockSpec,
+ PreviewEdgelessRootBlockSpec,
+ PreviewPageRootBlockSpec,
+ ReadOnlyClipboard,
+} from '@blocksuite/affine-block-root';
+import {
+ EdgelessSurfaceBlockAdapterExtensions,
+ EdgelessSurfaceBlockSpec,
+ PageSurfaceBlockSpec,
+ SurfaceBlockAdapterExtensions,
+} from '@blocksuite/affine-block-surface';
+import {
+ EdgelessSurfaceRefBlockSpec,
+ PageSurfaceRefBlockSpec,
+} from '@blocksuite/affine-block-surface-ref';
+import { TableBlockSpec } from '@blocksuite/affine-block-table';
+import {
+ brushToMarkdownAdapterMatcher,
+ brushToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-brush';
+import {
+ connectorToMarkdownAdapterMatcher,
+ connectorToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-connector';
+import {
+ groupToMarkdownAdapterMatcher,
+ groupToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-group';
+import {
+ mindmapToMarkdownAdapterMatcher,
+ mindmapToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-mindmap';
+import {
+ shapeToMarkdownAdapterMatcher,
+ shapeToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-shape';
+import {
+ textToMarkdownAdapterMatcher,
+ textToPlainTextAdapterMatcher,
+} from '@blocksuite/affine-gfx-text';
+import { inlinePresetExtensions } from '@blocksuite/affine-inline-preset';
+import {
+ DefaultOpenDocExtension,
+ DocDisplayMetaService,
+ EditPropsStore,
+ FontLoaderService,
+} from '@blocksuite/affine-shared/services';
+import type { ExtensionType } from '@blocksuite/store';
+
+const elementToPlainTextAdapterMatchers = [
+ groupToPlainTextAdapterMatcher,
+ shapeToPlainTextAdapterMatcher,
+ connectorToPlainTextAdapterMatcher,
+ brushToPlainTextAdapterMatcher,
+ textToPlainTextAdapterMatcher,
+ mindmapToPlainTextAdapterMatcher,
+];
+
+const elementToMarkdownAdapterMatchers = [
+ groupToMarkdownAdapterMatcher,
+ shapeToMarkdownAdapterMatcher,
+ connectorToMarkdownAdapterMatcher,
+ brushToMarkdownAdapterMatcher,
+ textToMarkdownAdapterMatcher,
+ mindmapToMarkdownAdapterMatcher,
+];
+
+const CommonBlockSpecs: ExtensionType[] = [
+ inlinePresetExtensions,
+ DocDisplayMetaService,
+ EditPropsStore,
+ LatexBlockSpec,
+ ListBlockSpec,
+ DatabaseBlockSpec,
+ TableBlockSpec,
+ DataViewBlockSpec,
+ DividerBlockSpec,
+ BookmarkBlockSpec,
+ EmbedExtensions,
+ AttachmentBlockSpec,
+ CodeBlockSpec,
+ ImageBlockSpec,
+ ParagraphBlockSpec,
+ DefaultOpenDocExtension,
+ FontLoaderService,
+ CalloutBlockSpec,
+ FrameBlockSpec,
+
+ elementToPlainTextAdapterMatchers,
+ elementToMarkdownAdapterMatchers,
+].flat();
+
+const PageFirstPartyBlockSpecs: ExtensionType[] = [
+ CommonBlockSpecs,
+ NoteBlockSpec,
+ PageSurfaceBlockSpec,
+ PageSurfaceRefBlockSpec,
+
+ ...SurfaceBlockAdapterExtensions,
+].flat();
+
+const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [
+ CommonBlockSpecs,
+
+ EdgelessNoteBlockSpec,
+ EdgelessSurfaceBlockSpec,
+ EdgelessSurfaceRefBlockSpec,
+ EdgelessTextBlockSpec,
+
+ ...EdgelessSurfaceBlockAdapterExtensions,
+].flat();
+
+export const MigratingEdgelessEditorBlockSpecs: ExtensionType[] = [
+ EdgelessBuiltInSpecs,
+ EdgelessFirstPartyBlockSpecs,
+].flat();
+
+export const MigratingPageEditorBlockSpecs: ExtensionType[] = [
+ PageRootBlockSpec,
+ PageFirstPartyBlockSpecs,
+].flat();
+
+export const MigratingPreviewEdgelessEditorBlockSpecs: ExtensionType[] = [
+ PreviewEdgelessRootBlockSpec,
+ EdgelessFirstPartyBlockSpecs,
+ ReadOnlyClipboard,
+].flat();
+
+export const MigratingPreviewPageEditorBlockSpecs: ExtensionType[] = [
+ PreviewPageRootBlockSpec,
+ PageFirstPartyBlockSpecs,
+ ReadOnlyClipboard,
+].flat();
diff --git a/blocksuite/affine/all/src/extensions/store.ts b/blocksuite/affine/all/src/extensions/store.ts
index 48085e9c11..1cdcb8ec5a 100644
--- a/blocksuite/affine/all/src/extensions/store.ts
+++ b/blocksuite/affine/all/src/extensions/store.ts
@@ -4,6 +4,10 @@ import { EmbedIframeConfigExtensions } from '@blocksuite/affine-block-embed';
import { ImageStoreSpec } from '@blocksuite/affine-block-image';
import { SurfaceBlockSchemaExtension } from '@blocksuite/affine-block-surface';
import { TableSelectionExtension } from '@blocksuite/affine-block-table';
+import {
+ type StoreExtensionContext,
+ StoreExtensionProvider,
+} from '@blocksuite/affine-ext-loader';
import {
AttachmentBlockSchemaExtension,
BookmarkBlockSchemaExtension,
@@ -110,3 +114,12 @@ export const StoreExtensions: ExtensionType[] = [
EmbedIframeConfigExtensions,
EmbedIframeService,
].flat();
+
+export class MigratingStoreExtension extends StoreExtensionProvider {
+ override name = 'migrating';
+
+ override setup(context: StoreExtensionContext) {
+ super.setup(context);
+ context.register(StoreExtensions);
+ }
+}
diff --git a/blocksuite/affine/all/src/extensions/view.ts b/blocksuite/affine/all/src/extensions/view.ts
new file mode 100644
index 0000000000..e440078357
--- /dev/null
+++ b/blocksuite/affine/all/src/extensions/view.ts
@@ -0,0 +1,42 @@
+import {
+ type ViewExtensionContext,
+ ViewExtensionProvider,
+} from '@blocksuite/affine-ext-loader';
+
+import { effects } from '../effects';
+import {
+ MigratingEdgelessEditorBlockSpecs,
+ MigratingPageEditorBlockSpecs,
+ MigratingPreviewEdgelessEditorBlockSpecs,
+ MigratingPreviewPageEditorBlockSpecs,
+} from './migrating';
+
+export class MigratingViewExtension extends ViewExtensionProvider {
+ override name = 'migrating';
+
+ override effect() {
+ super.effect();
+ effects();
+ }
+
+ override setup(context: ViewExtensionContext) {
+ super.setup(context);
+ const scope = context.scope;
+ if (scope === 'preview-page') {
+ context.register(MigratingPreviewPageEditorBlockSpecs);
+ return;
+ }
+ if (scope === 'preview-edgeless') {
+ context.register(MigratingPreviewEdgelessEditorBlockSpecs);
+ return;
+ }
+ if (scope === 'page' || scope === 'mobile-page') {
+ context.register(MigratingPageEditorBlockSpecs);
+ return;
+ }
+ if (scope === 'edgeless' || scope === 'mobile-edgeless') {
+ context.register(MigratingEdgelessEditorBlockSpecs);
+ return;
+ }
+ }
+}
diff --git a/blocksuite/affine/blocks/embed/src/common/render-linked-doc.ts b/blocksuite/affine/blocks/embed/src/common/render-linked-doc.ts
index 270dfc96c2..3601db8c52 100644
--- a/blocksuite/affine/blocks/embed/src/common/render-linked-doc.ts
+++ b/blocksuite/affine/blocks/embed/src/common/render-linked-doc.ts
@@ -1,4 +1,5 @@
import { getSurfaceBlock } from '@blocksuite/affine-block-surface';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import {
type DocMode,
ImageBlockModel,
@@ -9,7 +10,7 @@ import {
} from '@blocksuite/affine-model';
import { EMBED_CARD_HEIGHT } from '@blocksuite/affine-shared/consts';
import { NotificationProvider } from '@blocksuite/affine-shared/services';
-import { matchModels, SpecProvider } from '@blocksuite/affine-shared/utils';
+import { matchModels } from '@blocksuite/affine-shared/utils';
import { BlockStdScope, EditorLifeCycleExtension } from '@blocksuite/std';
import {
type BlockModel,
@@ -202,10 +203,13 @@ async function renderNoteContent(
match: ids.map(id => ({ id, viewType: 'display' })),
};
const previewDoc = doc.doc.getStore({ query });
- const previewSpec = SpecProvider._.getSpec('preview:page');
+ const std = card.host.std;
+ const previewSpec = std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-page');
const previewStd = new BlockStdScope({
store: previewDoc,
- extensions: previewSpec.value,
+ extensions: previewSpec,
});
const previewTemplate = previewStd.render();
const fragment = document.createDocumentFragment();
diff --git a/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts b/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts
index 00446dd284..0a92d398a6 100644
--- a/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-edgeless-synced-doc-block.ts
@@ -70,7 +70,7 @@ export class EmbedEdgelessSyncedDocBlockComponent extends toEdgelessEmbedBlock(
<div class="affine-page-viewport" data-theme=${appTheme}>
${new BlockStdScope({
store: syncedDoc,
- extensions: this._buildPreviewSpec('preview:page'),
+ extensions: this._buildPreviewSpec('preview-page'),
}).render()}
</div>
`,
@@ -81,7 +81,7 @@ export class EmbedEdgelessSyncedDocBlockComponent extends toEdgelessEmbedBlock(
<div class="affine-edgeless-viewport" data-theme=${edgelessTheme}>
${new BlockStdScope({
store: syncedDoc,
- extensions: this._buildPreviewSpec('preview:edgeless'),
+ extensions: this._buildPreviewSpec('preview-edgeless'),
}).render()}
</div>
`,
diff --git a/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-synced-doc-block.ts b/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-synced-doc-block.ts
index c31d6e4dad..467f78f532 100644
--- a/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-synced-doc-block.ts
+++ b/blocksuite/affine/blocks/embed/src/embed-synced-doc-block/embed-synced-doc-block.ts
@@ -1,4 +1,5 @@
import { Peekable } from '@blocksuite/affine-components/peek';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import {
type DocLinkClickedEvent,
RefNodeSlotsProvider,
@@ -20,10 +21,7 @@ import {
ThemeExtensionIdentifier,
ThemeProvider,
} from '@blocksuite/affine-shared/services';
-import {
- cloneReferenceInfo,
- SpecProvider,
-} from '@blocksuite/affine-shared/utils';
+import { cloneReferenceInfo } from '@blocksuite/affine-shared/utils';
import { Bound, getCommonBound } from '@blocksuite/global/gfx';
import {
BlockSelection,
@@ -113,9 +111,10 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
],
};
- protected _buildPreviewSpec = (name: 'preview:page' | 'preview:edgeless') => {
+ protected _buildPreviewSpec = (name: 'preview-page' | 'preview-edgeless') => {
const nextDepth = this.depth + 1;
- const previewSpecBuilder = SpecProvider._.getSpec(name);
+ const viewExtensionManager = this.std.get(ViewExtensionManagerIdentifier);
+ const previewSpec = viewExtensionManager.get(name);
const currentDisposables = this.disposables;
const editorSetting = this.std.getOptional(EditorSettingProvider) ?? {
setting$: signal(GeneralSettingSchema.parse({})),
@@ -157,13 +156,11 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
}
}
- previewSpecBuilder.extend([
+ return previewSpec.concat([
EmbedSyncedDocWatcher,
GfxViewportInitializer,
EditorSettingExtension(editorSetting),
]);
-
- return previewSpecBuilder.value;
};
protected _renderSyncedView = () => {
@@ -204,7 +201,7 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
<div class="affine-page-viewport" data-theme=${appTheme}>
${new BlockStdScope({
store: syncedDoc,
- extensions: this._buildPreviewSpec('preview:page'),
+ extensions: this._buildPreviewSpec('preview-page'),
}).render()}
</div>
`,
@@ -215,7 +212,7 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
<div class="affine-edgeless-viewport" data-theme=${edgelessTheme}>
${new BlockStdScope({
store: syncedDoc,
- extensions: this._buildPreviewSpec('preview:edgeless'),
+ extensions: this._buildPreviewSpec('preview-edgeless'),
}).render()}
</div>
`,
diff --git a/blocksuite/affine/blocks/surface-ref/package.json b/blocksuite/affine/blocks/surface-ref/package.json
index d130cd07c1..b57d48fac2 100644
--- a/blocksuite/affine/blocks/surface-ref/package.json
+++ b/blocksuite/affine/blocks/surface-ref/package.json
@@ -13,6 +13,7 @@
"@blocksuite/affine-block-frame": "workspace:*",
"@blocksuite/affine-block-surface": "workspace:*",
"@blocksuite/affine-components": "workspace:*",
+ "@blocksuite/affine-ext-loader": "workspace:*",
"@blocksuite/affine-inline-reference": "workspace:*",
"@blocksuite/affine-model": "workspace:*",
"@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/blocks/surface-ref/src/portal/note.ts b/blocksuite/affine/blocks/surface-ref/src/portal/note.ts
index a80637743a..5089bfc072 100644
--- a/blocksuite/affine/blocks/surface-ref/src/portal/note.ts
+++ b/blocksuite/affine/blocks/surface-ref/src/portal/note.ts
@@ -1,4 +1,5 @@
import type { CanvasRenderer } from '@blocksuite/affine-block-surface';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import type { NoteBlockModel } from '@blocksuite/affine-model';
import {
DefaultTheme,
@@ -10,7 +11,6 @@ import {
EDGELESS_BLOCK_CHILD_PADDING,
} from '@blocksuite/affine-shared/consts';
import { ThemeProvider } from '@blocksuite/affine-shared/services';
-import { SpecProvider } from '@blocksuite/affine-shared/utils';
import { deserializeXYWH } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
import {
@@ -122,10 +122,12 @@ export class SurfaceRefNotePortal extends WithDisposable(ShadowlessElement) {
query: this.query,
readonly: true,
});
- const previewSpec = SpecProvider._.getSpec('preview:page');
+ const previewSpec = this.host.std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-page');
return new BlockStdScope({
store: doc,
- extensions: previewSpec.value.slice(),
+ extensions: previewSpec,
}).render();
}
diff --git a/blocksuite/affine/blocks/surface-ref/src/surface-ref-block.ts b/blocksuite/affine/blocks/surface-ref/src/surface-ref-block.ts
index f93c8b5478..4556971f78 100644
--- a/blocksuite/affine/blocks/surface-ref/src/surface-ref-block.ts
+++ b/blocksuite/affine/blocks/surface-ref/src/surface-ref-block.ts
@@ -6,6 +6,7 @@ import {
import type { BlockCaptionEditor } from '@blocksuite/affine-components/caption';
import { whenHover } from '@blocksuite/affine-components/hover';
import { Peekable } from '@blocksuite/affine-components/peek';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import { RefNodeSlotsProvider } from '@blocksuite/affine-inline-reference';
import {
FrameBlockModel,
@@ -20,10 +21,7 @@ import {
ViewportElementExtension,
} from '@blocksuite/affine-shared/services';
import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
-import {
- requestConnectedFrame,
- SpecProvider,
-} from '@blocksuite/affine-shared/utils';
+import { requestConnectedFrame } from '@blocksuite/affine-shared/utils';
import { DisposableGroup } from '@blocksuite/global/disposable';
import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
import {
@@ -46,7 +44,7 @@ import {
type GfxModel,
GfxPrimitiveElementModel,
} from '@blocksuite/std/gfx';
-import type { BaseSelection, Store } from '@blocksuite/store';
+import type { BaseSelection, ExtensionType, Store } from '@blocksuite/store';
import { effect, signal } from '@preact/signals-core';
import { css, html, nothing } from 'lit';
import { query } from 'lit/decorators.js';
@@ -114,9 +112,18 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
private _previewDoc: Store | null = null;
- private readonly _previewSpec = SpecProvider._.getSpec(
- 'preview:edgeless'
- ).extend([ViewportElementExtension('.ref-viewport')]);
+ private _runtimePreviewExt: ExtensionType[] = [];
+
+ private get _viewExtensionManager() {
+ return this.std.get(ViewExtensionManagerIdentifier);
+ }
+
+ private get _previewSpec() {
+ return [
+ ...this._viewExtensionManager.get('preview-edgeless'),
+ ViewportElementExtension('.ref-viewport'),
+ ];
+ }
private _referencedModel: GfxModel | null = null;
@@ -338,7 +345,7 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
}
}
- this._previewSpec.extend([SurfaceRefViewportWatcher]);
+ this._runtimePreviewExt = [SurfaceRefViewportWatcher];
}
private _initHover() {
@@ -366,7 +373,7 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
private _renderRefContent(referencedModel: GfxModel) {
const [, , w, h] = deserializeXYWH(referencedModel.xywh);
- const _previewSpec = this._previewSpec.value;
+ const _previewSpec = this._previewSpec.concat(this._runtimePreviewExt);
return html`<div class="ref-content">
<div
diff --git a/blocksuite/affine/blocks/surface-ref/tsconfig.json b/blocksuite/affine/blocks/surface-ref/tsconfig.json
index ae9e5c350c..de776f583f 100644
--- a/blocksuite/affine/blocks/surface-ref/tsconfig.json
+++ b/blocksuite/affine/blocks/surface-ref/tsconfig.json
@@ -10,6 +10,7 @@
{ "path": "../frame" },
{ "path": "../surface" },
{ "path": "../../components" },
+ { "path": "../../ext-loader" },
{ "path": "../../inlines/reference" },
{ "path": "../../model" },
{ "path": "../../shared" },
diff --git a/blocksuite/affine/ext-loader/src/__tests__/ext-loader.unit.spec.ts b/blocksuite/affine/ext-loader/src/__tests__/ext-loader.unit.spec.ts
index ae945ed9e9..f314b63f71 100644
--- a/blocksuite/affine/ext-loader/src/__tests__/ext-loader.unit.spec.ts
+++ b/blocksuite/affine/ext-loader/src/__tests__/ext-loader.unit.spec.ts
@@ -54,14 +54,17 @@ describe('multiple scopes', () => {
class ViewExt1 extends ViewExtensionProvider {
override name = 'ViewExt1';
- override setup(context: ViewExtensionContext) {
- super.setup(context);
+ constructor() {
+ super();
+ setup1();
+ }
+
+ override setup(context: ViewExtensionContext, option?: { foo: number }) {
+ super.setup(context, option);
if (context.scope === 'page') {
- setup1();
context.register(Ext2);
}
if (context.scope === 'edgeless') {
- setup2();
context.register(Ext3);
}
}
@@ -69,6 +72,11 @@ describe('multiple scopes', () => {
class ViewExt2 extends ViewExtensionProvider {
override name = 'ViewExt2';
+ constructor() {
+ super();
+ setup2();
+ }
+
override setup(context: ViewExtensionContext) {
super.setup(context);
if (context.scope === 'page') {
@@ -87,7 +95,7 @@ describe('multiple scopes', () => {
expect(edgelessExtensions).toEqual([Ext3, Ext5]);
});
- it('should setup be cached', () => {
+ it('should cache provider instances', () => {
manager.get('page');
manager.get('edgeless');
expect(setup1).toHaveBeenCalledTimes(1);
diff --git a/blocksuite/affine/ext-loader/src/manager.ts b/blocksuite/affine/ext-loader/src/manager.ts
index 661e2d20db..da7857e039 100644
--- a/blocksuite/affine/ext-loader/src/manager.ts
+++ b/blocksuite/affine/ext-loader/src/manager.ts
@@ -84,16 +84,17 @@ export class ExtensionManager<Scope extends string> {
/**
* Retrieves all extensions registered for a specific scope.
- * If the scope hasn't been built yet, it triggers the build process.
+ * It triggers the build process.
*
* @param scope - The scope to retrieve extensions for
* @returns An array of extensions registered for the specified scope
* @throws {BlockSuiteError} If the scope is not found
*/
get(scope: Scope) {
- if (!this._extensions.has(scope)) {
- this._build(scope);
+ if (this._extensions.has(scope)) {
+ this._extensions.delete(scope);
}
+ this._build(scope);
const extensionSet = this._extensions.get(scope);
if (!extensionSet) {
throw new BlockSuiteError(
@@ -117,14 +118,19 @@ export class ExtensionManager<Scope extends string> {
provider: typeof BaseExtensionProvider<Scope, T>,
options: ((prev: T | undefined) => T | undefined) | T | undefined
) {
+ const prev = this._providerOptions.get(provider);
+
let config: T | undefined;
if (typeof options === 'function') {
- const prev = this._providerOptions.get(provider);
config = (options as (prev: unknown) => T)(prev);
} else {
config = options;
}
+ if (prev === config) {
+ return;
+ }
+
if (config === undefined) {
this._providerOptions.delete(provider);
} else {
diff --git a/blocksuite/affine/fragments/frame-panel/package.json b/blocksuite/affine/fragments/frame-panel/package.json
index c5db24a79f..051485adc0 100644
--- a/blocksuite/affine/fragments/frame-panel/package.json
+++ b/blocksuite/affine/fragments/frame-panel/package.json
@@ -13,6 +13,7 @@
"@blocksuite/affine-block-frame": "workspace:*",
"@blocksuite/affine-block-surface": "workspace:*",
"@blocksuite/affine-components": "workspace:*",
+ "@blocksuite/affine-ext-loader": "workspace:*",
"@blocksuite/affine-model": "workspace:*",
"@blocksuite/affine-rich-text": "workspace:*",
"@blocksuite/affine-shared": "workspace:*",
diff --git a/blocksuite/affine/fragments/frame-panel/src/card/frame-preview.ts b/blocksuite/affine/fragments/frame-panel/src/card/frame-preview.ts
index 3db44beac0..8399a19bca 100644
--- a/blocksuite/affine/fragments/frame-panel/src/card/frame-preview.ts
+++ b/blocksuite/affine/fragments/frame-panel/src/card/frame-preview.ts
@@ -1,10 +1,10 @@
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import type { FrameBlockModel } from '@blocksuite/affine-model';
import {
DocModeExtension,
DocModeProvider,
ViewportElementExtension,
} from '@blocksuite/affine-shared/services';
-import { SpecProvider } from '@blocksuite/affine-shared/utils';
import { DisposableGroup } from '@blocksuite/global/disposable';
import { Bound, deserializeXYWH } from '@blocksuite/global/gfx';
import { WithDisposable } from '@blocksuite/global/lit';
@@ -15,13 +15,12 @@ import {
ShadowlessElement,
} from '@blocksuite/std';
import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
-import { type Query, type Store } from '@blocksuite/store';
+import { type ExtensionType, type Query, type Store } from '@blocksuite/store';
import { css, html, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
import { guard } from 'lit/directives/guard.js';
import { styleMap } from 'lit/directives/style-map.js';
import debounce from 'lodash-es/debounce';
-
const DEFAULT_PREVIEW_CONTAINER_WIDTH = 280;
const DEFAULT_PREVIEW_CONTAINER_HEIGHT = 166;
@@ -86,7 +85,15 @@ export class FramePreview extends WithDisposable(ShadowlessElement) {
private _previewDoc: Store | null = null;
- private readonly _previewSpec = SpecProvider._.getSpec('preview:edgeless');
+ private _runtimePreviewExt: ExtensionType[] = [];
+
+ private get _viewExtensionManager() {
+ return this.std.get(ViewExtensionManagerIdentifier);
+ }
+
+ private get _previewSpec() {
+ return this._viewExtensionManager.get('preview-edgeless');
+ }
private readonly _updateFrameViewportWH = () => {
const [, , w, h] = deserializeXYWH(this.frame.xywh);
@@ -143,11 +150,11 @@ export class FramePreview extends WithDisposable(ShadowlessElement) {
}
const docModeService = this.std.get(DocModeProvider);
- this._previewSpec.extend([
+ this._runtimePreviewExt = [
ViewportElementExtension('.frame-preview-viewport'),
FramePreviewWatcher,
DocModeExtension(docModeService),
- ]);
+ ];
}
private _refreshViewport() {
@@ -163,7 +170,7 @@ export class FramePreview extends WithDisposable(ShadowlessElement) {
private _renderSurfaceContent() {
const { width, height } = this.frameViewportWH;
- const _previewSpec = this._previewSpec.value;
+ const _previewSpec = this._previewSpec.concat(this._runtimePreviewExt);
return html`<div
class="frame-preview-surface-container"
style=${styleMap({
diff --git a/blocksuite/affine/fragments/frame-panel/tsconfig.json b/blocksuite/affine/fragments/frame-panel/tsconfig.json
index 3116812f2d..b82c1a4135 100644
--- a/blocksuite/affine/fragments/frame-panel/tsconfig.json
+++ b/blocksuite/affine/fragments/frame-panel/tsconfig.json
@@ -10,6 +10,7 @@
{ "path": "../../blocks/frame" },
{ "path": "../../blocks/surface" },
{ "path": "../../components" },
+ { "path": "../../ext-loader" },
{ "path": "../../model" },
{ "path": "../../rich-text" },
{ "path": "../../shared" },
diff --git a/blocksuite/affine/shared/src/services/editor-setting-service.ts b/blocksuite/affine/shared/src/services/editor-setting-service.ts
index e01f399ea9..77780fec57 100644
--- a/blocksuite/affine/shared/src/services/editor-setting-service.ts
+++ b/blocksuite/affine/shared/src/services/editor-setting-service.ts
@@ -35,7 +35,7 @@ export function EditorSettingExtension(
): ExtensionType {
return {
setup: di => {
- di.addImpl(EditorSettingProvider, () => service);
+ di.override(EditorSettingProvider, () => service);
},
};
}
diff --git a/blocksuite/affine/widgets/drag-handle/package.json b/blocksuite/affine/widgets/drag-handle/package.json
index 33ad908da8..82e205cb07 100644
--- a/blocksuite/affine/widgets/drag-handle/package.json
+++ b/blocksuite/affine/widgets/drag-handle/package.json
@@ -17,6 +17,7 @@
"@blocksuite/affine-block-paragraph": "workspace:*",
"@blocksuite/affine-block-surface": "workspace:*",
"@blocksuite/affine-components": "workspace:*",
+ "@blocksuite/affine-ext-loader": "workspace:*",
"@blocksuite/affine-model": "workspace:*",
"@blocksuite/affine-shared": "workspace:*",
"@blocksuite/global": "workspace:*",
diff --git a/blocksuite/affine/widgets/drag-handle/src/helpers/preview-helper.ts b/blocksuite/affine/widgets/drag-handle/src/helpers/preview-helper.ts
index f1037f675b..39fafe5553 100644
--- a/blocksuite/affine/widgets/drag-handle/src/helpers/preview-helper.ts
+++ b/blocksuite/affine/widgets/drag-handle/src/helpers/preview-helper.ts
@@ -1,10 +1,10 @@
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine-ext-loader';
import {
DocModeExtension,
DocModeProvider,
EditorSettingExtension,
EditorSettingProvider,
} from '@blocksuite/affine-shared/services';
-import { SpecProvider } from '@blocksuite/affine-shared/utils';
import { BlockStdScope, BlockViewIdentifier } from '@blocksuite/std';
import type {
BlockModel,
@@ -69,7 +69,9 @@ export class PreviewHelper {
const editorSetting = std.get(EditorSettingProvider);
const query = this._calculateQuery(blockIds as string[]);
const store = widget.doc.doc.getStore({ query });
- const previewSpec = SpecProvider._.getSpec('preview:page');
+ let previewSpec = widget.std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-page');
const settingSignal = signal({ ...editorSetting.setting$.peek() });
const extensions = [
DocModeExtension(docModeService),
@@ -99,7 +101,7 @@ export class PreviewHelper {
} as ExtensionType,
];
- previewSpec.extend(extensions);
+ previewSpec = previewSpec.concat(extensions);
settingSignal.value = {
...settingSignal.value,
@@ -108,7 +110,7 @@ export class PreviewHelper {
const previewStd = new BlockStdScope({
store,
- extensions: previewSpec.value,
+ extensions: previewSpec,
});
let width: number = 500;
diff --git a/blocksuite/affine/widgets/drag-handle/tsconfig.json b/blocksuite/affine/widgets/drag-handle/tsconfig.json
index 51215efe4e..89887c9a74 100644
--- a/blocksuite/affine/widgets/drag-handle/tsconfig.json
+++ b/blocksuite/affine/widgets/drag-handle/tsconfig.json
@@ -14,6 +14,7 @@
{ "path": "../../blocks/paragraph" },
{ "path": "../../blocks/surface" },
{ "path": "../../components" },
+ { "path": "../../ext-loader" },
{ "path": "../../model" },
{ "path": "../../shared" },
{ "path": "../../../framework/global" },
diff --git a/blocksuite/integration-test/package.json b/blocksuite/integration-test/package.json
index d1b0d35711..569eacc957 100644
--- a/blocksuite/integration-test/package.json
+++ b/blocksuite/integration-test/package.json
@@ -28,7 +28,9 @@
},
"exports": {
".": "./src/index.ts",
- "./effects": "./src/effects.ts"
+ "./effects": "./src/effects.ts",
+ "./store": "./src/store.ts",
+ "./view": "./src/view.ts"
},
"files": [
"src",
diff --git a/blocksuite/integration-test/src/__tests__/utils/setup.ts b/blocksuite/integration-test/src/__tests__/utils/setup.ts
index cfc27eaee0..af06acd4df 100644
--- a/blocksuite/integration-test/src/__tests__/utils/setup.ts
+++ b/blocksuite/integration-test/src/__tests__/utils/setup.ts
@@ -1,13 +1,7 @@
import '@toeverything/theme/style.css';
import '@toeverything/theme/fonts.css';
-import { effects as blocksEffects } from '@blocksuite/affine/effects';
-import {
- EdgelessEditorBlockSpecs,
- PageEditorBlockSpecs,
- registerStoreSpecs,
- StoreExtensions,
-} from '@blocksuite/affine/extensions';
+import { registerStoreSpecs } from '@blocksuite/affine/extensions';
import type { DocMode } from '@blocksuite/affine/model';
import { AffineSchemas } from '@blocksuite/affine/schemas';
import {
@@ -27,11 +21,17 @@ import {
import { effects } from '../../effects.js';
import { TestAffineEditorContainer } from '../../index.js';
+import { getTestStoreManager } from '../../store.js';
+import { getTestViewManager } from '../../view.js';
+// FIXME: used for test import/export
registerStoreSpecs();
-blocksEffects();
+const storeManager = getTestStoreManager();
+const viewManager = getTestViewManager();
effects();
+const storeExtensions = storeManager.get('store');
+
export function getRenderer() {
return editor.std.get(
ViewportTurboRendererIdentifier
@@ -85,12 +85,12 @@ async function createEditor(
editor.doc = doc;
editor.mode = mode;
editor.pageSpecs = [
- ...PageEditorBlockSpecs,
+ ...viewManager.get('page'),
FontConfigExtension(CommunityCanvasTextFonts),
...extensions,
];
editor.edgelessSpecs = [
- ...EdgelessEditorBlockSpecs,
+ ...viewManager.get('edgeless'),
FontConfigExtension(CommunityCanvasTextFonts),
...extensions,
];
@@ -123,7 +123,7 @@ export async function setupEditor(
extensions: ExtensionType[] = []
) {
const collection = new TestWorkspace(createCollectionOptions());
- collection.storeExtensions = StoreExtensions;
+ collection.storeExtensions = storeExtensions;
collection.meta.initialize();
window.collection = collection;
diff --git a/blocksuite/integration-test/src/store.ts b/blocksuite/integration-test/src/store.ts
new file mode 100644
index 0000000000..63afa01014
--- /dev/null
+++ b/blocksuite/integration-test/src/store.ts
@@ -0,0 +1,7 @@
+import { StoreExtensionManager } from '@blocksuite/affine/ext-loader';
+import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store';
+
+export function getTestStoreManager() {
+ const manager = new StoreExtensionManager([MigratingStoreExtension]);
+ return manager;
+}
diff --git a/blocksuite/integration-test/src/view.ts b/blocksuite/integration-test/src/view.ts
new file mode 100644
index 0000000000..fa89a7c729
--- /dev/null
+++ b/blocksuite/integration-test/src/view.ts
@@ -0,0 +1,7 @@
+import { ViewExtensionManager } from '@blocksuite/affine/ext-loader';
+import { MigratingViewExtension } from '@blocksuite/affine/extensions/view';
+
+export function getTestViewManager() {
+ const manager = new ViewExtensionManager([MigratingViewExtension]);
+ return manager;
+}
diff --git a/blocksuite/playground/apps/starter/main.ts b/blocksuite/playground/apps/starter/main.ts
index e477728413..b59c2fad0e 100644
--- a/blocksuite/playground/apps/starter/main.ts
+++ b/blocksuite/playground/apps/starter/main.ts
@@ -2,7 +2,6 @@ import '../../style.css';
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 { registerStoreSpecs } from '@blocksuite/affine/extensions';
import * as globalUtils from '@blocksuite/affine/global/utils';
import * as services from '@blocksuite/affine/shared/services';
@@ -10,7 +9,8 @@ import * as blockStd from '@blocksuite/affine/std';
import * as store from '@blocksuite/affine/store';
import * as affineModel from '@blocksuite/affine-model';
import * as editor from '@blocksuite/integration-test';
-import { effects as presetsEffects } from '@blocksuite/integration-test/effects';
+import { effects as itEffects } from '@blocksuite/integration-test/effects';
+import { getTestStoreManager } from '@blocksuite/integration-test/store';
import { setupEdgelessTemplate } from '../_common/setup.js';
import { effects as commentEffects } from '../comment/effects.js';
@@ -22,8 +22,8 @@ import { mountDefaultDocEditor } from './utils/setup-playground';
import { prepareTestApp } from './utils/test';
registerStoreSpecs();
-blocksEffects();
-presetsEffects();
+itEffects();
+const storeManager = getTestStoreManager();
commentEffects();
async function main() {
@@ -34,7 +34,7 @@ async function main() {
const params = new URLSearchParams(location.search);
const room = params.get('room') ?? Math.random().toString(16).slice(2, 8);
const isE2E = room.startsWith('playwright');
- const collection = createStarterDocCollection();
+ const collection = createStarterDocCollection(storeManager);
if (isE2E) {
Object.defineProperty(window, '$blocksuite', {
diff --git a/blocksuite/playground/apps/starter/utils/collection.ts b/blocksuite/playground/apps/starter/utils/collection.ts
index 3a4dd30dd8..4fed772180 100644
--- a/blocksuite/playground/apps/starter/utils/collection.ts
+++ b/blocksuite/playground/apps/starter/utils/collection.ts
@@ -1,5 +1,5 @@
+import type { StoreExtensionManager } from '@blocksuite/affine/ext-loader';
import { AffineSchemas } from '@blocksuite/affine/schemas';
-import { SpecProvider } from '@blocksuite/affine/shared/utils';
import { nanoid, Schema, Transformer } from '@blocksuite/affine/store';
import {
createAutoIncrementIdGenerator,
@@ -23,7 +23,9 @@ const room = params.get('room');
const isE2E = room?.startsWith('playwright');
const blobSourceArgs = (params.get('blobSource') ?? '').split(',');
-export function createStarterDocCollection() {
+export function createStarterDocCollection(
+ storeExtensionManager: StoreExtensionManager
+) {
const collectionId = room ?? 'starter';
const schema = new Schema();
schema.register(AffineSchemas);
@@ -56,7 +58,7 @@ export function createStarterDocCollection() {
blobSources,
};
const collection = new TestWorkspace(options);
- collection.storeExtensions = SpecProvider._.getSpec('store').value;
+ collection.storeExtensions = storeExtensionManager.get('store');
collection.start();
// debug info
diff --git a/blocksuite/playground/apps/starter/utils/extensions.ts b/blocksuite/playground/apps/starter/utils/extensions.ts
index 8a44f24c38..1c4fc84bb5 100644
--- a/blocksuite/playground/apps/starter/utils/extensions.ts
+++ b/blocksuite/playground/apps/starter/utils/extensions.ts
@@ -1,7 +1,3 @@
-import {
- EdgelessEditorBlockSpecs,
- PageEditorBlockSpecs,
-} from '@blocksuite/affine/extensions';
import { RefNodeSlotsProvider } from '@blocksuite/affine/inlines/reference';
import {
CommunityCanvasTextFonts,
@@ -13,6 +9,7 @@ import {
} from '@blocksuite/affine/shared/services';
import type { ExtensionType, Store, Workspace } from '@blocksuite/affine/store';
import { type TestAffineEditorContainer } from '@blocksuite/integration-test';
+import { getTestViewManager } from '@blocksuite/integration-test/view';
import {
mockDocModeService,
@@ -20,6 +17,8 @@ import {
mockParseDocUrlService,
} from '../../_common/mock-services';
+const viewManager = getTestViewManager();
+
export function getTestCommonExtensions(
editor: TestAffineEditorContainer
): ExtensionType[] {
@@ -48,8 +47,8 @@ export function createTestEditor(store: Store, workspace: Workspace) {
editor.doc = store;
const defaultExtensions = getTestCommonExtensions(editor);
- editor.pageSpecs = [...PageEditorBlockSpecs, ...defaultExtensions];
- editor.edgelessSpecs = [...EdgelessEditorBlockSpecs, ...defaultExtensions];
+ editor.pageSpecs = [...viewManager.get('page'), ...defaultExtensions];
+ editor.edgelessSpecs = [...viewManager.get('edgeless'), ...defaultExtensions];
editor.std
.get(RefNodeSlotsProvider)
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
index 424a53e0d7..5c84a48ca0 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/chat-panel-messages.ts
@@ -3,10 +3,9 @@ import {
DocModeProvider,
FeatureFlagService,
} from '@blocksuite/affine/shared/services';
-import { type SpecBuilder } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
-import type { BaseSelection } from '@blocksuite/affine/store';
+import type { BaseSelection, ExtensionType } from '@blocksuite/affine/store';
import { ArrowDownBigIcon as ArrowDownIcon } from '@blocksuite/icons/lit';
import { css, html, nothing, type PropertyValues } from 'lit';
import { property, query, state } from 'lit/decorators.js';
@@ -157,7 +156,7 @@ export class ChatPanelMessages extends WithDisposable(ShadowlessElement) {
accessor updateContext!: (context: Partial<ChatContextValue>) => void;
@property({ attribute: false })
- accessor previewSpecBuilder!: SpecBuilder;
+ accessor extensions!: ExtensionType[];
@query('.chat-panel-messages-container')
accessor messagesContainer: HTMLDivElement | null = null;
@@ -271,7 +270,7 @@ export class ChatPanelMessages extends WithDisposable(ShadowlessElement) {
.isLast=${isLast}
.status=${isLast ? status : 'idle'}
.error=${isLast ? error : null}
- .previewSpecBuilder=${this.previewSpecBuilder}
+ .extensions=${this.extensions}
.getSessionId=${this.getSessionId}
.retry=${() => this.retry()}
></chat-message-assistant>`;
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts
index 0668154f24..13d807524e 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/content/rich-text.ts
@@ -1,7 +1,7 @@
import { WithDisposable } from '@blocksuite/affine/global/lit';
-import type { SpecBuilder } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
+import type { ExtensionType } from '@blocksuite/affine/store';
import { html } from 'lit';
import { property } from 'lit/decorators.js';
@@ -18,13 +18,13 @@ export class ChatContentRichText extends WithDisposable(ShadowlessElement) {
accessor state: 'finished' | 'generating' = 'finished';
@property({ attribute: false })
- accessor previewSpecBuilder!: SpecBuilder;
+ accessor extensions!: ExtensionType[];
protected override render() {
const { text, host } = this;
return html`${createTextRenderer(host, {
customHeading: true,
- extensions: this.previewSpecBuilder.value,
+ extensions: this.extensions,
})(text, this.state)}`;
}
}
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
index 7e49bf4bfb..ce1f2623fa 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/index.ts
@@ -2,10 +2,9 @@ import './chat-panel-messages';
import type { ContextEmbedStatus } from '@affine/graphql';
import { SignalWatcher, WithDisposable } from '@blocksuite/affine/global/lit';
-import type { SpecBuilder } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
-import type { Store } from '@blocksuite/affine/store';
+import type { ExtensionType, Store } from '@blocksuite/affine/store';
import { HelpIcon } from '@blocksuite/icons/lit';
import { type Signal, signal } from '@preact/signals-core';
import { css, html, type PropertyValues } from 'lit';
@@ -208,7 +207,7 @@ export class ChatPanel extends SignalWatcher(
accessor docDisplayConfig!: DocDisplayConfig;
@property({ attribute: false })
- accessor previewSpecBuilder!: SpecBuilder;
+ accessor extensions!: ExtensionType[];
@state()
accessor isLoading = false;
@@ -401,7 +400,7 @@ export class ChatPanel extends SignalWatcher(
.updateContext=${this.updateContext}
.host=${this.host}
.isLoading=${this.isLoading}
- .previewSpecBuilder=${this.previewSpecBuilder}
+ .extensions=${this.extensions}
></chat-panel-messages>
<ai-chat-composer
.host=${this.host}
diff --git a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts
index add1883d58..3140d63864 100644
--- a/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts
+++ b/packages/frontend/core/src/blocksuite/ai/chat-panel/message/assistant.ts
@@ -5,6 +5,7 @@ import { WithDisposable } from '@blocksuite/affine/global/lit';
import { isInsidePageEditor } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { ShadowlessElement } from '@blocksuite/affine/std';
+import type { ExtensionType } from '@blocksuite/affine/store';
import { css, html, nothing } from 'lit';
import { property } from 'lit/decorators.js';
@@ -44,7 +45,7 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
accessor error: AIError | null = null;
@property({ attribute: false })
- accessor previewSpecBuilder: any;
+ accessor extensions!: ExtensionType[];
@property({ attribute: false })
accessor getSessionId!: () => Promise<string | undefined>;
@@ -90,7 +91,7 @@ export class ChatMessageAssistant extends WithDisposable(ShadowlessElement) {
.host=${host}
.text=${item.content}
.state=${state}
- .previewSpecBuilder=${this.previewSpecBuilder}
+ .extensions=${this.extensions}
></chat-content-rich-text>
${shouldRenderError ? AIChatErrorRenderer(host, error) : nothing}
${this.renderEditorActions()}
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 2532f37751..5146257242 100644
--- a/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/components/text-renderer.ts
@@ -43,6 +43,18 @@ import type {
AffineAIPanelWidgetConfig,
} from '../widgets/ai-panel/type';
+export const CustomPageEditorBlockSpecs: ExtensionType[] = [
+ ...PageEditorBlockSpecs,
+ {
+ setup: di => {
+ di.override(
+ BlockViewIdentifier('affine:page'),
+ () => literal`affine-page-root`
+ );
+ },
+ },
+];
+
const customHeadingStyles = css`
.custom-heading {
.h1 {
@@ -91,18 +103,6 @@ export type TextRendererOptions = {
testId?: string;
};
-export const CustomPageEditorBlockSpecs: ExtensionType[] = [
- ...PageEditorBlockSpecs,
- {
- setup: di => {
- di.override(
- BlockViewIdentifier('affine:page'),
- () => literal`affine-page-root`
- );
- },
- },
-];
-
// todo: refactor it for more general purpose usage instead of AI only?
export class TextRenderer extends WithDisposable(ShadowlessElement) {
static override styles = css`
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 5d27584bcd..795102e246 100644
--- a/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts
+++ b/packages/frontend/core/src/blocksuite/ai/extensions/ai-code.ts
@@ -7,7 +7,7 @@ import type { ExtensionType } from '@blocksuite/affine/store';
import { setupCodeToolbarAIEntry } from '../entries/code-toolbar/setup-code-toolbar';
-class AICodeBlockWatcher extends LifeCycleWatcher {
+export class AICodeBlockWatcher extends LifeCycleWatcher {
static override key = 'ai-code-block-watcher';
override mounted() {
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 d2f8bbcf62..a570648f7c 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
@@ -47,7 +47,7 @@ export function createAIEdgelessRootBlockSpec(
];
}
-function getAIEdgelessRootWatcher(framework: FrameworkProvider) {
+export function getAIEdgelessRootWatcher(framework: FrameworkProvider) {
class AIEdgelessRootWatcher extends LifeCycleWatcher {
static override key = 'ai-edgeless-root-watcher';
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 b221fdc7af..dccd3aaa1f 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
@@ -16,7 +16,7 @@ import {
} from '../widgets/ai-panel/ai-panel';
import { AiSlashMenuConfigExtension } from './ai-slash-menu';
-function getAIPageRootWatcher(framework: FrameworkProvider) {
+export function getAIPageRootWatcher(framework: FrameworkProvider) {
class AIPageRootWatcher extends LifeCycleWatcher {
static override key = 'ai-page-root-watcher';
diff --git a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
index ad7aaf93b9..6c4bf6d3f5 100644
--- a/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
+++ b/packages/frontend/core/src/blocksuite/ai/messages/slides-renderer.ts
@@ -1,6 +1,6 @@
import { WorkspaceImpl } from '@affine/core/modules/workspace/impls/workspace';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine/ext-loader';
import { WithDisposable } from '@blocksuite/affine/global/lit';
-import { SpecProvider } from '@blocksuite/affine/shared/utils';
import { BlockStdScope, type EditorHost } from '@blocksuite/affine/std';
import type { Store } from '@blocksuite/affine/store';
import { css, html, LitElement, nothing } from 'lit';
@@ -91,6 +91,12 @@ export class AISlidesRenderer extends WithDisposable(LitElement) {
});
}
+ protected _getExtensions() {
+ return this.host.std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-edgeless');
+ }
+
protected override render() {
return html`<style>
.slides-container {
@@ -205,7 +211,7 @@ export class AISlidesRenderer extends WithDisposable(LitElement) {
>
${new BlockStdScope({
store: this._doc,
- extensions: SpecProvider._.getSpec('preview:edgeless').value,
+ extensions: this._getExtensions(),
}).render()}
</div>
<div class="mask"></div>
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 14a4552f6a..30e624f8dc 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
@@ -4,12 +4,13 @@ import {
EdgelessCRUDIdentifier,
getSurfaceBlock,
} from '@blocksuite/affine/blocks/surface';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine/ext-loader';
import { ConnectorMode } from '@blocksuite/affine/model';
import {
DocModeProvider,
TelemetryProvider,
} from '@blocksuite/affine/shared/services';
-import type { Signal, SpecBuilder } from '@blocksuite/affine/shared/utils';
+import type { Signal } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { signal } from '@preact/signals-core';
import { html, LitElement, nothing } from 'lit';
@@ -437,9 +438,11 @@ export class AIChatBlockPeekView extends LitElement {
override connectedCallback() {
super.connectedCallback();
- this._textRendererOptions = {
- extensions: this.previewSpecBuilder.value,
- };
+ const extensions = this.host.std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-page');
+
+ this._textRendererOptions = { extensions };
this._historyMessages = this._deserializeHistoryChatMessages(
this.historyMessagesString
);
@@ -529,9 +532,6 @@ export class AIChatBlockPeekView extends LitElement {
@property({ attribute: false })
accessor host!: EditorHost;
- @property({ attribute: false })
- accessor previewSpecBuilder!: SpecBuilder;
-
@property({ attribute: false })
accessor networkSearchConfig!: AINetworkSearchConfig;
@@ -566,7 +566,6 @@ declare global {
export const AIChatBlockPeekViewTemplate = (
blockModel: AIChatBlockModel,
host: EditorHost,
- previewSpecBuilder: SpecBuilder,
docDisplayConfig: DocDisplayConfig,
searchMenuConfig: SearchMenuConfig,
networkSearchConfig: AINetworkSearchConfig
@@ -574,7 +573,6 @@ export const AIChatBlockPeekViewTemplate = (
return html`<ai-chat-block-peek-view
.blockModel=${blockModel}
.host=${host}
- .previewSpecBuilder=${previewSpecBuilder}
.networkSearchConfig=${networkSearchConfig}
.docDisplayConfig=${docDisplayConfig}
.searchMenuConfig=${searchMenuConfig}
diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/bi-directional-link-panel.tsx b/packages/frontend/core/src/blocksuite/block-suite-editor/bi-directional-link-panel.tsx
index e4ace9e2f1..54cf2ce36d 100644
--- a/packages/frontend/core/src/blocksuite/block-suite-editor/bi-directional-link-panel.tsx
+++ b/packages/frontend/core/src/blocksuite/block-suite-editor/bi-directional-link-panel.tsx
@@ -41,11 +41,11 @@ import {
AffineSharedPageReference,
} from '../../components/affine/reference-link';
import { LitTextRenderer } from '../ai/components/text-renderer';
-import { enableEditorExtension } from '../extensions/entry/enable-editor';
import {
patchReferenceRenderer,
type ReferenceReactRenderer,
} from '../extensions/reference-renderer';
+import { getViewManager } from '../manager/migrating-view';
import * as styles from './bi-directional-link-panel.css';
const PREFIX = 'bi-directional-link-panel-collapse:';
@@ -163,9 +163,9 @@ const usePreviewExtensions = () => {
const enableAI = useEnableAI();
const extensions = useMemo(() => {
- const specs = enableEditorExtension(framework, 'page', enableAI);
- specs.extend([patchReferenceRenderer(reactToLit, referenceRenderer)]);
- return specs.value;
+ const manager = getViewManager(framework, enableAI);
+ const specs = manager.get('preview-page');
+ return [...specs, patchReferenceRenderer(reactToLit, referenceRenderer)];
}, [reactToLit, referenceRenderer, framework, enableAI]);
return [extensions, portals] as const;
diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/index.ts b/packages/frontend/core/src/blocksuite/block-suite-editor/index.ts
index 2f7395b2f3..66a1f66253 100644
--- a/packages/frontend/core/src/blocksuite/block-suite-editor/index.ts
+++ b/packages/frontend/core/src/blocksuite/block-suite-editor/index.ts
@@ -1,10 +1,11 @@
import { registerAIEffects } from '@affine/core/blocksuite/ai/effects';
import { editorEffects } from '@affine/core/blocksuite/editors';
-import { effects as bsEffects } from '@blocksuite/affine/effects';
+import type * as EffectType from '@blocksuite/affine/effects';
+
+declare type _GLOBAL_ = typeof EffectType;
import { registerTemplates } from './register-templates';
-bsEffects();
editorEffects();
registerAIEffects();
registerTemplates();
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 7a89997a6c..dd492ab687 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
@@ -62,7 +62,6 @@ import { EdgelessClipboardAIChatConfig } from '../extensions/edgeless-clipboard'
import { patchForClipboardInElectron } from '../extensions/electron-clipboard';
import { enableEditorExtension } from '../extensions/entry/enable-editor';
import { enableMobileExtension } from '../extensions/entry/enable-mobile';
-import { enablePreviewExtension } from '../extensions/entry/enable-preview';
import { patchForEdgelessNoteConfig } from '../extensions/note-config';
import { patchNotificationService } from '../extensions/notification-service';
import { patchOpenDocExtension } from '../extensions/open-doc';
@@ -140,10 +139,6 @@ const usePatchSpecs = (mode: DocMode) => {
};
}, [workspaceService]);
- useMemo(() => {
- enablePreviewExtension(framework);
- }, [framework]);
-
const confirmModal = useConfirmModal();
const enableAI = useEnableAI();
@@ -161,9 +156,9 @@ const usePatchSpecs = (mode: DocMode) => {
);
const patchedSpecs = useMemo(() => {
- const builder = enableEditorExtension(framework, mode, enableAI);
+ let extensions = enableEditorExtension(framework, mode, enableAI);
- builder.extend(
+ extensions = extensions.concat(
[
patchReferenceRenderer(reactToLit, referenceRenderer),
patchForEdgelessNoteConfig(framework, reactToLit, insidePeekView),
@@ -190,17 +185,20 @@ const usePatchSpecs = (mode: DocMode) => {
);
if (enablePDFEmbedPreview) {
- builder.extend([patchForPDFEmbedView(reactToLit)]);
+ extensions = extensions.concat([patchForPDFEmbedView(reactToLit)]);
}
if (BUILD_CONFIG.isMobileEdition) {
- enableMobileExtension(builder, framework);
+ extensions = enableMobileExtension(extensions, framework);
}
+
if (BUILD_CONFIG.isElectron) {
- builder.extend([patchForClipboardInElectron(framework)].flat());
+ extensions = extensions.concat(
+ [patchForClipboardInElectron(framework)].flat()
+ );
}
- return builder.value;
+ return extensions;
}, [
framework,
mode,
diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-editor.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-editor.ts
index 5d53fdfa19..ae92876687 100644
--- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-editor.ts
+++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-editor.ts
@@ -1,19 +1,13 @@
-import { enableAIExtension } from '@affine/core/blocksuite/ai';
-import { enableAffineExtension } from '@affine/core/blocksuite/extensions';
-import {
- type SpecBuilder,
- SpecProvider,
-} from '@blocksuite/affine/shared/utils';
+import type { ExtensionType } from '@blocksuite/affine/store';
import { type FrameworkProvider } from '@toeverything/infra';
+import { getViewManager } from '../../manager/migrating-view';
+
export function enableEditorExtension(
framework: FrameworkProvider,
mode: 'edgeless' | 'page',
enableAI: boolean
-): SpecBuilder {
- const spec = SpecProvider._.getSpec(mode);
- enableAffineExtension(spec, framework);
- enableAIExtension(spec, framework, enableAI);
-
- return spec;
+): ExtensionType[] {
+ const manager = getViewManager(framework, enableAI);
+ return manager.get(mode);
}
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 bb095b0986..9f739d9dc0 100644
--- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts
+++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-mobile.ts
@@ -11,7 +11,6 @@ import {
VirtualKeyboardProvider as BSVirtualKeyboardProvider,
type VirtualKeyboardProviderWithAction,
} from '@blocksuite/affine/shared/services';
-import type { SpecBuilder } from '@blocksuite/affine/shared/utils';
import { type BlockStdScope, LifeCycleWatcher } from '@blocksuite/affine/std';
import type { ExtensionType } from '@blocksuite/affine/store';
import { SlashMenuExtension } from '@blocksuite/affine/widgets/slash-menu';
@@ -112,16 +111,26 @@ function KeyboardToolbarExtension(framework: FrameworkProvider): ExtensionType {
}
export function enableMobileExtension(
- specBuilder: SpecBuilder,
+ extensions: ExtensionType[],
framework: FrameworkProvider
-): void {
- specBuilder.omit(codeToolbarWidget);
- specBuilder.omit(toolbarWidget);
- specBuilder.omit(SlashMenuExtension);
- specBuilder.extend([
+): ExtensionType[] {
+ const next = extensions.filter(extension => {
+ if (extension === codeToolbarWidget) {
+ return false;
+ }
+ if (extension === toolbarWidget) {
+ return false;
+ }
+ if (extension === SlashMenuExtension) {
+ return false;
+ }
+ return true;
+ });
+ next.push(
MobileSpecsPatches,
KeyboardToolbarExtension(framework),
mobileParagraphConfig,
- mobileCodeConfig,
- ]);
+ mobileCodeConfig
+ );
+ return next;
}
diff --git a/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts b/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts
index cdefad5ec4..8e6c26158f 100644
--- a/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts
+++ b/packages/frontend/core/src/blocksuite/extensions/entry/enable-preview.ts
@@ -27,7 +27,7 @@ import { getFontConfigExtension } from '../font-config';
import { patchPeekViewService } from '../peek-view-service';
import { getThemeExtension } from '../theme';
-function getPagePreviewThemeExtension(framework: FrameworkProvider) {
+export function getPagePreviewThemeExtension(framework: FrameworkProvider) {
class AffinePagePreviewThemeExtension
extends LifeCycleWatcher
implements ThemeExtension
diff --git a/packages/frontend/core/src/blocksuite/manager/migrating-store.ts b/packages/frontend/core/src/blocksuite/manager/migrating-store.ts
new file mode 100644
index 0000000000..16b2d55c32
--- /dev/null
+++ b/packages/frontend/core/src/blocksuite/manager/migrating-store.ts
@@ -0,0 +1,26 @@
+import {
+ type StoreExtensionContext,
+ StoreExtensionManager,
+ StoreExtensionProvider,
+} from '@blocksuite/affine/ext-loader';
+import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store';
+
+import { AIChatBlockSchemaExtension } from '../ai/blocks/ai-chat-block/model';
+
+class MigratingAffineStoreExtension extends StoreExtensionProvider {
+ override name = 'affine-store-extensions';
+
+ override setup(context: StoreExtensionContext) {
+ super.setup(context);
+ context.register(AIChatBlockSchemaExtension);
+ }
+}
+
+const manager = new StoreExtensionManager([
+ MigratingAffineStoreExtension,
+ MigratingStoreExtension,
+]);
+
+export function getStoreManager() {
+ return manager;
+}
diff --git a/packages/frontend/core/src/blocksuite/manager/migrating-view.ts b/packages/frontend/core/src/blocksuite/manager/migrating-view.ts
new file mode 100644
index 0000000000..01a38800af
--- /dev/null
+++ b/packages/frontend/core/src/blocksuite/manager/migrating-view.ts
@@ -0,0 +1,144 @@
+import { PeekViewService } from '@affine/core/modules/peek-view';
+import { ParagraphBlockConfigExtension } from '@blocksuite/affine/blocks/paragraph';
+import {
+ type ViewExtensionContext,
+ ViewExtensionManager,
+ ViewExtensionProvider,
+} from '@blocksuite/affine/ext-loader';
+import { MigratingViewExtension } from '@blocksuite/affine/extensions/view';
+import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services';
+import { BlockFlavourIdentifier } from '@blocksuite/affine/std';
+import { FrameworkProvider } from '@toeverything/infra';
+import { z } from 'zod';
+
+import { toolbarAIEntryConfig } from '../ai';
+import { AIChatBlockSpec } from '../ai/blocks';
+import { AITranscriptionBlockSpec } from '../ai/blocks/ai-chat-block/ai-transcription-block';
+import { edgelessToolbarAIEntryConfig } from '../ai/entries/edgeless';
+import { imageToolbarAIEntryConfig } from '../ai/entries/image-toolbar/setup-image-toolbar';
+import { AICodeBlockWatcher } from '../ai/extensions/ai-code';
+import { getAIEdgelessRootWatcher } from '../ai/extensions/ai-edgeless-root';
+import { getAIPageRootWatcher } from '../ai/extensions/ai-page-root';
+import { AiSlashMenuConfigExtension } from '../ai/extensions/ai-slash-menu';
+import { CopilotTool } from '../ai/tool/copilot-tool';
+import { aiPanelWidget } from '../ai/widgets/ai-panel/ai-panel';
+import { edgelessCopilotWidget } from '../ai/widgets/edgeless-copilot';
+import { buildDocDisplayMetaExtension } from '../extensions/display-meta';
+import { getEditorConfigExtension } from '../extensions/editor-config';
+import { getPagePreviewThemeExtension } from '../extensions/entry/enable-preview';
+import { getFontConfigExtension } from '../extensions/font-config';
+import { patchPeekViewService } from '../extensions/peek-view-service';
+import { getTelemetryExtension } from '../extensions/telemetry';
+import { getThemeExtension } from '../extensions/theme';
+
+const optionsSchema = z.object({
+ enableAI: z.boolean().optional(),
+ framework: z.instanceof(FrameworkProvider),
+});
+
+class MigratingAffineViewExtension extends ViewExtensionProvider<
+ z.infer<typeof optionsSchema>
+> {
+ override name = 'affine-view-extensions';
+
+ override schema = optionsSchema;
+
+ override setup(
+ context: ViewExtensionContext,
+ options?: z.infer<typeof optionsSchema>
+ ) {
+ super.setup(context);
+ const { framework, enableAI } = options || {};
+ if (framework) {
+ context.register([
+ getThemeExtension(framework),
+ getFontConfigExtension(),
+ buildDocDisplayMetaExtension(framework),
+ ]);
+ if (context.scope === 'page' || context.scope === 'edgeless') {
+ context.register(getTelemetryExtension());
+ context.register(getEditorConfigExtension(framework));
+ }
+ if (
+ context.scope === 'preview-page' ||
+ context.scope === 'preview-edgeless'
+ ) {
+ context.register(getPagePreviewThemeExtension(framework));
+ context.register(patchPeekViewService(framework.get(PeekViewService)));
+ }
+ if (enableAI) {
+ context.register(AIChatBlockSpec);
+ context.register(AITranscriptionBlockSpec);
+ context.register(
+ [
+ AICodeBlockWatcher,
+ ToolbarModuleExtension({
+ id: BlockFlavourIdentifier('custom:affine:image'),
+ config: imageToolbarAIEntryConfig(),
+ }),
+ ParagraphBlockConfigExtension({
+ getPlaceholder: model => {
+ const placeholders = {
+ text: "Type '/' for commands, 'space' for AI",
+ h1: 'Heading 1',
+ h2: 'Heading 2',
+ h3: 'Heading 3',
+ h4: 'Heading 4',
+ h5: 'Heading 5',
+ h6: 'Heading 6',
+ quote: '',
+ };
+ return placeholders[model.props.type];
+ },
+ }),
+ ].flat()
+ );
+ if (context.scope === 'edgeless') {
+ context.register([
+ CopilotTool,
+ aiPanelWidget,
+ edgelessCopilotWidget,
+ getAIEdgelessRootWatcher(framework),
+ // In note
+ ToolbarModuleExtension({
+ id: BlockFlavourIdentifier('custom:affine:note'),
+ config: toolbarAIEntryConfig(),
+ }),
+ ToolbarModuleExtension({
+ id: BlockFlavourIdentifier('custom:affine:surface:*'),
+ config: edgelessToolbarAIEntryConfig(),
+ }),
+ AiSlashMenuConfigExtension(),
+ ]);
+ }
+ if (context.scope === 'page') {
+ context.register([
+ aiPanelWidget,
+ getAIPageRootWatcher(framework),
+ ToolbarModuleExtension({
+ id: BlockFlavourIdentifier('custom:affine:note'),
+ config: toolbarAIEntryConfig(),
+ }),
+ AiSlashMenuConfigExtension(),
+ ]);
+ }
+ }
+ }
+ }
+}
+
+const manager = new ViewExtensionManager([
+ MigratingViewExtension,
+ MigratingAffineViewExtension,
+]);
+
+export function getViewManager(
+ framework: FrameworkProvider,
+ enableAI: boolean
+) {
+ manager.configure(MigratingAffineViewExtension, {
+ framework,
+ enableAI,
+ });
+ return manager;
+}
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 cb98c170c5..ff41948577 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
@@ -1,10 +1,10 @@
import { Skeleton } from '@affine/component';
+import { getViewManager } from '@affine/core/blocksuite/manager/migrating-view';
import type { EditorSettingSchema } from '@affine/core/modules/editor-setting';
import { EditorSettingService } from '@affine/core/modules/editor-setting';
import { EdgelessCRUDIdentifier } from '@blocksuite/affine/blocks/surface';
import { Bound } from '@blocksuite/affine/global/gfx';
import { ViewportElementExtension } from '@blocksuite/affine/shared/services';
-import { SpecProvider } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { BlockStdScope } from '@blocksuite/affine/std';
import {
@@ -14,7 +14,7 @@ import {
import type { Block, Store } from '@blocksuite/affine/store';
import { useFramework } from '@toeverything/infra';
import { isEqual } from 'lodash-es';
-import { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
import { map, pairwise } from 'rxjs';
import {
@@ -55,6 +55,13 @@ export const EdgelessSnapshot = (props: Props) => {
const framework = useFramework();
const { editorSetting } = framework.get(EditorSettingService);
+ const extensions = useMemo(() => {
+ const manager = getViewManager(framework, false);
+ return manager
+ .get('preview-edgeless')
+ .concat([ViewportElementExtension('.ref-viewport')]);
+ }, [framework]);
+
const updateElements = useCallback(() => {
const editorHost = editorHostRef.current;
const doc = docRef.current;
@@ -76,9 +83,7 @@ export const EdgelessSnapshot = (props: Props) => {
const editorHost = new BlockStdScope({
store: doc,
- extensions: SpecProvider._.getSpec('preview:edgeless').extend([
- ViewportElementExtension('.ref-viewport'),
- ]).value,
+ extensions,
}).render();
docRef.current = doc;
editorHostRef.current?.remove();
@@ -115,7 +120,7 @@ export const EdgelessSnapshot = (props: Props) => {
// append to dom node
wrapperRef.current.append(editorHost);
- }, [docName, firstUpdate, updateElements]);
+ }, [docName, extensions, firstUpdate, updateElements]);
useEffect(() => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
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 77e1127aa5..b3bcacabdb 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
@@ -2,12 +2,10 @@ import { ChatPanel } from '@affine/core/blocksuite/ai';
import type { AffineEditorContainer } from '@affine/core/blocksuite/block-suite-editor';
import { useAIChatConfig } from '@affine/core/components/hooks/affine/use-ai-chat-config';
import { WorkbenchService } from '@affine/core/modules/workbench';
+import { ViewExtensionManagerIdentifier } from '@blocksuite/affine/ext-loader';
import { RefNodeSlotsProvider } from '@blocksuite/affine/inlines/reference';
import { DocModeProvider } from '@blocksuite/affine/shared/services';
-import {
- createSignalFromObservable,
- SpecProvider,
-} from '@blocksuite/affine/shared/utils';
+import { createSignalFromObservable } from '@blocksuite/affine/shared/utils';
import { useFramework } from '@toeverything/infra';
import { forwardRef, useEffect, useRef } from 'react';
@@ -69,8 +67,9 @@ export const EditorChatPanel = forwardRef(function EditorChatPanel(
chatPanelRef.current.docDisplayConfig = docDisplayConfig;
chatPanelRef.current.searchMenuConfig = searchMenuConfig;
chatPanelRef.current.networkSearchConfig = networkSearchConfig;
- chatPanelRef.current.previewSpecBuilder =
- SpecProvider._.getSpec('preview:page');
+ chatPanelRef.current.extensions = editor.host.std
+ .get(ViewExtensionManagerIdentifier)
+ .get('preview-page');
containerRef.current?.append(chatPanelRef.current);
} else {
diff --git a/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx b/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx
index 77e6e9de1e..6c917a6537 100644
--- a/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx
+++ b/packages/frontend/core/src/modules/peek-view/view/ai-chat-block-peek-view/index.tsx
@@ -2,7 +2,6 @@ import { toReactNode } from '@affine/component';
import { AIChatBlockPeekViewTemplate } from '@affine/core/blocksuite/ai';
import type { AIChatBlockModel } from '@affine/core/blocksuite/ai/blocks/ai-chat-block/model/ai-chat-model';
import { useAIChatConfig } from '@affine/core/components/hooks/affine/use-ai-chat-config';
-import { SpecProvider } from '@blocksuite/affine/shared/utils';
import type { EditorHost } from '@blocksuite/affine/std';
import { useMemo } from 'react';
@@ -18,11 +17,9 @@ export const AIChatBlockPeekView = ({
const { docDisplayConfig, searchMenuConfig, networkSearchConfig } =
useAIChatConfig();
return useMemo(() => {
- const previewSpecBuilder = SpecProvider._.getSpec('preview:page');
const template = AIChatBlockPeekViewTemplate(
model,
host,
- previewSpecBuilder,
docDisplayConfig,
searchMenuConfig,
networkSearchConfig
diff --git a/packages/frontend/core/src/modules/workspace/impls/doc.ts b/packages/frontend/core/src/modules/workspace/impls/doc.ts
index 9cc5f060eb..f36ae4e3f6 100644
--- a/packages/frontend/core/src/modules/workspace/impls/doc.ts
+++ b/packages/frontend/core/src/modules/workspace/impls/doc.ts
@@ -1,4 +1,4 @@
-import { SpecProvider } from '@blocksuite/affine/shared/utils';
+import { getStoreManager } from '@affine/core/blocksuite/manager/migrating-store';
import {
AwarenessStore,
type Doc,
@@ -294,11 +294,9 @@ export class DocImpl implements Doc {
return this._storeMap.get(key) as Store;
}
- const storeExtensions = SpecProvider._.getSpec('store');
+ const storeExtensions = getStoreManager().get('store');
const extensionSet = new Set(
- storeExtensions.value
- .concat(extensions ?? [])
- .concat(this.storeExtensions)
+ storeExtensions.concat(extensions ?? []).concat(this.storeExtensions)
);
const doc = new Store({
diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts
index f41e026c2d..3bda07b306 100644
--- a/tools/utils/src/workspace.gen.ts
+++ b/tools/utils/src/workspace.gen.ts
@@ -388,6 +388,7 @@ export const PackageList = [
'blocksuite/affine/blocks/frame',
'blocksuite/affine/blocks/surface',
'blocksuite/affine/components',
+ 'blocksuite/affine/ext-loader',
'blocksuite/affine/inlines/reference',
'blocksuite/affine/model',
'blocksuite/affine/shared',
@@ -465,6 +466,7 @@ export const PackageList = [
'blocksuite/affine/blocks/frame',
'blocksuite/affine/blocks/surface',
'blocksuite/affine/components',
+ 'blocksuite/affine/ext-loader',
'blocksuite/affine/model',
'blocksuite/affine/rich-text',
'blocksuite/affine/shared',
@@ -754,6 +756,7 @@ export const PackageList = [
'blocksuite/affine/blocks/paragraph',
'blocksuite/affine/blocks/surface',
'blocksuite/affine/components',
+ 'blocksuite/affine/ext-loader',
'blocksuite/affine/model',
'blocksuite/affine/shared',
'blocksuite/framework/global',
diff --git a/yarn.lock b/yarn.lock
index 40899ebcf9..525a638a6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2875,6 +2875,7 @@ __metadata:
"@blocksuite/affine-block-frame": "workspace:*"
"@blocksuite/affine-block-surface": "workspace:*"
"@blocksuite/affine-components": "workspace:*"
+ "@blocksuite/affine-ext-loader": "workspace:*"
"@blocksuite/affine-inline-reference": "workspace:*"
"@blocksuite/affine-model": "workspace:*"
"@blocksuite/affine-shared": "workspace:*"
@@ -3027,6 +3028,7 @@ __metadata:
"@blocksuite/affine-block-frame": "workspace:*"
"@blocksuite/affine-block-surface": "workspace:*"
"@blocksuite/affine-components": "workspace:*"
+ "@blocksuite/affine-ext-loader": "workspace:*"
"@blocksuite/affine-model": "workspace:*"
"@blocksuite/affine-rich-text": "workspace:*"
"@blocksuite/affine-shared": "workspace:*"
@@ -3598,6 +3600,7 @@ __metadata:
"@blocksuite/affine-block-paragraph": "workspace:*"
"@blocksuite/affine-block-surface": "workspace:*"
"@blocksuite/affine-components": "workspace:*"
+ "@blocksuite/affine-ext-loader": "workspace:*"
"@blocksuite/affine-model": "workspace:*"
"@blocksuite/affine-shared": "workspace:*"
"@blocksuite/global": "workspace:*"