refactor(editor): job should not rely on doc collection

toeverything · Jan 2, 2025 · 0c73fe5 · 0c73fe5
1 parent 8c05c6e
commit 0c73fe5
Show file tree

Hide file tree

Showing 34 changed files with 552 additions and 324 deletions.
diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/html.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/html.ts
@@ -27,7 +27,7 @@ export const embedSyncedDocBlockHtmlAdapterMatcher: BlockHtmlAdapterMatcher = {
 
       if (type === 'content') {
         const syncedDocId = o.node.props.pageId as string;
-        const syncedDoc = job.collection.getDoc(syncedDocId);
+        const syncedDoc = job.docCRUD.get(syncedDocId);
         walkerContext.setGlobalContext('hast:html-root-doc', false);
         if (!syncedDoc) return;
 

diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/markdown.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/markdown.ts
@@ -29,7 +29,7 @@ export const embedSyncedDocBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatc
 
         if (type === 'content') {
           const syncedDocId = o.node.props.pageId as string;
-          const syncedDoc = job.collection.getDoc(syncedDocId);
+          const syncedDoc = job.docCRUD.get(syncedDocId);
           if (!syncedDoc) return;
 
           if (counter === 1) {

diff --git a/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/plain-text.ts b/blocksuite/affine/block-embed/src/embed-synced-doc-block/adapters/plain-text.ts
@@ -31,7 +31,7 @@ export const embedSyncedDocBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMa
 
         if (type === 'content') {
           const syncedDocId = o.node.props.pageId as string;
-          const syncedDoc = job.collection.getDoc(syncedDocId);
+          const syncedDoc = job.docCRUD.get(syncedDocId);
           if (!syncedDoc) return;
 
           if (counter === 1) {

diff --git a/blocksuite/affine/shared/src/services/drag-handle-config.ts b/blocksuite/affine/shared/src/services/drag-handle-config.ts
@@ -4,7 +4,7 @@ import {
   StdIdentifier,
 } from '@blocksuite/block-std';
 import { type Container, createIdentifier } from '@blocksuite/global/di';
-import { Job, Slice, type SliceSnapshot } from '@blocksuite/store';
+import { Slice, type SliceSnapshot } from '@blocksuite/store';
 
 export const DndApiExtensionIdentifier = createIdentifier<DNDAPIExtension>(
   'AffineDndApiIdentifier'
@@ -40,7 +40,7 @@ export class DNDAPIExtension extends Extension {
     const { docId, flavour = 'affine:embed-linked-doc', blockId } = options;
 
     const slice = Slice.fromModels(this.std.doc, []);
-    const job = new Job({ collection: this.std.collection });
+    const job = this.std.getJob();
     const snapshot = job.sliceToSnapshot(slice);
     if (!snapshot) {
       console.error('Failed to convert slice to snapshot');

diff --git a/blocksuite/affine/widget-drag-handle/src/middleware/new-id-cross-doc.ts b/blocksuite/affine/widget-drag-handle/src/middleware/new-id-cross-doc.ts
@@ -3,14 +3,14 @@ import type { JobMiddleware } from '@blocksuite/store';
 
 export const newIdCrossDoc =
   (std: BlockStdScope): JobMiddleware =>
-  ({ slots, collection }) => {
+  ({ slots }) => {
     let samePage = false;
     slots.beforeImport.on(payload => {
       if (payload.type === 'slice') {
         samePage = payload.snapshot.pageId === std.doc.id;
       }
       if (payload.type === 'block' && !samePage) {
-        payload.snapshot.id = collection.idGenerator();
+        payload.snapshot.id = std.collection.idGenerator();
       }
     });
   };
diff --git a/blocksuite/affine/widget-drag-handle/src/middleware/surface-ref-to-embed.ts b/blocksuite/affine/widget-drag-handle/src/middleware/surface-ref-to-embed.ts
@@ -3,7 +3,7 @@ import type { JobMiddleware } from '@blocksuite/store';
 
 export const surfaceRefToEmbed =
   (std: BlockStdScope): JobMiddleware =>
-  ({ slots, collection }) => {
+  ({ slots }) => {
     let pageId: string | null = null;
     slots.beforeImport.on(payload => {
       if (payload.type === 'slice') {
@@ -18,7 +18,7 @@ export const surfaceRefToEmbed =
         !std.doc.hasBlock(payload.snapshot.id)
       ) {
         const id = payload.snapshot.id;
-        payload.snapshot.id = collection.idGenerator();
+        payload.snapshot.id = std.collection.idGenerator();
         payload.snapshot.flavour = 'affine:embed-linked-doc';
         payload.snapshot.props = {
           blockId: id,

diff --git a/blocksuite/affine/widget-drag-handle/src/watchers/drag-event-watcher.ts b/blocksuite/affine/widget-drag-handle/src/watchers/drag-event-watcher.ts
@@ -30,7 +30,7 @@ import {
 } from '@blocksuite/block-std';
 import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
 import { Bound, Point } from '@blocksuite/global/utils';
-import { Job, Slice, type SliceSnapshot } from '@blocksuite/store';
+import { Slice, type SliceSnapshot } from '@blocksuite/store';
 
 import { DropIndicator } from '../components/drop-indicator.js';
 import { AFFINE_DRAG_HANDLE_WIDGET } from '../consts.js';
@@ -544,14 +544,11 @@ export class DragEventWatcher {
 
   private _getJob() {
     const std = this._std;
-    return new Job({
-      collection: std.collection,
-      middlewares: [
-        newIdCrossDoc(std),
-        reorderList(std),
-        surfaceRefToEmbed(std),
-      ],
-    });
+    return std.getJob([
+      newIdCrossDoc(std),
+      reorderList(std),
+      surfaceRefToEmbed(std),
+    ]);
   }
 
   private _serializeData(slice: Slice, state: DndEventState) {

diff --git a/blocksuite/blocks/src/__tests__/utils/create-job.ts b/blocksuite/blocks/src/__tests__/utils/create-job.ts
@@ -27,5 +27,14 @@ export function createJob(middlewares?: JobMiddleware[]) {
   const schema = new Schema().register(AffineSchemas);
   const docCollection = new DocCollection({ schema });
   docCollection.meta.initialize();
-  return new Job({ collection: docCollection, middlewares: testMiddlewares });
+  return new Job({
+    schema,
+    blobCRUD: docCollection.blobSync,
+    middlewares: testMiddlewares,
+    docCRUD: {
+      create: (id: string) => docCollection.createDoc({ id }),
+      get: (id: string) => docCollection.getDoc(id),
+      delete: (id: string) => docCollection.removeDoc(id),
+    },
+  });
 }
diff --git a/blocksuite/blocks/src/_common/transformers/html.ts b/blocksuite/blocks/src/_common/transformers/html.ts
@@ -45,8 +45,17 @@ const provider = container.provider();
  */
 async function exportDoc(doc: Doc) {
   const job = new Job({
-    collection: doc.collection,
-    middlewares: [docLinkBaseURLMiddleware, titleMiddleware],
+    schema: doc.schema,
+    blobCRUD: doc.blobSync,
+    docCRUD: {
+      create: (id: string) => doc.collection.createDoc({ id }),
+      get: (id: string) => doc.collection.getDoc(id),
+      delete: (id: string) => doc.collection.removeDoc(id),
+    },
+    middlewares: [
+      docLinkBaseURLMiddleware(doc.collection.id),
+      titleMiddleware(doc.collection.meta.docMetas),
+    ],
   });
   const snapshot = job.docToSnapshot(doc);
   const adapter = new HtmlAdapter(job, provider);
@@ -91,11 +100,17 @@ async function importHTMLToDoc({
   fileName,
 }: ImportHTMLToDocOptions) {
   const job = new Job({
-    collection,
+    schema: collection.schema,
+    blobCRUD: collection.blobSync,
+    docCRUD: {
+      create: (id: string) => collection.createDoc({ id }),
+      get: (id: string) => collection.getDoc(id),
+      delete: (id: string) => collection.removeDoc(id),
+    },
     middlewares: [
       defaultImageProxyMiddleware,
       fileNameMiddleware(fileName),
-      docLinkBaseURLMiddleware,
+      docLinkBaseURLMiddleware(collection.id),
     ],
   });
   const htmlAdapter = new HtmlAdapter(job, provider);
@@ -147,11 +162,17 @@ async function importHTMLZip({ collection, imported }: ImportHTMLZipOptions) {
     htmlBlobs.map(async ([fileName, blob]) => {
       const fileNameWithoutExt = fileName.replace(/\.[^/.]+$/, '');
       const job = new Job({
-        collection,
+        schema: collection.schema,
+        blobCRUD: collection.blobSync,
+        docCRUD: {
+          create: (id: string) => collection.createDoc({ id }),
+          get: (id: string) => collection.getDoc(id),
+          delete: (id: string) => collection.removeDoc(id),
+        },
         middlewares: [
           defaultImageProxyMiddleware,
           fileNameMiddleware(fileNameWithoutExt),
-          docLinkBaseURLMiddleware,
+          docLinkBaseURLMiddleware(collection.id),
         ],
       });
       const assets = job.assets;

diff --git a/blocksuite/blocks/src/_common/transformers/markdown.ts b/blocksuite/blocks/src/_common/transformers/markdown.ts
@@ -51,8 +51,17 @@ type ImportMarkdownZipOptions = {
  */
 async function exportDoc(doc: Doc) {
   const job = new Job({
-    collection: doc.collection,
-    middlewares: [docLinkBaseURLMiddleware, titleMiddleware],
+    schema: doc.schema,
+    blobCRUD: doc.blobSync,
+    docCRUD: {
+      create: (id: string) => doc.collection.createDoc({ id }),
+      get: (id: string) => doc.collection.getDoc(id),
+      delete: (id: string) => doc.collection.removeDoc(id),
+    },
+    middlewares: [
+      docLinkBaseURLMiddleware(doc.collection.id),
+      titleMiddleware(doc.collection.meta.docMetas),
+    ],
   });
   const snapshot = job.docToSnapshot(doc);
 
@@ -101,8 +110,17 @@ async function importMarkdownToBlock({
   blockId,
 }: ImportMarkdownToBlockOptions) {
   const job = new Job({
-    collection: doc.collection,
-    middlewares: [defaultImageProxyMiddleware, docLinkBaseURLMiddleware],
+    schema: doc.schema,
+    blobCRUD: doc.blobSync,
+    docCRUD: {
+      create: (id: string) => doc.collection.createDoc({ id }),
+      get: (id: string) => doc.collection.getDoc(id),
+      delete: (id: string) => doc.collection.removeDoc(id),
+    },
+    middlewares: [
+      defaultImageProxyMiddleware,
+      docLinkBaseURLMiddleware(doc.collection.id),
+    ],
   });
   const adapter = new MarkdownAdapter(job, provider);
   const snapshot = await adapter.toSliceSnapshot({
@@ -137,11 +155,17 @@ async function importMarkdownToDoc({
   fileName,
 }: ImportMarkdownToDocOptions) {
   const job = new Job({
-    collection,
+    schema: collection.schema,
+    blobCRUD: collection.blobSync,
+    docCRUD: {
+      create: (id: string) => collection.createDoc({ id }),
+      get: (id: string) => collection.getDoc(id),
+      delete: (id: string) => collection.removeDoc(id),
+    },
     middlewares: [
       defaultImageProxyMiddleware,
       fileNameMiddleware(fileName),
-      docLinkBaseURLMiddleware,
+      docLinkBaseURLMiddleware(collection.id),
     ],
   });
   const mdAdapter = new MarkdownAdapter(job, provider);
@@ -195,11 +219,17 @@ async function importMarkdownZip({
     markdownBlobs.map(async ([fileName, blob]) => {
       const fileNameWithoutExt = fileName.replace(/\.[^/.]+$/, '');
       const job = new Job({
-        collection,
+        schema: collection.schema,
+        blobCRUD: collection.blobSync,
+        docCRUD: {
+          create: (id: string) => collection.createDoc({ id }),
+          get: (id: string) => collection.getDoc(id),
+          delete: (id: string) => collection.removeDoc(id),
+        },
         middlewares: [
           defaultImageProxyMiddleware,
           fileNameMiddleware(fileNameWithoutExt),
-          docLinkBaseURLMiddleware,
+          docLinkBaseURLMiddleware(collection.id),
         ],
       });
       const assets = job.assets;