fix(core): dependency cycle

toeverything · Jan 10, 2025 · adf1068 · adf1068
1 parent 2f49c06
commit adf1068
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/packages/frontend/core/src/modules/db/index.ts b/packages/frontend/core/src/modules/db/index.ts
@@ -7,7 +7,6 @@ import { WorkspaceDBService } from './services/db';
 
 export type { DocCustomPropertyInfo, DocProperties } from './schema';
 export { WorkspaceDBService } from './services/db';
-export { transformWorkspaceDBLocalToCloud } from './services/db';
 
 export function configureWorkspaceDBModule(framework: Framework) {
   framework

diff --git a/packages/frontend/core/src/modules/db/services/db.ts b/packages/frontend/core/src/modules/db/services/db.ts
@@ -1,6 +1,5 @@
 import {
   createORMClient,
-  type DocStorage,
   ObjectPool,
   Service,
   YjsDBAdapter,
@@ -100,29 +99,3 @@ export class WorkspaceDBService extends Service {
     return docId.startsWith('db$') || docId.startsWith('userdata$');
   }
 }
-
-export async function transformWorkspaceDBLocalToCloud(
-  localWorkspaceId: string,
-  cloudWorkspaceId: string,
-  localDocStorage: DocStorage,
-  cloudDocStorage: DocStorage,
-  accountId: string
-) {
-  for (const tableName of Object.keys(AFFiNE_WORKSPACE_DB_SCHEMA)) {
-    const localDocName = `db$${localWorkspaceId}$${tableName}`;
-    const localDoc = await localDocStorage.doc.get(localDocName);
-    if (localDoc) {
-      const cloudDocName = `db$${cloudWorkspaceId}$${tableName}`;
-      await cloudDocStorage.doc.set(cloudDocName, localDoc);
-    }
-  }
-
-  for (const tableName of Object.keys(AFFiNE_WORKSPACE_USERDATA_DB_SCHEMA)) {
-    const localDocName = `userdata$__local__$${localWorkspaceId}$${tableName}`;
-    const localDoc = await localDocStorage.doc.get(localDocName);
-    if (localDoc) {
-      const cloudDocName = `userdata$${accountId}$${cloudWorkspaceId}$${tableName}`;
-      await cloudDocStorage.doc.set(cloudDocName, localDoc);
-    }
-  }
-}
diff --git a/packages/frontend/core/src/modules/db/utils.ts b/packages/frontend/core/src/modules/db/utils.ts
@@ -0,0 +1,32 @@
+import type { DocStorage } from '@toeverything/infra';
+
+import {
+  AFFiNE_WORKSPACE_DB_SCHEMA,
+  AFFiNE_WORKSPACE_USERDATA_DB_SCHEMA,
+} from './schema';
+
+export async function transformWorkspaceDBLocalToCloud(
+  localWorkspaceId: string,
+  cloudWorkspaceId: string,
+  localDocStorage: DocStorage,
+  cloudDocStorage: DocStorage,
+  accountId: string
+) {
+  for (const tableName of Object.keys(AFFiNE_WORKSPACE_DB_SCHEMA)) {
+    const localDocName = `db$${localWorkspaceId}$${tableName}`;
+    const localDoc = await localDocStorage.doc.get(localDocName);
+    if (localDoc) {
+      const cloudDocName = `db$${cloudWorkspaceId}$${tableName}`;
+      await cloudDocStorage.doc.set(cloudDocName, localDoc);
+    }
+  }
+
+  for (const tableName of Object.keys(AFFiNE_WORKSPACE_USERDATA_DB_SCHEMA)) {
+    const localDocName = `userdata$__local__$${localWorkspaceId}$${tableName}`;
+    const localDoc = await localDocStorage.doc.get(localDocName);
+    if (localDoc) {
+      const cloudDocName = `userdata$${accountId}$${cloudWorkspaceId}$${tableName}`;
+      await cloudDocStorage.doc.set(cloudDocName, localDoc);
+    }
+  }
+}
diff --git a/packages/frontend/core/src/modules/workspace/services/transform.ts b/packages/frontend/core/src/modules/workspace/services/transform.ts
@@ -2,7 +2,7 @@ import { assertEquals } from '@blocksuite/affine/global/utils';
 import { Service } from '@toeverything/infra';
 import { applyUpdate } from 'yjs';
 
-import { transformWorkspaceDBLocalToCloud } from '../../db';
+import { transformWorkspaceDBLocalToCloud } from '../../db/utils';
 import type { Workspace } from '../entities/workspace';
 import type { WorkspaceMetadata } from '../metadata';
 import type { WorkspaceDestroyService } from './destroy';