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

2026-07-30 00:29:46 +08:00 · 2024-12-23 04:53:59 +00:00
parent 2ea79d25ad
commit 129f94ee78
337 changed files with 908 additions and 1367 deletions
@@ -1,9 +1,6 @@
-import {
-  DocsService,
-  GlobalContextService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { DocsService } from '@affine/core/modules/doc';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
 import type { PropsWithChildren, ReactElement } from 'react';

@@ -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 {
@@ -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';
@@ -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 {
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';

 import { buildShowcaseWorkspace } from '../../../utils/first-app-data';
@@ -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 { DocsService, FrameworkScope, useService } from '@toeverything/infra';
+import { type Doc, DocsService } from '@affine/core/modules/doc';
+import { FrameworkScope, useService } from '@toeverything/infra';
 import { useEffect, useState } from 'react';

 import { InfoTable } from './info-modal';
@@ -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 {
-  type DocCustomPropertyInfo,
-  DocsService,
-  LiveData,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { LiveData, useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useMemo, useState } from 'react';

 import * as styles from './info-modal.css';
@@ -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 {
-  DocsService,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
 import type { ConfigType } from 'dayjs';
 import { useDebouncedValue } from 'foxact/use-debounced-value';
@@ -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 {
-  FrameworkScope,
-  useLiveData,
-  useService,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';

 import * as styles from './dialog.css';
@@ -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 {
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useEffect, useState } from 'react';

@@ -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');
@@ -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 {
@@ -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';

@@ -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';

@@ -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 {
-  FeatureFlagService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useTheme } from 'next-themes';
 import { useCallback, useMemo } from 'react';

@@ -24,6 +24,7 @@ import {
  fontStyleOptions,
 } from '@affine/core/modules/editor-setting';
 import { SpellCheckSettingService } from '@affine/core/modules/editor-setting/services/spell-check-setting';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import {
  type FontData,
  SystemFontFamilyService,
@@ -31,12 +32,7 @@ import {
 import { Trans, useI18n } from '@affine/i18n';
 import type { DocMode } from '@blocksuite/affine/blocks';
 import { DoneIcon, SearchIcon } from '@blocksuite/icons/rc';
-import {
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  useServices,
-} from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
 import clsx from 'clsx';
 import {
  forwardRef,
@@ -1,6 +1,11 @@
 import { Button, Checkbox, Loading, Switch, Tooltip } from '@affine/component';
 import { SettingHeader } from '@affine/component/setting-components';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
+import {
+  AFFINE_FLAGS,
+  FeatureFlagService,
+  type Flag,
+} from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
 import {
  ArrowRightSmallIcon,
@@ -8,13 +13,7 @@ import {
  EmailIcon,
  GithubIcon,
 } from '@blocksuite/icons/rc';
-import {
-  AFFINE_FLAGS,
-  FeatureFlagService,
-  type Flag,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useAtom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
 import { Suspense, useCallback, useState } from 'react';
@@ -1,5 +1,6 @@
 import { UserFeatureService } from '@affine/core/modules/cloud/services/user-feature';
 import type { SettingTab } from '@affine/core/modules/dialogs/constant';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
 import {
  AppearanceIcon,
@@ -8,11 +9,7 @@ import {
  KeyboardIcon,
  PenIcon,
 } from '@blocksuite/icons/rc';
-import {
-  FeatureFlagService,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import type { ReactElement, SVGProps } from 'react';
 import { useEffect } from 'react';

@@ -8,13 +8,10 @@ import type {
  GLOBAL_DIALOG_SCHEMA,
 } from '@affine/core/modules/dialogs';
 import type { SettingTab } from '@affine/core/modules/dialogs/constant';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import { Trans } from '@affine/i18n';
 import { ContactWithUsIcon } from '@blocksuite/icons/rc';
-import {
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { debounce } from 'lodash-es';
 import {
  Suspense,
@@ -4,26 +4,24 @@ import {
 } from '@affine/component/setting-components';
 import { Avatar } from '@affine/component/ui/avatar';
 import { Tooltip } from '@affine/component/ui/tooltip';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { UserPlanButton } from '@affine/core/components/affine/auth/user-plan-button';
 import { useCatchEventCallback } from '@affine/core/components/hooks/use-catch-event-hook';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import { WorkspaceAvatar } from '@affine/core/components/workspace-avatar';
 import { AuthService } from '@affine/core/modules/cloud';
 import { UserFeatureService } from '@affine/core/modules/cloud/services/user-feature';
 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 {
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import { Logo1Icon } from '@blocksuite/icons/rc';
-import type { WorkspaceMetadata } from '@toeverything/infra';
-import {
-  GlobalContextService,
-  useLiveData,
-  useService,
-  useServices,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
 import clsx from 'clsx';
 import {
  type MouseEvent,
@@ -1,5 +1,5 @@
 import type { SettingTab } from '@affine/core/modules/dialogs/constant';
-import type { WorkspaceMetadata } from '@toeverything/infra';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';

 export interface SettingState {
  activeTab: SettingTab;
@@ -17,6 +17,7 @@ import {
 } from '@affine/core/modules/cloud';
 import { WorkspaceQuotaService } from '@affine/core/modules/quota';
 import { UrlService } from '@affine/core/modules/url';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import {
  createCustomerPortalMutation,
  type InvoicesQuery,
@@ -26,12 +27,7 @@ import {
  UserFriendlyError,
 } from '@affine/graphql';
 import { useI18n } from '@affine/i18n';
-import {
-  FrameworkScope,
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-} from '@toeverything/infra';
+import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import { useCallback, useEffect, useMemo, useState } from 'react';

@@ -1,5 +1,5 @@
 import type { SettingTab } from '@affine/core/modules/dialogs/constant';
-import type { WorkspaceMetadata } from '@toeverything/infra';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';

 import type { SettingState } from '../types';
 import { WorkspaceSettingBilling } from './billing';
@@ -2,9 +2,9 @@ import { Input } from '@affine/component';
 import type { ConfirmModalProps } from '@affine/component/ui/modal';
 import { ConfirmModal } from '@affine/component/ui/modal';
 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 { Trans, useI18n } from '@affine/i18n';
-import type { WorkspaceMetadata } from '@toeverything/infra';
 import { useCallback, useState } from 'react';

 import * as styles from './style.css';
@@ -2,16 +2,15 @@ import { notify } from '@affine/component';
 import { SettingRow } from '@affine/component/setting-components';
 import { ConfirmModal } from '@affine/component/ui/modal';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
-import { useI18n } from '@affine/i18n';
-import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import {
-  GlobalContextService,
-  useLiveData,
-  useServices,
  WorkspaceService,
  WorkspacesService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { useI18n } from '@affine/i18n';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useEffect, useState } from 'react';

 import {
@@ -1,14 +1,13 @@
 import { SettingRow } from '@affine/component/setting-components';
 import { Button } from '@affine/component/ui/button';
 import { useEnableCloud } from '@affine/core/components/hooks/affine/use-enable-cloud';
-import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
-import { useI18n } from '@affine/i18n';
 import {
-  useLiveData,
-  useService,
  type Workspace,
  WorkspaceService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
+import { useI18n } from '@affine/i18n';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback } from 'react';

 export interface PublishPanelProps {
@@ -5,14 +5,13 @@ import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hoo
 import { useSystemOnline } from '@affine/core/components/hooks/use-system-online';
 import { DesktopApiService } from '@affine/core/modules/desktop-api';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
+import type {
+  Workspace,
+  WorkspaceMetadata,
+} from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
-import {
-  useLiveData,
-  useService,
-  type Workspace,
-  type WorkspaceMetadata,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useState } from 'react';

 interface ExportPanelProps {
@@ -1,6 +1,7 @@
 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 { cssVarV2 } from '@toeverything/theme/v2';
 import { useEffect, useMemo } from 'react';

@@ -2,8 +2,9 @@ import { Button, Tooltip } from '@affine/component';
 import { SettingRow } from '@affine/component/setting-components';
 import { AffineErrorBoundary } from '@affine/core/components/affine/affine-error-boundary';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import type { ReactElement } from 'react';

 import type { SettingState } from '../../../types';
@@ -6,6 +6,7 @@ import {
  WorkspaceMembersService,
  WorkspacePermissionService,
 } from '@affine/core/modules/permissions';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import {
  Permission,
  UserFriendlyError,
@@ -17,7 +18,6 @@ import {
  useEnsureLiveData,
  useLiveData,
  useService,
-  WorkspaceService,
 } from '@toeverything/infra';
 import clsx from 'clsx';
 import { clamp } from 'lodash-es';
@@ -1,14 +1,15 @@
 import { FlexWrapper, Input, notify, Wrapper } from '@affine/component';
 import { Button } from '@affine/component/ui/button';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { useCatchEventCallback } from '@affine/core/components/hooks/use-catch-event-hook';
 import { Upload } from '@affine/core/components/pure/file-upload';
+import { WorkspaceAvatar } from '@affine/core/components/workspace-avatar';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { validateAndReduceImage } from '@affine/core/utils/reduce-image';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useI18n } from '@affine/i18n';
 import { CameraIcon } from '@blocksuite/icons/rc';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import type { KeyboardEvent } from 'react';
 import { useCallback, useEffect, useState } from 'react';

@@ -6,8 +6,9 @@ import {
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
 import { WorkspacePermissionService } from '@affine/core/modules/permissions';
 import { WorkspaceShareSettingService } from '@affine/core/modules/share-setting';
+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';

 export const SharingPanel = () => {
  const workspace = useService(WorkspaceService).workspace;
@@ -1,4 +1,4 @@
-import type { WorkspaceMetadata } from '@toeverything/infra';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';

 import type { SettingState } from '../../types';

@@ -3,13 +3,11 @@ import { SettingHeader } from '@affine/component/setting-components';
 import { DocPropertyManager } from '@affine/core/components/doc-properties/manager';
 import { CreatePropertyMenuItems } from '@affine/core/components/doc-properties/menu/create-doc-property';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import type { WorkspaceMetadata } from '@affine/core/modules/workspace';
 import { Trans, useI18n } from '@affine/i18n';
 import track from '@affine/track';
-import {
-  type DocCustomPropertyInfo,
-  FrameworkScope,
-  type WorkspaceMetadata,
-} from '@toeverything/infra';
+import { FrameworkScope } from '@toeverything/infra';
 import { useCallback } from 'react';

 import { useWorkspace } from '../../../../../components/hooks/use-workspace';
@@ -1,4 +1,5 @@
 import { DesktopApiService } from '@affine/core/modules/desktop-api';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import {
  buildShowcaseWorkspace,
  createFirstAppData,
@@ -7,7 +8,6 @@ import {
  useLiveData,
  useService,
  useServiceOptional,
-  WorkspacesService,
 } from '@toeverything/infra';
 import {
  type ReactNode,
@@ -1,9 +1,6 @@
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { ThemeEditorService } from '@affine/core/modules/theme-editor';
-import {
-  FeatureFlagService,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useTheme } from 'next-themes';
 import { useEffect } from 'react';

@@ -1,10 +1,7 @@
 import { NotificationCenter } from '@affine/component';
 import { DefaultServerService } from '@affine/core/modules/cloud';
-import {
-  FrameworkScope,
-  GlobalContextService,
-  useService,
-} from '@toeverything/infra';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { FrameworkScope, useService } from '@toeverything/infra';
 import { useEffect, useState } from 'react';
 import { Outlet } from 'react-router-dom';

@@ -13,17 +13,16 @@ import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hoo
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
 import { PureWorkspaceCard } from '@affine/core/components/workspace-selector/workspace-card';
 import { AuthService } from '@affine/core/modules/cloud';
+import {
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { buildShowcaseWorkspace } from '@affine/core/utils/first-app-data';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { SubscriptionPlan, SubscriptionRecurring } from '@affine/graphql';
 import { type I18nString, Trans, useI18n } from '@affine/i18n';
 import { DoneIcon, NewPageIcon } from '@blocksuite/icons/rc';
-import {
-  useLiveData,
-  useService,
-  type WorkspaceMetadata,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useMemo, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';

@@ -10,8 +10,9 @@ import {
  ViewIcon,
  ViewTitle,
 } from '@affine/core/modules/workbench/view/view-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 { nanoid } from 'nanoid';
 import { useCallback, useMemo, useState } from 'react';

@@ -1,6 +1,7 @@
 import { CollectionService } from '@affine/core/modules/collection';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection, Filter } from '@affine/env/filter';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';

 import { filterContainerStyle } from '../../../../components/filter-container.css';
@@ -8,11 +8,12 @@ import { Header } from '@affine/core/components/pure/header';
 import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-mode-filter-tab';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { isNewTabTrigger } from '@affine/core/utils';
 import type { Filter } from '@affine/env/filter';
 import { track } from '@affine/track';
 import { PlusIcon } from '@blocksuite/icons/rc';
-import { useServices, WorkspaceService } from '@toeverything/infra';
+import { useServices } from '@toeverything/infra';
 import clsx from 'clsx';
 import { useCallback } from 'react';

@@ -4,13 +4,11 @@ import {
  useFilteredPageMetas,
  VirtualizedPageList,
 } from '@affine/core/components/page-list';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Filter } from '@affine/env/filter';
 import { useI18n } from '@affine/i18n';
-import {
-  GlobalContextService,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useEffect, useState } from 'react';

 import {
@@ -1,12 +1,7 @@
 import { Skeleton } from '@affine/component';
+import { type Doc, DocsService } from '@affine/core/modules/doc';
 import { type AttachmentBlockModel } from '@blocksuite/affine/blocks';
-import {
-  type Doc,
-  DocsService,
-  FrameworkScope,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import { type ReactElement, useLayoutEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';

@@ -3,16 +3,12 @@ import { EmptyCollectionDetail } from '@affine/core/components/affine/empty/coll
 import { VirtualizedPageList } from '@affine/core/components/page-list';
 import { CollectionService } from '@affine/core/modules/collection';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection } from '@affine/env/filter';
 import { useI18n } from '@affine/i18n';
 import { ViewLayersIcon } from '@blocksuite/icons/rc';
-import {
-  GlobalContextService,
-  useLiveData,
-  useService,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
 import { useCallback, useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';

@@ -20,11 +20,12 @@ import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { EditorService } from '@affine/core/modules/editor';
 import { JournalService } from '@affine/core/modules/journal';
 import { ViewIcon, ViewTitle } from '@affine/core/modules/workbench';
+import type { Workspace } from '@affine/core/modules/workspace';
 import type { AffineDNDData } from '@affine/core/types/dnd';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import type { Doc } from '@blocksuite/affine/store';
-import { useLiveData, useService, type Workspace } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';

 import * as styles from './detail-page-header.css';
@@ -1,14 +1,9 @@
+import { type Doc, DocsService } from '@affine/core/modules/doc';
 import type { Editor } from '@affine/core/modules/editor';
 import { EditorsService } from '@affine/core/modules/editor';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
-import type { Doc } from '@toeverything/infra';
-import {
-  DocsService,
-  FrameworkScope,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import {
  type PropsWithChildren,
  type ReactNode,
@@ -7,9 +7,13 @@ import { EditorOutlineViewer } from '@affine/core/components/blocksuite/outline-
 import { DocPropertySidebar } from '@affine/core/components/doc-properties/sidebar';
 import { useAppSettingHelper } from '@affine/core/components/hooks/affine/use-app-setting-helper';
 import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
+import { DocService } from '@affine/core/modules/doc';
 import { EditorService } from '@affine/core/modules/editor';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { RecentDocsService } from '@affine/core/modules/quicksearch';
-import { ViewService } from '@affine/core/modules/workbench/services/view';
+import { ViewService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { RefNodeSlotsProvider } from '@blocksuite/affine/blocks';
 import { DisposableGroup } from '@blocksuite/affine/global/utils';
 import { type AffineEditorContainer } from '@blocksuite/affine/presets';
@@ -21,14 +25,10 @@ import {
  TodayIcon,
 } from '@blocksuite/icons/rc';
 import {
-  DocService,
-  FeatureFlagService,
  FrameworkScope,
-  GlobalContextService,
  useLiveData,
  useService,
  useServices,
-  WorkspaceService,
 } from '@toeverything/infra';
 import clsx from 'clsx';
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
@@ -10,18 +10,17 @@ import {
 } from '@affine/component';
 import { useJournalRouteHelper } from '@affine/core/components/hooks/use-journal';
 import { MoveToTrash } from '@affine/core/components/page-list';
+import {
+  type DocRecord,
+  DocService,
+  DocsService,
+} from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { JournalService } from '@affine/core/modules/journal';
 import { WorkbenchLink } from '@affine/core/modules/workbench';
 import { useI18n } from '@affine/i18n';
 import { CalendarXmarkIcon, EditIcon } from '@blocksuite/icons/rc';
-import type { DocRecord } from '@toeverything/infra';
-import {
-  DocService,
-  DocsService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
 import dayjs from 'dayjs';
@@ -6,15 +6,18 @@ import {
  WorkspaceServerService,
 } from '@affine/core/modules/cloud';
 import { DndService } from '@affine/core/modules/dnd/services';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import {
+  type Workspace,
+  type WorkspaceMetadata,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { ZipTransformer } from '@blocksuite/affine/blocks';
-import type { Workspace, WorkspaceMetadata } from '@toeverything/infra';
 import {
  FrameworkScope,
-  GlobalContextService,
  useLiveData,
  useService,
  useServices,
-  WorkspacesService,
 } from '@toeverything/infra';
 import type { PropsWithChildren, ReactElement } from 'react';
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
@@ -31,11 +34,11 @@ declare global {
  /**
   * @internal debug only
   */
-  // eslint-disable-next-line no-var
+  // oxlint-disable-next-line no-var
  var currentWorkspace: Workspace | undefined;
-  // eslint-disable-next-line no-var
+  // oxlint-disable-next-line no-var
  var exportWorkspaceSnapshot: (docs?: string[]) => Promise<void>;
-  // eslint-disable-next-line no-var
+  // oxlint-disable-next-line no-var
  var importWorkspaceSnapshot: () => Promise<void>;
  interface WindowEventMap {
    'affine:workspace:change': CustomEvent<{ id: string }>;
@@ -12,12 +12,8 @@ import { WorkspaceDialogs } from '@affine/core/desktop/dialogs';
 import { PeekViewManagerModal } from '@affine/core/modules/peek-view';
 import { QuotaCheck } from '@affine/core/modules/quota';
 import { WorkbenchService } from '@affine/core/modules/workbench';
-import {
-  LiveData,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { LiveData, useLiveData, useService } from '@toeverything/infra';
 import type { PropsWithChildren } from 'react';

 export const WorkspaceLayout = function WorkspaceLayout({
@@ -10,6 +10,7 @@ import {
  FetchService,
  GraphQLService,
 } from '@affine/core/modules/cloud';
+import { type Doc, DocsService } from '@affine/core/modules/doc';
 import {
  type Editor,
  type EditorSelector,
@@ -19,6 +20,10 @@ import {
 import { PeekViewManagerModal } from '@affine/core/modules/peek-view';
 import { ShareReaderService } from '@affine/core/modules/share-doc';
 import { ViewIcon, ViewTitle } from '@affine/core/modules/workbench';
+import {
+  type Workspace,
+  WorkspacesService,
+} from '@affine/core/modules/workspace';
 import { CloudBlobStorage } from '@affine/core/modules/workspace-engine';
 import { useI18n } from '@affine/i18n';
 import {
@@ -29,16 +34,13 @@ import {
 import type { AffineEditorContainer } from '@blocksuite/affine/presets';
 import { DisposableGroup } from '@blocksuite/global/utils';
 import { Logo1Icon } from '@blocksuite/icons/rc';
-import type { Doc, Workspace } from '@toeverything/infra';
 import {
-  DocsService,
  EmptyBlobStorage,
  FrameworkScope,
  ReadonlyDocStorage,
  useLiveData,
  useService,
  useServices,
-  WorkspacesService,
 } from '@toeverything/infra';
 import clsx from 'clsx';
 import {
@@ -3,6 +3,7 @@ import {
  TagPageListHeader,
  VirtualizedPageList,
 } from '@affine/core/components/page-list';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { TagService } from '@affine/core/modules/tag';
 import {
  useIsActiveView,
@@ -11,12 +12,8 @@ import {
  ViewIcon,
  ViewTitle,
 } from '@affine/core/modules/workbench';
-import {
-  GlobalContextService,
-  useLiveData,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect, useMemo } from 'react';
 import { useParams } from 'react-router-dom';

@@ -4,14 +4,12 @@ import {
  VirtualizedTrashList,
 } from '@affine/core/components/page-list';
 import { Header } from '@affine/core/components/pure/header';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import { assertExists } from '@blocksuite/affine/global/utils';
 import { DeleteIcon } from '@blocksuite/icons/rc';
-import {
-  GlobalContextService,
-  useService,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useEffect } from 'react';

 import {