refactor(core): move infra modules to core (#9207)

packages/common/infra/src/index.ts

@@ -4,44 +4,7 @@ export * from './blocksuite';
 export * from './framework';
 export * from './initialization';
 export * from './livedata';
-export * from './modules/db';
-export * from './modules/doc';
-export * from './modules/feature-flag';
-export * from './modules/global-context';
-export * from './modules/lifecycle';
-export * from './modules/storage';
-export * from './modules/workspace';
 export * from './orm';
 export * from './storage';
 export * from './sync';
 export * from './utils';
-
-import type { Framework } from './framework';
-import { configureWorkspaceDBModule } from './modules/db';
-import { configureDocModule } from './modules/doc';
-import { configureFeatureFlagModule } from './modules/feature-flag';
-import { configureGlobalContextModule } from './modules/global-context';
-import { configureLifecycleModule } from './modules/lifecycle';
-import {
-  configureGlobalStorageModule,
-  configureTestingGlobalStorage,
-} from './modules/storage';
-import {
-  configureTestingWorkspaceProvider,
-  configureWorkspaceModule,
-} from './modules/workspace';
-
-export function configureInfraModules(framework: Framework) {
-  configureWorkspaceModule(framework);
-  configureDocModule(framework);
-  configureWorkspaceDBModule(framework);
-  configureGlobalStorageModule(framework);
-  configureGlobalContextModule(framework);
-  configureLifecycleModule(framework);
-  configureFeatureFlagModule(framework);
-}
-
-export function configureTestingInfraModules(framework: Framework) {
-  configureTestingGlobalStorage(framework);
-  configureTestingWorkspaceProvider(framework);
-}

packages/common/infra/src/modules/db/entities/table.ts

@@ -1,35 +0,0 @@
-import { Entity } from '../../../framework';
-import type { Table as OrmTable, TableSchemaBuilder } from '../../../orm';
-import type { WorkspaceService } from '../../workspace';
-
-export class WorkspaceDBTable<
-  Schema extends TableSchemaBuilder,
-> extends Entity<{
-  table: OrmTable<Schema>;
-  storageDocId: string;
-}> {
-  readonly table = this.props.table;
-
-  constructor(private readonly workspaceService: WorkspaceService) {
-    super();
-  }
-
-  isSyncing$ = this.workspaceService.workspace.engine.doc
-    .docState$(this.props.storageDocId)
-    .map(docState => docState.syncing);
-
-  isLoading$ = this.workspaceService.workspace.engine.doc
-    .docState$(this.props.storageDocId)
-    .map(docState => docState.loading);
-
-  create = this.table.create.bind(this.table);
-  update = this.table.update.bind(this.table);
-  get = this.table.get.bind(this.table);
-  // eslint-disable-next-line rxjs/finnish
-  get$ = this.table.get$.bind(this.table);
-  find = this.table.find.bind(this.table);
-  // eslint-disable-next-line rxjs/finnish
-  find$ = this.table.find$.bind(this.table);
-  keys = this.table.keys.bind(this.table);
-  delete = this.table.delete.bind(this.table);
-}

packages/common/infra/src/modules/storage/index.ts

@@ -1,35 +0,0 @@
-export {
-  GlobalCache,
-  GlobalSessionState,
-  GlobalState,
-} from './providers/global';
-export {
-  GlobalCacheService,
-  GlobalSessionStateService,
-  GlobalStateService,
-} from './services/global';
-
-import type { Framework } from '../../framework';
-import { MemoryMemento } from '../../storage';
-import {
-  GlobalCache,
-  GlobalSessionState,
-  GlobalState,
-} from './providers/global';
-import {
-  GlobalCacheService,
-  GlobalSessionStateService,
-  GlobalStateService,
-} from './services/global';
-
-export const configureGlobalStorageModule = (framework: Framework) => {
-  framework.service(GlobalStateService, [GlobalState]);
-  framework.service(GlobalCacheService, [GlobalCache]);
-  framework.service(GlobalSessionStateService, [GlobalSessionState]);
-};
-
-export const configureTestingGlobalStorage = (framework: Framework) => {
-  framework.impl(GlobalCache, MemoryMemento);
-  framework.impl(GlobalState, MemoryMemento);
-  framework.impl(GlobalSessionState, MemoryMemento);
-};

packages/common/infra/src/modules/workspace/__tests__/workspace.spec.ts

@@ -1,31 +0,0 @@
-import { describe, expect, test } from 'vitest';
-
-import { Framework } from '../../../framework';
-import { configureTestingGlobalStorage } from '../../storage';
-import {
-  configureTestingWorkspaceProvider,
-  configureWorkspaceModule,
-  Workspace,
-  WorkspacesService,
-} from '..';
-
-describe('Workspace System', () => {
-  test('create workspace', async () => {
-    const framework = new Framework();
-    configureTestingGlobalStorage(framework);
-    configureWorkspaceModule(framework);
-    configureTestingWorkspaceProvider(framework);
-
-    const provider = framework.provider();
-    const workspaceService = provider.get(WorkspacesService);
-    expect(workspaceService.list.workspaces$.value.length).toBe(0);
-
-    const workspace = workspaceService.open({
-      metadata: await workspaceService.create('local'),
-    });
-
-    expect(workspace.workspace).toBeInstanceOf(Workspace);
-
-    expect(workspaceService.list.workspaces$.value.length).toBe(1);
-  });
-});

packages/common/infra/src/modules/workspace/testing/testing-provider.ts

@@ -1,145 +0,0 @@
-import { DocCollection, nanoid } from '@blocksuite/affine/store';
-import { map } from 'rxjs';
-import { applyUpdate, encodeStateAsUpdate } from 'yjs';
-
-import { Service } from '../../../framework';
-import { LiveData } from '../../../livedata';
-import { wrapMemento } from '../../../storage';
-import {
-  type BlobStorage,
-  type DocStorage,
-  MemoryDocStorage,
-} from '../../../sync';
-import { MemoryBlobStorage } from '../../../sync/blob/blob';
-import type { GlobalState } from '../../storage';
-import type { WorkspaceProfileInfo } from '../entities/profile';
-import { getAFFiNEWorkspaceSchema } from '../global-schema';
-import type { WorkspaceMetadata } from '../metadata';
-import type {
-  WorkspaceEngineProvider,
-  WorkspaceFlavourProvider,
-  WorkspaceFlavoursProvider,
-} from '../providers/flavour';
-
-class TestingWorkspaceLocalProvider implements WorkspaceFlavourProvider {
-  flavour = 'local';
-
-  store = wrapMemento(this.globalStore, 'testing/');
-  workspaceListStore = wrapMemento(this.store, 'workspaces/');
-  docStorage = new MemoryDocStorage(wrapMemento(this.store, 'docs/'));
-
-  constructor(private readonly globalStore: GlobalState) {}
-
-  async deleteWorkspace(id: string): Promise<void> {
-    const list = this.workspaceListStore.get<WorkspaceMetadata[]>('list') ?? [];
-    const newList = list.filter(meta => meta.id !== id);
-    this.workspaceListStore.set('list', newList);
-  }
-  async createWorkspace(
-    initial: (
-      docCollection: DocCollection,
-      blobStorage: BlobStorage,
-      docStorage: DocStorage
-    ) => Promise<void>
-  ): Promise<WorkspaceMetadata> {
-    const id = nanoid();
-    const meta = { id, flavour: 'local' };
-
-    const blobStorage = new MemoryBlobStorage(
-      wrapMemento(this.store, id + '/blobs/')
-    );
-
-    const docCollection = new DocCollection({
-      id: id,
-      idGenerator: () => nanoid(),
-      schema: getAFFiNEWorkspaceSchema(),
-      blobSources: {
-        main: blobStorage,
-      },
-    });
-
-    // apply initial state
-    await initial(docCollection, blobStorage, this.docStorage);
-
-    // save workspace to storage
-    await this.docStorage.doc.set(id, encodeStateAsUpdate(docCollection.doc));
-    for (const subdocs of docCollection.doc.getSubdocs()) {
-      await this.docStorage.doc.set(subdocs.guid, encodeStateAsUpdate(subdocs));
-    }
-
-    const list = this.workspaceListStore.get<WorkspaceMetadata[]>('list') ?? [];
-    this.workspaceListStore.set('list', [...list, meta]);
-
-    docCollection.dispose();
-
-    return { id, flavour: 'local' };
-  }
-  workspaces$ = LiveData.from<WorkspaceMetadata[]>(
-    this.workspaceListStore
-      .watch<WorkspaceMetadata[]>('list')
-      .pipe(map(m => m ?? [])),
-    []
-  );
-  async getWorkspaceProfile(
-    id: string
-  ): Promise<WorkspaceProfileInfo | undefined> {
-    const data = await this.docStorage.doc.get(id);
-
-    if (!data) {
-      return;
-    }
-
-    const bs = new DocCollection({
-      id,
-      schema: getAFFiNEWorkspaceSchema(),
-    });
-
-    applyUpdate(bs.doc, data);
-
-    bs.dispose();
-
-    return {
-      name: bs.meta.name,
-      avatar: bs.meta.avatar,
-      isOwner: true,
-    };
-  }
-  getWorkspaceBlob(id: string, blob: string): Promise<Blob | null> {
-    return new MemoryBlobStorage(wrapMemento(this.store, id + '/blobs/')).get(
-      blob
-    );
-  }
-  getEngineProvider(workspaceId: string): WorkspaceEngineProvider {
-    return {
-      getDocStorage: () => {
-        return this.docStorage;
-      },
-      getAwarenessConnections() {
-        return [];
-      },
-      getDocServer() {
-        return null;
-      },
-      getLocalBlobStorage: () => {
-        return new MemoryBlobStorage(
-          wrapMemento(this.store, workspaceId + '/blobs/')
-        );
-      },
-      getRemoteBlobStorages() {
-        return [];
-      },
-    };
-  }
-}
-
-export class TestingWorkspaceFlavoursProvider
-  extends Service
-  implements WorkspaceFlavoursProvider
-{
-  constructor(private readonly globalStore: GlobalState) {
-    super();
-  }
-  workspaceFlavours$ = new LiveData<WorkspaceFlavourProvider[]>([
-    new TestingWorkspaceLocalProvider(this.globalStore),
-  ]);
-}

packages/frontend/apps/android/src/app.tsx

@@ -4,6 +4,7 @@ import { configureMobileModules } from '@affine/core/mobile/modules';
 import { router } from '@affine/core/mobile/router';
 import { configureCommonModules } from '@affine/core/modules';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { configureIndexedDBUserspaceStorageProvider } from '@affine/core/modules/userspace';
 import { configureBrowserWorkbenchModule } from '@affine/core/modules/workbench';
@@ -11,12 +12,7 @@ import {
   configureBrowserWorkspaceFlavours,
   configureIndexedDBWorkspaceEngineStorageProvider,
 } from '@affine/core/modules/workspace-engine';
-import {
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  LifecycleService,
-} from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

packages/frontend/apps/electron/renderer/app.tsx

@@ -10,12 +10,15 @@ import {
   DesktopApiService,
 } from '@affine/core/modules/desktop-api';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import {
   configureSpellCheckSettingModule,
   EditorSettingService,
 } from '@affine/core/modules/editor-setting';
 import { configureFindInPageModule } from '@affine/core/modules/find-in-page';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
 import {
   ClientSchemeProvider,
@@ -26,6 +29,7 @@ import {
   configureDesktopWorkbenchModule,
   WorkbenchService,
 } from '@affine/core/modules/workbench';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import {
   configureBrowserWorkspaceFlavours,
   configureSqliteWorkspaceEngineStorageProvider,
@@ -33,15 +37,7 @@ import {
 import createEmotionCache from '@affine/core/utils/create-emotion-cache';
 import { apis, events } from '@affine/electron-api';
 import { CacheProvider } from '@emotion/react';
-import {
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
-  DocsService,
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  GlobalContextService,
-  LifecycleService,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

packages/frontend/apps/electron/renderer/shell/app.tsx

@@ -9,13 +9,12 @@ import {
 } from '@affine/core/modules/app-tabs-header';
 import { configureDesktopApiModule } from '@affine/core/modules/desktop-api';
 import { configureI18nModule, I18nProvider } from '@affine/core/modules/i18n';
-import { configureElectronStateStorageImpls } from '@affine/core/modules/storage';
-import { configureAppThemeModule } from '@affine/core/modules/theme';
 import {
+  configureElectronStateStorageImpls,
   configureGlobalStorageModule,
-  Framework,
+} from '@affine/core/modules/storage';
-  FrameworkRoot,
+import { configureAppThemeModule } from '@affine/core/modules/theme';
-} from '@toeverything/infra';
+import { Framework, FrameworkRoot } from '@toeverything/infra';
 
 import * as styles from './app.css';
 

packages/frontend/apps/ios/src/app.tsx

@@ -13,7 +13,9 @@ import {
   ValidatorProvider,
   WebSocketAuthProvider,
 } from '@affine/core/modules/cloud';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { PopupWindowProvider } from '@affine/core/modules/url';
 import { ClientSchemeProvider } from '@affine/core/modules/url/providers/client-schema';
@@ -28,13 +30,7 @@ import { App as CapacitorApp } from '@capacitor/app';
 import { Browser } from '@capacitor/browser';
 import { Haptics } from '@capacitor/haptics';
 import { Keyboard, KeyboardStyle } from '@capacitor/keyboard';
-import {
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  GlobalContextService,
-  LifecycleService,
-} from '@toeverything/infra';
 import { useTheme } from 'next-themes';
 import { Suspense, useEffect } from 'react';
 import { RouterProvider } from 'react-router-dom';

packages/frontend/apps/mobile/src/app.tsx

@@ -5,6 +5,7 @@ import { HapticProvider } from '@affine/core/mobile/modules/haptics';
 import { router } from '@affine/core/mobile/router';
 import { configureCommonModules } from '@affine/core/modules';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { PopupWindowProvider } from '@affine/core/modules/url';
 import { configureIndexedDBUserspaceStorageProvider } from '@affine/core/modules/userspace';
@@ -13,12 +14,7 @@ import {
   configureBrowserWorkspaceFlavours,
   configureIndexedDBWorkspaceEngineStorageProvider,
 } from '@affine/core/modules/workspace-engine';
-import {
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  LifecycleService,
-} from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

packages/frontend/apps/web/src/app.tsx

@@ -3,6 +3,7 @@ import { AppContainer } from '@affine/core/desktop/components/app-container';
 import { router } from '@affine/core/desktop/router';
 import { configureCommonModules } from '@affine/core/modules';
 import { I18nProvider } from '@affine/core/modules/i18n';
+import { LifecycleService } from '@affine/core/modules/lifecycle';
 import { OpenInAppGuard } from '@affine/core/modules/open-in-app';
 import { configureLocalStorageStateStorageImpls } from '@affine/core/modules/storage';
 import { PopupWindowProvider } from '@affine/core/modules/url';
@@ -14,12 +15,7 @@ import {
 } from '@affine/core/modules/workspace-engine';
 import createEmotionCache from '@affine/core/utils/create-emotion-cache';
 import { CacheProvider } from '@emotion/react';
-import {
+import { Framework, FrameworkRoot, getCurrentStore } from '@toeverything/infra';
-  Framework,
-  FrameworkRoot,
-  getCurrentStore,
-  LifecycleService,
-} from '@toeverything/infra';
 import { Suspense } from 'react';
 import { RouterProvider } from 'react-router-dom';
 

packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/info-logger.tsx

@@ -1,8 +1,5 @@
-import {
+import { GlobalContextService } from '@affine/core/modules/global-context';
-  GlobalContextService,
+import { useLiveData, useServices } from '@toeverything/infra';
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
 import { useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 

packages/frontend/core/src/components/affine/ai-onboarding/index.tsx

@@ -1,4 +1,5 @@
-import { FeatureFlagService, useService } from '@toeverything/infra';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { useService } from '@toeverything/infra';
 import { Suspense, useCallback, useEffect, useState } from 'react';
 
 import { AIOnboardingEdgeless } from './edgeless.dialog';

packages/frontend/core/src/components/affine/awareness/index.tsx

@@ -1,4 +1,5 @@
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect } from 'react';
 
 import { AuthService } from '../../../modules/cloud';

packages/frontend/core/src/components/affine/empty/collections.tsx

@@ -1,9 +1,10 @@
 import { usePromptModal } from '@affine/component';
 import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
 import { CollectionService } from '@affine/core/modules/collection';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { ViewLayersIcon } from '@blocksuite/icons/rc';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 

packages/frontend/core/src/components/affine/empty/docs.tsx

@@ -1,8 +1,9 @@
 import { TagService } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { isNewTabTrigger } from '@affine/core/utils';
 import { useI18n } from '@affine/i18n';
 import { AllDocsIcon } from '@blocksuite/icons/rc';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { type MouseEvent, useCallback } from 'react';
 
 import { usePageHelper } from '../../blocksuite/block-suite-page-list/utils';

packages/frontend/core/src/components/affine/page-history-modal/data.ts

@@ -1,13 +1,14 @@
 import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
 import { useDocCollectionPage } from '@affine/core/components/hooks/use-block-suite-workspace-page';
 import { FetchService, GraphQLService } from '@affine/core/modules/cloud';
+import { getAFFiNEWorkspaceSchema } from '@affine/core/modules/workspace';
 import { DebugLogger } from '@affine/debug';
 import type { ListHistoryQuery } from '@affine/graphql';
 import { listHistoryQuery, recoverDocMutation } from '@affine/graphql';
 import { i18nTime } from '@affine/i18n';
 import { assertEquals } from '@blocksuite/affine/global/utils';
 import { DocCollection } from '@blocksuite/affine/store';
-import { getAFFiNEWorkspaceSchema, useService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useEffect, useMemo } from 'react';
 import useSWRImmutable from 'swr/immutable';
 import {
@@ -227,6 +228,7 @@ export function revertUpdate(
     snapshotStateVector
   );
   const undoManager = new UndoManager(
+    // oxlint-disable array-callback-return
     [...snapshotDoc.share.keys()].map(key => {
       const type = getMetadata(key);
       if (type === 'Text') {
@@ -236,7 +238,7 @@ export function revertUpdate(
       } else if (type === 'Array') {
         return snapshotDoc.getArray(key);
       }
-      // eslint-disable-next-line array-callback-return
+
       throw new Error('Unknown type');
     })
   );

packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx

@@ -7,6 +7,7 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { EditorService } from '@affine/core/modules/editor';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { WorkspaceQuotaService } from '@affine/core/modules/quota';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { i18nTime, Trans, useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import type { DocMode } from '@blocksuite/affine/blocks';
@@ -17,7 +18,7 @@ import type {
 import { CloseIcon, ToggleCollapseIcon } from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import type { DialogContentProps } from '@radix-ui/react-dialog';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { atom, useAtom } from 'jotai';
 import type { PropsWithChildren } from 'react';
 import {

packages/frontend/core/src/components/affine/quota-reached-modal/cloud-quota-modal.tsx

@@ -4,9 +4,10 @@ import { UserQuotaService } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { WorkspaceQuotaService } from '@affine/core/modules/quota';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { type I18nString, useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useAtom } from 'jotai';
 import { useCallback, useEffect, useMemo } from 'react';
 

packages/frontend/core/src/components/affine/quota-reached-modal/local-quota-modal.tsx

@@ -1,7 +1,8 @@
 import { ConfirmModal } from '@affine/component/ui/modal';
 import { openQuotaModalAtom } from '@affine/core/components/atoms';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useAtom } from 'jotai';
 import { useCallback, useEffect } from 'react';
 

packages/frontend/core/src/components/affine/reference-link/index.tsx

@@ -1,3 +1,4 @@
+import { DocsService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { JournalService } from '@affine/core/modules/journal';
 import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-view';
@@ -6,12 +7,7 @@ import { WorkbenchLink } from '@affine/core/modules/workbench';
 import { track } from '@affine/track';
 import type { DocMode } from '@blocksuite/affine/blocks';
 import type { DocCollection } from '@blocksuite/affine/store';
-import {
+import { LiveData, useLiveData, useService } from '@toeverything/infra';
-  DocsService,
-  LiveData,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import { nanoid } from 'nanoid';
 import {

packages/frontend/core/src/components/affine/share-page-modal/index.tsx

@@ -1,7 +1,7 @@
 import { useEnableCloud } from '@affine/core/components/hooks/affine/use-enable-cloud';
+import type { Workspace } from '@affine/core/modules/workspace';
 import { track } from '@affine/track';
 import type { Doc } from '@blocksuite/affine/store';
-import { type Workspace } from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import { ShareMenu } from './share-menu';

packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-menu.tsx

@@ -2,14 +2,11 @@ import { Tabs, Tooltip } from '@affine/component';
 import { Button } from '@affine/component/ui/button';
 import { Menu } from '@affine/component/ui/menu';
 import { ShareInfoService } from '@affine/core/modules/share-doc';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import type { Doc } from '@blocksuite/affine/store';
 import { LockIcon, PublishIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-} from '@toeverything/infra';
 import { forwardRef, type PropsWithChildren, type Ref, useEffect } from 'react';
 
 import * as styles from './index.css';

packages/frontend/core/src/components/blocksuite/block-suite-editor/bi-directional-link-panel.tsx

@@ -4,27 +4,29 @@ import {
   useLitPortalFactory,
 } from '@affine/component';
 import { TextRenderer } from '@affine/core/blocksuite/presets';
+import { DocService } from '@affine/core/modules/doc';
 import {
   type Backlink,
   DocLinksService,
   type Link,
 } from '@affine/core/modules/doc-link';
 import { toURLSearchParams } from '@affine/core/modules/navigation';
+import { GlobalSessionStateService } from '@affine/core/modules/storage';
 import { WorkbenchLink } from '@affine/core/modules/workbench';
+import {
+  getAFFiNEWorkspaceSchema,
+  WorkspaceService,
+} from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
 import type { JobMiddleware } from '@blocksuite/affine/store';
 import { ToggleExpandIcon } from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import {
-  DocService,
-  getAFFiNEWorkspaceSchema,
-  GlobalSessionStateService,
   LiveData,
   useFramework,
   useLiveData,
   useServices,
-  WorkspaceService,
 } from '@toeverything/infra';
 import React, {
   Fragment,

packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx

@@ -3,6 +3,8 @@ import {
   useConfirmModal,
   useLitPortalFactory,
 } from '@affine/component';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocService, DocsService } from '@affine/core/modules/doc';
 import type {
   DatabaseRow,
   DatabaseValueCell,
@@ -12,6 +14,7 @@ import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { JournalService } from '@affine/core/modules/journal';
 import { toURLSearchParams } from '@affine/core/modules/navigation';
 import { PeekViewService } from '@affine/core/modules/peek-view/services/peek-view';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import track from '@affine/track';
 import type { DocMode } from '@blocksuite/affine/blocks';
 import {
@@ -21,14 +24,10 @@ import {
 } from '@blocksuite/affine/presets';
 import type { Doc } from '@blocksuite/affine/store';
 import {
-  type DocCustomPropertyInfo,
-  DocService,
-  DocsService,
   useFramework,
   useLiveData,
   useService,
   useServices,
-  WorkspaceService,
 } from '@toeverything/infra';
 import React, {
   forwardRef,

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/root-block.ts

@@ -2,8 +2,10 @@ import {
   AIEdgelessRootBlockSpec,
   AIPageRootBlockSpec,
 } from '@affine/core/blocksuite/presets/ai';
+import { DocService, DocsService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { AppThemeService } from '@affine/core/modules/theme';
 import { mixpanel } from '@affine/track';
 import {
@@ -39,12 +41,7 @@ import {
 } from '@blocksuite/affine-shared/utils';
 import type { Container } from '@blocksuite/global/di';
 import { LinkedPageIcon, PageIcon } from '@blocksuite/icons/lit';
-import {
+import { type FrameworkProvider } from '@toeverything/infra';
-  DocService,
-  DocsService,
-  FeatureFlagService,
-  type FrameworkProvider,
-} from '@toeverything/infra';
 import type { TemplateResult } from 'lit';
 import type { Observable } from 'rxjs';
 import { combineLatest, map } from 'rxjs';

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx

@@ -8,6 +8,7 @@ import {
   type useConfirmModal,
 } from '@affine/component';
 import { WorkspaceServerService } from '@affine/core/modules/cloud';
+import { type DocService, DocsService } from '@affine/core/modules/doc';
 import type { EditorService } from '@affine/core/modules/editor';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { resolveLinkToDoc } from '@affine/core/modules/navigation';
@@ -22,6 +23,7 @@ import {
 import { ExternalLinksQuickSearchSession } from '@affine/core/modules/quicksearch/impls/external-links';
 import { JournalsQuickSearchSession } from '@affine/core/modules/quicksearch/impls/journals';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { isNewTabTrigger } from '@affine/core/utils';
 import { DebugLogger } from '@affine/debug';
 import { track } from '@affine/track';
@@ -62,10 +64,7 @@ import type { ReferenceParams } from '@blocksuite/affine-model';
 import {
   AIChatBlockSchema,
   type DocProps,
-  type DocService,
-  DocsService,
   type FrameworkProvider,
-  WorkspaceService,
 } from '@toeverything/infra';
 import { type TemplateResult } from 'lit';
 import { customElement } from 'lit/decorators.js';

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/edgeless.ts

@@ -1,3 +1,4 @@
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { builtInTemplates as builtInEdgelessTemplates } from '@affine/templates/edgeless';
 import { builtInTemplates as builtInStickersTemplates } from '@affine/templates/stickers';
 import type { ExtensionType } from '@blocksuite/affine/block-std';
@@ -10,10 +11,7 @@ import {
   EdgelessTextBlockSpec,
   FrameBlockSpec,
 } from '@blocksuite/affine/blocks';
-import {
+import { type FrameworkProvider } from '@toeverything/infra';
-  FeatureFlagService,
-  type FrameworkProvider,
-} from '@toeverything/infra';
 
 import { AIBlockSpecs, DefaultBlockSpecs } from './common';
 import { createEdgelessRootBlockSpec } from './custom/root-block';

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/page.ts

@@ -1,13 +1,11 @@
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import type { ExtensionType } from '@blocksuite/affine/block-std';
 import {
   NoteBlockSpec,
   PageSurfaceBlockSpec,
   PageSurfaceRefBlockSpec,
 } from '@blocksuite/affine/blocks';
-import {
+import { type FrameworkProvider } from '@toeverything/infra';
-  FeatureFlagService,
-  type FrameworkProvider,
-} from '@toeverything/infra';
 
 import { AIBlockSpecs, DefaultBlockSpecs } from './common';
 import { createPageRootBlockSpec } from './custom/root-block';

packages/frontend/core/src/components/blocksuite/block-suite-header/menu/history-tips-modal/index.tsx

@@ -1,7 +1,8 @@
 import { OverlayModal } from '@affine/component';
 import { useEnableCloud } from '@affine/core/components/hooks/affine/use-enable-cloud';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import TopSvg from './top-svg';

packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx

@@ -19,6 +19,7 @@ import { EditorService } from '@affine/core/modules/editor';
 import { OpenInAppService } from '@affine/core/modules/open-in-app/services';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import type { Doc } from '@blocksuite/affine/store';
@@ -42,7 +43,6 @@ import {
   useLiveData,
   useService,
   useServiceOptional,
-  WorkspaceService,
 } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 

packages/frontend/core/src/components/blocksuite/block-suite-header/title/index.tsx

@@ -1,13 +1,10 @@
 import type { InlineEditProps } from '@affine/component';
 import { InlineEdit } from '@affine/component';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
+import { DocsService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { track } from '@affine/track';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  DocsService,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import type { HTMLAttributes } from 'react';
 

packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx

@@ -1,10 +1,11 @@
 import { toast } from '@affine/component';
 import { AppSidebarService } from '@affine/core/modules/app-sidebar';
+import { DocsService } from '@affine/core/modules/doc';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { type DocMode } from '@blocksuite/affine/blocks';
 import type { DocCollection } from '@blocksuite/affine/store';
-import { type DocProps, DocsService, useServices } from '@toeverything/infra';
+import { type DocProps, useServices } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 export const usePageHelper = (docCollection: DocCollection) => {

packages/frontend/core/src/components/doc-properties/icons/doc-property-icon.tsx

@@ -1,5 +1,5 @@
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
 import * as icons from '@blocksuite/icons/rc';
-import type { DocCustomPropertyInfo } from '@toeverything/infra';
 import type { SVGProps } from 'react';
 
 import {

packages/frontend/core/src/components/doc-properties/icons/icons-selector.tsx

@@ -1,6 +1,6 @@
 import { Menu, Scrollable } from '@affine/component';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
 import { useI18n } from '@affine/i18n';
-import type { DocCustomPropertyInfo } from '@toeverything/infra';
 import { chunk } from 'lodash-es';
 
 import { type DocPropertyIconName, DocPropertyIconNames } from './constant';

packages/frontend/core/src/components/doc-properties/manager/index.tsx

@@ -6,16 +6,13 @@ import {
   useDraggable,
   useDropTarget,
 } from '@affine/component';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocsService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { AffineDNDData } from '@affine/core/types/dnd';
 import { useI18n } from '@affine/i18n';
 import { MoreHorizontalIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  type DocCustomPropertyInfo,
-  DocsService,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import { type HTMLProps, useCallback, useState } from 'react';
 

packages/frontend/core/src/components/doc-properties/menu/create-doc-property.tsx

@@ -1,12 +1,9 @@
 import { MenuItem, MenuSeparator } from '@affine/component';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocsService } from '@affine/core/modules/doc';
 import { generateUniqueNameInSequence } from '@affine/core/utils/unique-name';
 import { useI18n } from '@affine/i18n';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  type DocCustomPropertyInfo,
-  DocsService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import {

packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.tsx

@@ -4,9 +4,10 @@ import {
   MenuSeparator,
   useConfirmModal,
 } from '@affine/component';
+import { DocsService } from '@affine/core/modules/doc';
 import { Trans, useI18n } from '@affine/i18n';
 import { DeleteIcon, InvisibleIcon, ViewIcon } from '@blocksuite/icons/rc';
-import { DocsService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import {
   type KeyboardEventHandler,
   type MouseEvent,

packages/frontend/core/src/components/doc-properties/sidebar/index.tsx

@@ -1,4 +1,5 @@
 import { Divider, IconButton, Tooltip } from '@affine/component';
+import { DocsService } from '@affine/core/modules/doc';
 import { generateUniqueNameInSequence } from '@affine/core/utils/unique-name';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
@@ -7,7 +8,7 @@ import {
   Content as CollapsibleContent,
   Root as CollapsibleRoot,
 } from '@radix-ui/react-collapsible';
-import { DocsService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import { DocPropertyManager } from '../manager';

packages/frontend/core/src/components/doc-properties/table.tsx

@@ -8,22 +8,20 @@ import {
   useDraggable,
   useDropTarget,
 } from '@affine/component';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocService, DocsService } from '@affine/core/modules/doc';
 import { DocDatabaseBacklinkInfo } from '@affine/core/modules/doc-info';
 import type {
   DatabaseRow,
   DatabaseValueCell,
 } from '@affine/core/modules/doc-info/types';
-import { WorkbenchService } from '@affine/core/modules/workbench';
+import { ViewService, WorkbenchService } from '@affine/core/modules/workbench';
-import { ViewService } from '@affine/core/modules/workbench/services/view';
 import type { AffineDNDData } from '@affine/core/types/dnd';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import { PlusIcon, PropertyIcon, ToggleExpandIcon } from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
 import {
-  type DocCustomPropertyInfo,
-  DocService,
-  DocsService,
   useLiveData,
   useService,
   useServiceOptional,

packages/frontend/core/src/components/doc-properties/tags-inline-editor.tsx

@@ -1,12 +1,8 @@
 import { TagService, useDeleteTagConfirmModal } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { TagsIcon } from '@blocksuite/icons/rc';
-import {
+import { LiveData, useLiveData, useService } from '@toeverything/infra';
-  LiveData,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 import { useAsyncCallback } from '../hooks/affine-async-hooks';

packages/frontend/core/src/components/doc-properties/types/created-updated-by.tsx

@@ -1,7 +1,8 @@
 import { Avatar, PropertyValue } from '@affine/component';
 import { CloudDocMetaService } from '@affine/core/modules/cloud/services/cloud-doc-meta';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect, useMemo } from 'react';
 
 import { userWrapper } from './created-updated-by.css';

packages/frontend/core/src/components/doc-properties/types/date.tsx

@@ -1,6 +1,7 @@
 import { DatePicker, Menu, PropertyValue, Tooltip } from '@affine/component';
+import { DocService } from '@affine/core/modules/doc';
 import { i18nTime, useI18n } from '@affine/i18n';
-import { DocService, useLiveData, useServices } from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 
 import * as styles from './date.css';
 import type { PropertyValueProps } from './types';

packages/frontend/core/src/components/doc-properties/types/doc-primary-mode.tsx

@@ -4,9 +4,10 @@ import {
   RadioGroup,
   type RadioItem,
 } from '@affine/component';
+import { DocService } from '@affine/core/modules/doc';
 import { useI18n } from '@affine/i18n';
 import type { DocMode } from '@blocksuite/affine/blocks';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 import * as styles from './doc-primary-mode.css';

packages/frontend/core/src/components/doc-properties/types/edgeless-theme.tsx

@@ -1,6 +1,7 @@
 import { PropertyValue, RadioGroup, type RadioItem } from '@affine/component';
+import { DocService } from '@affine/core/modules/doc';
 import { useI18n } from '@affine/i18n';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 import * as styles from './edgeless-theme.css';

packages/frontend/core/src/components/doc-properties/types/journal.tsx

@@ -1,11 +1,11 @@
 import { Checkbox, DatePicker, Menu, PropertyValue } from '@affine/component';
 import { MobileJournalConflictList } from '@affine/core/mobile/pages/workspace/detail/menu/journal-conflicts';
+import { DocService } from '@affine/core/modules/doc';
 import { JournalService } from '@affine/core/modules/journal';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
 import { i18nTime, useI18n } from '@affine/i18n';
 import {
-  DocService,
   useLiveData,
   useService,
   useServiceOptional,

packages/frontend/core/src/components/doc-properties/types/page-width.tsx

@@ -1,7 +1,8 @@
 import { PropertyValue, RadioGroup, type RadioItem } from '@affine/component';
+import { DocService } from '@affine/core/modules/doc';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { useI18n } from '@affine/i18n';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 import { container } from './page-width.css';

packages/frontend/core/src/components/doc-properties/types/tags.tsx

@@ -1,7 +1,8 @@
 import { PropertyValue } from '@affine/component';
+import { DocService } from '@affine/core/modules/doc';
 import { TagService } from '@affine/core/modules/tag';
 import { useI18n } from '@affine/i18n';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 
 import { TagsInlineEditor } from '../tags-inline-editor';
 import * as styles from './tags.css';

packages/frontend/core/src/components/doc-properties/types/types.ts

@@ -1,4 +1,4 @@
-import type { DocCustomPropertyInfo } from '@toeverything/infra';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
 
 export interface PropertyValueProps {
   propertyInfo?: DocCustomPropertyInfo;

packages/frontend/core/src/components/hooks/affine/use-all-page-list-config.tsx

@@ -3,10 +3,11 @@ import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-su
 import { FavoriteTag } from '@affine/core/components/page-list/components/favorite-tag';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
 import { ShareDocsListService } from '@affine/core/modules/share-doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { PublicPageMode } from '@affine/graphql';
 import { useI18n } from '@affine/i18n';
 import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { type ReactNode, useCallback, useEffect, useMemo } from 'react';
 
 export type AllPageListConfig = {

packages/frontend/core/src/components/hooks/affine/use-block-suite-meta-helper.ts

@@ -1,8 +1,10 @@
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
 import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
 import { useDocCollectionHelper } from '@affine/core/components/hooks/use-block-suite-workspace-helper';
+import { DocsService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { DocMode } from '@blocksuite/affine/blocks';
-import { DocsService, useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';
 import { applyUpdate, encodeStateAsUpdate } from 'yjs';
 

packages/frontend/core/src/components/hooks/affine/use-enable-cloud.tsx

@@ -1,13 +1,10 @@
 import { notify, useConfirmModal } from '@affine/component';
 import { AuthService, ServersService } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import type { Workspace } from '@affine/core/modules/workspace';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import type { Workspace } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
-import {
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import { useNavigateHelper } from '../use-navigate-helper';

packages/frontend/core/src/components/hooks/affine/use-register-blocksuite-editor-commands.tsx

@@ -4,10 +4,12 @@ import {
   registerAffineCommand,
 } from '@affine/core/commands';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { DocService } from '@affine/core/modules/doc';
 import type { Editor } from '@affine/core/modules/editor';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
 import { OpenInAppService } from '@affine/core/modules/open-in-app';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import {
@@ -17,11 +19,9 @@ import {
   PageIcon,
 } from '@blocksuite/icons/rc';
 import {
-  DocService,
   useLiveData,
   useService,
   useServiceOptional,
-  WorkspaceService,
 } from '@toeverything/infra';
 import { useSetAtom } from 'jotai';
 import { useCallback, useEffect } from 'react';

packages/frontend/core/src/components/hooks/affine/use-register-copy-link-commands.tsx

@@ -4,8 +4,8 @@ import {
 } from '@affine/core/commands';
 import { useSharingUrl } from '@affine/core/components/hooks/affine/use-share-url';
 import { useIsActiveView } from '@affine/core/modules/workbench';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import { track } from '@affine/track';
-import { type WorkspaceMetadata } from '@toeverything/infra';
 import { useEffect } from 'react';
 
 export function useRegisterCopyLinkCommands({

packages/frontend/core/src/components/hooks/affine/use-sign-out.ts

@@ -4,13 +4,10 @@ import {
   useConfirmModal,
 } from '@affine/component';
 import { AuthService, ServerService } from '@affine/core/modules/cloud';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  GlobalContextService,
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import { useNavigateHelper } from '../use-navigate-helper';

packages/frontend/core/src/components/hooks/use-block-suite-page-meta.ts

@@ -1,5 +1,7 @@
+import { DocsService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { DocCollection, DocMeta } from '@blocksuite/affine/store';
-import { DocsService, useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 
 import { useAsyncCallback } from './affine-async-hooks';

packages/frontend/core/src/components/hooks/use-journal.ts

@@ -1,3 +1,4 @@
+import { DocsService } from '@affine/core/modules/doc';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import {
   JOURNAL_DATE_FORMAT,
@@ -6,7 +7,7 @@ import {
 } from '@affine/core/modules/journal';
 import { i18nTime } from '@affine/i18n';
 import { track } from '@affine/track';
-import { DocsService, useService, useServices } from '@toeverything/infra';
+import { useService, useServices } from '@toeverything/infra';
 import dayjs from 'dayjs';
 import { useCallback, useMemo } from 'react';
 

packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts

@@ -3,13 +3,10 @@ import { DesktopApiService } from '@affine/core/modules/desktop-api';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
 import { I18nService } from '@affine/core/modules/i18n';
 import { UrlService } from '@affine/core/modules/url';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import type { AffineEditorContainer } from '@blocksuite/affine/presets';
-import {
+import { useService, useServiceOptional } from '@toeverything/infra';
-  useService,
-  useServiceOptional,
-  WorkspaceService,
-} from '@toeverything/infra';
 import { useStore } from 'jotai';
 import { useTheme } from 'next-themes';
 import { useEffect } from 'react';

packages/frontend/core/src/components/hooks/use-workspace-info.ts

@@ -1,9 +1,8 @@
-import type { WorkspaceMetadata } from '@toeverything/infra';
 import {
-  useLiveData,
+  type WorkspaceMetadata,
-  useService,
   WorkspacesService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect } from 'react';
 
 export function useWorkspaceInfo(meta?: WorkspaceMetadata) {

packages/frontend/core/src/components/hooks/use-workspace.ts

@@ -1,5 +1,9 @@
-import type { Workspace, WorkspaceMetadata } from '@toeverything/infra';
+import {
-import { useService, WorkspacesService } from '@toeverything/infra';
+  type Workspace,
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
+import { useService } from '@toeverything/infra';
 import { useEffect, useState } from 'react';
 
 /**

packages/frontend/core/src/components/over-capacity/index.tsx

@@ -1,8 +1,9 @@
 import { notify } from '@affine/component';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { debounce } from 'lodash-es';
 import { useCallback, useEffect } from 'react';
 

packages/frontend/core/src/components/page-detail-editor.tsx

@@ -1,12 +1,13 @@
 import './page-detail-editor.css';
 
 import type { AffineEditorContainer } from '@blocksuite/affine/presets';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import clsx from 'clsx';
 import type { CSSProperties } from 'react';
 import { useMemo } from 'react';
 
+import { DocService } from '../modules/doc';
 import { EditorService } from '../modules/editor';
 import {
   EditorSettingService,
@@ -16,7 +17,7 @@ import { BlockSuiteEditor as Editor } from './blocksuite/block-suite-editor';
 import * as styles from './page-detail-editor.css';
 
 declare global {
-  // eslint-disable-next-line no-var
+  // oxlint-disable-next-line no-var
   var currentEditor: AffineEditorContainer | undefined;
 }
 

packages/frontend/core/src/components/page-list/collections/virtualized-collection-list.tsx

@@ -1,7 +1,8 @@
 import { useDeleteCollectionInfo } from '@affine/core/components/hooks/affine/use-delete-collection-info';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection, DeleteCollectionInfo } from '@affine/env/filter';
 import { Trans } from '@affine/i18n';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 import { CollectionService } from '../../../modules/collection';

packages/frontend/core/src/components/page-list/docs/page-list-header.tsx

@@ -8,9 +8,11 @@ import {
 } from '@affine/component';
 import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import type { DocRecord } from '@affine/core/modules/doc';
 import type { Tag } from '@affine/core/modules/tag';
 import { TagService } from '@affine/core/modules/tag';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { isNewTabTrigger } from '@affine/core/utils';
 import type { Collection } from '@affine/env/filter';
 import { useI18n } from '@affine/i18n';
@@ -21,13 +23,7 @@ import {
   SearchIcon,
   ViewLayersIcon,
 } from '@blocksuite/icons/rc';
-import type { DocRecord } from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
-import {
-  useLiveData,
-  useService,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import { useCallback, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';

packages/frontend/core/src/components/page-list/docs/select-page.tsx

@@ -2,15 +2,12 @@ import { IconButton, Menu, toast } from '@affine/component';
 import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
 import { ShareDocsListService } from '@affine/core/modules/share-doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { PublicPageMode } from '@affine/graphql';
 import { Trans, useI18n } from '@affine/i18n';
 import type { DocMeta } from '@blocksuite/affine/store';
 import { FilterIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useServices } from '@toeverything/infra';
-  useLiveData,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
 import { type ReactNode, useCallback, useEffect, useState } from 'react';
 
 import { AffineShapeIcon, FavoriteTag } from '..';

packages/frontend/core/src/components/page-list/docs/virtualized-page-list.tsx

@@ -1,11 +1,13 @@
 import { toast, useConfirmModal } from '@affine/component';
 import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';
 import { CollectionService } from '@affine/core/modules/collection';
+import { DocsService } from '@affine/core/modules/doc';
 import type { Tag } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection, Filter } from '@affine/env/filter';
 import { Trans, useI18n } from '@affine/i18n';
 import type { DocMeta } from '@blocksuite/affine/store';
-import { DocsService, useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 import { ListFloatingToolbar } from '../components/list-floating-toolbar';

packages/frontend/core/src/components/page-list/operation-cell.tsx

@@ -9,11 +9,14 @@ import {
 import { useBlockSuiteMetaHelper } from '@affine/core/components/hooks/affine/use-block-suite-meta-helper';
 import { useCatchEventCallback } from '@affine/core/components/hooks/use-catch-event-hook';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import {
   CompatibleFavoriteItemsAdapter,
   FavoriteService,
 } from '@affine/core/modules/favorite';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection, DeleteCollectionInfo } from '@affine/env/filter';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
@@ -32,14 +35,7 @@ import {
   ResetIcon,
   SplitViewIcon,
 } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService, useServices } from '@toeverything/infra';
-  DocsService,
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
 import type { MouseEvent } from 'react';
 import { useCallback, useState } from 'react';
 

packages/frontend/core/src/components/page-list/tags/virtualized-tag-list.tsx

@@ -1,6 +1,7 @@
 import type { Tag } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { Trans } from '@affine/i18n';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 import { ListFloatingToolbar } from '../components/list-floating-toolbar';

packages/frontend/core/src/components/page-list/use-all-doc-display-properties.ts

@@ -1,4 +1,5 @@
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { useService } from '@toeverything/infra';
 import { useAtom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
 import { useCallback } from 'react';

packages/frontend/core/src/components/page-list/view/collection-operations.tsx

@@ -3,6 +3,7 @@ import { Menu, MenuItem, usePromptModal } from '@affine/component';
 import { useDeleteCollectionInfo } from '@affine/core/components/hooks/affine/use-delete-collection-info';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import type { Collection } from '@affine/env/filter';
 import { useI18n } from '@affine/i18n';
@@ -14,12 +15,7 @@ import {
   PlusIcon,
   SplitViewIcon,
 } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService, useServices } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  useServices,
-} from '@toeverything/infra';
 import type { PropsWithChildren, ReactElement } from 'react';
 import { useCallback, useMemo } from 'react';
 

packages/frontend/core/src/components/page-list/virtualized-trash-list.tsx

@@ -1,9 +1,10 @@
 import { toast, useConfirmModal } from '@affine/component';
 import { useBlockSuiteMetaHelper } from '@affine/core/components/hooks/affine/use-block-suite-meta-helper';
 import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { Trans, useI18n } from '@affine/i18n';
 import type { DocMeta } from '@blocksuite/affine/store';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 import { ListFloatingToolbar } from './components/list-floating-toolbar';

packages/frontend/core/src/components/providers/workspace-side-effects.tsx

@@ -14,22 +14,22 @@ import {
   GraphQLService,
 } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { useRegisterNavigationCommands } from '@affine/core/modules/navigation/view/use-register-navigation-commands';
 import { QuickSearchContainer } from '@affine/core/modules/quicksearch';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
 import { type DocMode, ZipTransformer } from '@blocksuite/affine/blocks';
 import {
-  DocsService,
   effect,
   fromPromise,
   onStart,
   throwIfAborted,
   useService,
   useServices,
-  WorkspaceService,
 } from '@toeverything/infra';
 import { useSetAtom } from 'jotai';
 import { useEffect } from 'react';

packages/frontend/core/src/components/pure/help-island/index.tsx

@@ -1,15 +1,11 @@
 import { Tooltip } from '@affine/component/ui/tooltip';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
 import type { SettingTab } from '@affine/core/modules/dialogs/constant';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { UrlService } from '@affine/core/modules/url';
 import { useI18n } from '@affine/i18n';
 import { CloseIcon, NewIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService, useServices } from '@toeverything/infra';
-  GlobalContextService,
-  useLiveData,
-  useService,
-  useServices,
-} from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import { ContactIcon, HelpIcon, KeyboardIcon } from './icons';

packages/frontend/core/src/components/pure/trash-page-footer/index.tsx

@@ -1,8 +1,10 @@
 import { Button } from '@affine/component/ui/button';
 import { ConfirmModal } from '@affine/component/ui/modal';
+import { DocService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { DeleteIcon, ResetIcon } from '@blocksuite/icons/rc';
-import { DocService, useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import { useAppSettingHelper } from '../../../components/hooks/affine/use-app-setting-helper';

packages/frontend/core/src/components/root-app-sidebar/index.tsx

@@ -22,6 +22,7 @@ import {
 } from '@affine/core/modules/explorer';
 import { ExplorerTags } from '@affine/core/modules/explorer/views/sections/tags';
 import { CMDKQuickSearchService } from '@affine/core/modules/quicksearch/services/cmdk';
+import type { Workspace } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import type { Doc } from '@blocksuite/affine/store';
@@ -32,7 +33,6 @@ import {
   JournalIcon,
   SettingsIcon,
 } from '@blocksuite/icons/rc';
-import type { Workspace } from '@toeverything/infra';
 import { useLiveData, useService, useServices } from '@toeverything/infra';
 import type { ReactElement } from 'react';
 import { memo, useCallback } from 'react';

packages/frontend/core/src/components/root-app-sidebar/trash-button.tsx

@@ -4,14 +4,11 @@ import {
   useDropTarget,
 } from '@affine/component';
 import { MenuLinkItem } from '@affine/core/modules/app-sidebar/views';
+import { DocsService } from '@affine/core/modules/doc';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import type { AffineDNDData } from '@affine/core/types/dnd';
 import { useI18n } from '@affine/i18n';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  DocsService,
-  GlobalContextService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 
 export const TrashButton = () => {
   const t = useI18n();

packages/frontend/core/src/components/sign-in/sign-in.tsx

@@ -3,14 +3,11 @@ import { AuthInput, ModalHeader } from '@affine/component/auth-components';
 import { OAuth } from '@affine/core/components/affine/auth/oauth';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
 import { AuthService, ServerService } from '@affine/core/modules/cloud';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { ServerDeploymentType } from '@affine/graphql';
 import { Trans, useI18n } from '@affine/i18n';
 import { ArrowRightBigIcon, PublishIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import {
   type Dispatch,

packages/frontend/core/src/components/top-tip.tsx

@@ -1,11 +1,12 @@
 import { BrowserWarning, LocalDemoTips } from '@affine/component/affine-banner';
 import { Trans, useI18n } from '@affine/i18n';
-import { useLiveData, useService, type Workspace } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import { useEnableCloud } from '../components/hooks/affine/use-enable-cloud';
 import { AuthService } from '../modules/cloud';
 import { GlobalDialogService } from '../modules/dialogs';
+import type { Workspace } from '../modules/workspace';
 
 const minimumChromeVersion = 106;
 

packages/frontend/core/src/components/workspace-avatar/index.tsx

@@ -1,13 +1,11 @@
+import { Avatar, type AvatarProps } from '@affine/component';
 import {
-  useLiveData,
-  useService,
   type WorkspaceMetadata,
   WorkspacesService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import { Avatar, type AvatarProps } from '../../ui/avatar';
-
 const cache = new Map<string, { imageBitmap: ImageBitmap; key: string }>();
 
 /**

packages/frontend/core/src/components/workspace-selector/index.tsx

@@ -1,13 +1,12 @@
 import { Menu, type MenuProps } from '@affine/component';
 import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
-import { track } from '@affine/track';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import {
-  GlobalContextService,
-  useLiveData,
-  useServices,
   type WorkspaceMetadata,
   WorkspacesService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { track } from '@affine/track';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useEffect, useState } from 'react';
 
 import { UserWithWorkspaceList } from './user-with-workspace-list';

packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-server/index.tsx

@@ -1,11 +1,8 @@
 import { MenuItem } from '@affine/component/ui/menu';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
 import { PlusIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 
 import * as styles from './index.css';
 

packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-workspace/index.tsx

@@ -1,11 +1,8 @@
 import { MenuItem } from '@affine/component/ui/menu';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
 import { ImportIcon, PlusIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 
 import * as styles from './index.css';
 

packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/index.tsx

@@ -2,16 +2,15 @@ import { Divider } from '@affine/component/ui/divider';
 import { MenuItem } from '@affine/component/ui/menu';
 import { AuthService } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import {
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import { Logo1Icon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import { AddServer } from './add-server';

packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/workspace-list/index.tsx

@@ -11,6 +11,12 @@ import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-he
 import type { Server } from '@affine/core/modules/cloud';
 import { AuthService, ServersService } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import {
+  type WorkspaceMetadata,
+  WorkspaceService,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { ServerDeploymentType } from '@affine/graphql';
 import { useI18n } from '@affine/i18n';
 import {
@@ -20,15 +26,11 @@ import {
   PlusIcon,
   TeamWorkspaceIcon,
 } from '@blocksuite/icons/rc';
-import type { WorkspaceMetadata } from '@toeverything/infra';
 import {
   FrameworkScope,
-  GlobalContextService,
   useLiveData,
   useService,
   useServiceOptional,
-  WorkspaceService,
-  WorkspacesService,
 } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
 

packages/frontend/core/src/components/workspace-selector/workspace-card/index.tsx

@@ -1,9 +1,12 @@
 import { Button, Skeleton, Tooltip } from '@affine/component';
 import { Loading } from '@affine/component/ui/loading';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { useSystemOnline } from '@affine/core/components/hooks/use-system-online';
 import { useWorkspace } from '@affine/core/components/hooks/use-workspace';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import type {
+  WorkspaceMetadata,
+  WorkspaceProfileInfo,
+} from '@affine/core/modules/workspace';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import {
   ArrowDownSmallIcon,
@@ -17,17 +20,14 @@ import {
   TeamWorkspaceIcon,
   UnsyncIcon,
 } from '@blocksuite/icons/rc';
-import {
+import { useLiveData } from '@toeverything/infra';
-  useLiveData,
-  type WorkspaceMetadata,
-  type WorkspaceProfileInfo,
-} from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import clsx from 'clsx';
 import type { HTMLAttributes } from 'react';
 import { forwardRef, useCallback, useEffect, useState } from 'react';
 
 import { useCatchEventCallback } from '../../hooks/use-catch-event-hook';
+import { WorkspaceAvatar } from '../../workspace-avatar';
 import * as styles from './styles.css';
 export { PureWorkspaceCard } from './pure-workspace-card';
 

packages/frontend/core/src/components/workspace-selector/workspace-card/pure-workspace-card.tsx

@@ -1,13 +1,13 @@
 import { Skeleton } from '@affine/component';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { DoneIcon } from '@blocksuite/icons/rc';
-import { type WorkspaceMetadata } from '@toeverything/infra';
 import clsx from 'clsx';
 import type { HTMLAttributes } from 'react';
 import { forwardRef } from 'react';
 
+import { WorkspaceAvatar } from '../../workspace-avatar';
 import * as styles from './styles.css';
 
 export const PureWorkspaceCard = forwardRef<

packages/frontend/core/src/desktop/components/ai-island/container.tsx

@@ -1,9 +1,6 @@
-import {
+import { DocsService } from '@affine/core/modules/doc';
-  DocsService,
+import { GlobalContextService } from '@affine/core/modules/global-context';
-  GlobalContextService,
+import { useLiveData, useService } from '@toeverything/infra';
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import type { PropsWithChildren, ReactElement } from 'react';
 

packages/frontend/core/src/desktop/components/app-container/index.tsx

@@ -8,11 +8,11 @@ import {
 } from '@affine/core/modules/app-sidebar/views';
 import { AppTabsHeader } from '@affine/core/modules/app-tabs-header';
 import { NavigationButtons } from '@affine/core/modules/navigation';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import {
   useLiveData,
   useService,
   useServiceOptional,
-  WorkspaceService,
 } from '@toeverything/infra';
 import clsx from 'clsx';
 import {

packages/frontend/core/src/desktop/dialogs/collection-editor/rules-mode.tsx

@@ -8,6 +8,7 @@ import {
   type ListItem,
   ListScrollContainer,
 } from '@affine/core/components/page-list';
+import { DocsService } from '@affine/core/modules/doc';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
 import type { Collection } from '@affine/env/filter';
 import { Trans, useI18n } from '@affine/i18n';
@@ -18,7 +19,7 @@ import {
   PageIcon,
   ToggleCollapseIcon,
 } from '@blocksuite/icons/rc';
-import { DocsService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import clsx from 'clsx';
 import type { ReactNode } from 'react';

packages/frontend/core/src/desktop/dialogs/create-workspace/index.tsx

@@ -8,14 +8,11 @@ import {
   type GLOBAL_DIALOG_SCHEMA,
   GlobalDialogService,
 } from '@affine/core/modules/dialogs';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import { buildShowcaseWorkspace } from '../../../utils/first-app-data';

packages/frontend/core/src/desktop/dialogs/doc-info/index.tsx

@@ -2,8 +2,8 @@ import { Modal, Scrollable } from '@affine/component';
 import { BlocksuiteHeaderTitle } from '@affine/core/components/blocksuite/block-suite-header/title';
 import type { DialogComponentProps } from '@affine/core/modules/dialogs';
 import type { WORKSPACE_DIALOG_SCHEMA } from '@affine/core/modules/dialogs/constant';
-import type { Doc } from '@toeverything/infra';
+import { type Doc, DocsService } from '@affine/core/modules/doc';
-import { DocsService, FrameworkScope, useService } from '@toeverything/infra';
+import { FrameworkScope, useService } from '@toeverything/infra';
 import { useEffect, useState } from 'react';
 
 import { InfoTable } from './info-modal';

packages/frontend/core/src/desktop/dialogs/doc-info/info-modal.tsx

@@ -7,6 +7,8 @@ import {
 } from '@affine/component';
 import { CreatePropertyMenuItems } from '@affine/core/components/doc-properties/menu/create-doc-property';
 import { DocPropertyRow } from '@affine/core/components/doc-properties/table';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocsService } from '@affine/core/modules/doc';
 import { DocDatabaseBacklinkInfo } from '@affine/core/modules/doc-info';
 import type {
   DatabaseRow,
@@ -16,13 +18,7 @@ import { DocsSearchService } from '@affine/core/modules/docs-search';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
 import { PlusIcon } from '@blocksuite/icons/rc';
-import {
+import { LiveData, useLiveData, useServices } from '@toeverything/infra';
-  type DocCustomPropertyInfo,
-  DocsService,
-  LiveData,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
 import { useCallback, useMemo, useState } from 'react';
 
 import * as styles from './info-modal.css';

packages/frontend/core/src/desktop/dialogs/doc-info/time-row.tsx

@@ -1,12 +1,9 @@
 import { PropertyName, PropertyRoot, PropertyValue } from '@affine/component';
+import { DocsService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { i18nTime, useI18n } from '@affine/i18n';
 import { DateTimeIcon, HistoryIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  DocsService,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
 import clsx from 'clsx';
 import type { ConfigType } from 'dayjs';
 import { useDebouncedValue } from 'foxact/use-debounced-value';

packages/frontend/core/src/desktop/dialogs/enable-cloud/index.tsx

@@ -12,14 +12,10 @@ import {
   type GLOBAL_DIALOG_SCHEMA,
   GlobalDialogService,
 } from '@affine/core/modules/dialogs';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { CloudWorkspaceIcon } from '@blocksuite/icons/rc';
-import {
+import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
-  FrameworkScope,
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { useCallback, useState } from 'react';
 
 import * as styles from './dialog.css';

packages/frontend/core/src/desktop/dialogs/import-template/index.tsx

@@ -12,15 +12,14 @@ import {
   ImportTemplateService,
   TemplateDownloaderService,
 } from '@affine/core/modules/import-template';
+import {
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import type { DocMode } from '@blocksuite/affine/blocks';
 import { AllDocsIcon } from '@blocksuite/icons/rc';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-  WorkspacesService,
-} from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useEffect, useState } from 'react';
 

packages/frontend/core/src/desktop/dialogs/import-workspace/index.tsx

@@ -3,11 +3,12 @@ import {
   type DialogComponentProps,
   type GLOBAL_DIALOG_SCHEMA,
 } from '@affine/core/modules/dialogs';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { _addLocalWorkspace } from '@affine/core/modules/workspace-engine';
 import { DebugLogger } from '@affine/debug';
 import { apis } from '@affine/electron-api';
 import { useI18n } from '@affine/i18n';
-import { useService, WorkspacesService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useLayoutEffect } from 'react';
 
 const logger = new DebugLogger('ImportWorkspaceDialog');

packages/frontend/core/src/desktop/dialogs/import/index.tsx

@@ -5,6 +5,7 @@ import type {
   WORKSPACE_DIALOG_SCHEMA,
 } from '@affine/core/modules/dialogs';
 import { UrlService } from '@affine/core/modules/url';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { DebugLogger } from '@affine/debug';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
@@ -24,7 +25,7 @@ import {
   PageIcon,
   ZipIcon,
 } from '@blocksuite/icons/rc';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { cssVarV2 } from '@toeverything/theme/v2';
 import {

packages/frontend/core/src/desktop/dialogs/selectors/collection.tsx

@@ -13,8 +13,9 @@ import { CollectionService } from '@affine/core/modules/collection';
 import type { DialogComponentProps } from '@affine/core/modules/dialogs';
 import type { WORKSPACE_DIALOG_SCHEMA } from '@affine/core/modules/dialogs/constant';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useMemo, useState } from 'react';
 

packages/frontend/core/src/desktop/dialogs/selectors/tag.tsx

@@ -15,8 +15,9 @@ import type {
 } from '@affine/core/modules/dialogs';
 import { FavoriteService } from '@affine/core/modules/favorite';
 import { TagService } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useMemo, useState } from 'react';
 

packages/frontend/core/src/desktop/dialogs/setting/general-setting/appearance/index.tsx

@@ -6,12 +6,9 @@ import {
   SettingWrapper,
 } from '@affine/component/setting-components';
 import { LanguageMenu } from '@affine/core/components/affine/language-menu';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
-import {
+import { useLiveData, useService } from '@toeverything/infra';
-  FeatureFlagService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
 import { useTheme } from 'next-themes';
 import { useCallback, useMemo } from 'react';