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

2026-07-29 16:19:43 +08:00 · 2024-12-23 04:53:59 +00:00
parent 2ea79d25ad
commit 129f94ee78
337 changed files with 908 additions and 1367 deletions
@@ -1,8 +1,9 @@
 import { usePageHelper } from '@affine/core/components/blocksuite/block-suite-page-list/utils';
 import { WorkbenchService } from '@affine/core/modules/workbench';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import track from '@affine/track';
 import { EditIcon } from '@blocksuite/icons/rc';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';

 import type { AppTabCustomFCProps } from './data';
@@ -1,9 +1,5 @@
-import {
-  GlobalCacheService,
-  LiveData,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { GlobalCacheService } from '@affine/core/modules/storage';
+import { LiveData, useLiveData, useService } from '@toeverything/infra';
 import { type PropsWithChildren, useCallback, useMemo } from 'react';

 import { tabItem } from './styles.css';
@@ -13,17 +13,13 @@ import {
 import { CreatePropertyMenuItems } from '@affine/core/components/doc-properties/menu/create-doc-property';
 import { LinksRow } from '@affine/core/desktop/dialogs/doc-info/links-row';
 import { TimeRow } from '@affine/core/desktop/dialogs/doc-info/time-row';
+import type { DocCustomPropertyInfo } from '@affine/core/modules/db';
+import { DocsService } from '@affine/core/modules/doc';
 import { DocDatabaseBacklinkInfo } from '@affine/core/modules/doc-info';
 import { DocsSearchService } from '@affine/core/modules/docs-search';
 import { useI18n } from '@affine/i18n';
 import { PlusIcon } from '@blocksuite/icons/rc';
-import {
-  type DocCustomPropertyInfo,
-  DocsService,
-  LiveData,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { LiveData, useLiveData, useServices } from '@toeverything/infra';
 import { Suspense, useCallback, useMemo, useState } from 'react';

 import * as styles from './doc-info.css';
@@ -1,5 +1,5 @@
-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 { type PropsWithChildren, useEffect, useState } from 'react';

 export const DocFrameScope = ({
@@ -2,8 +2,10 @@ import { MenuItem, notify } from '@affine/component';
 import { filterPage } from '@affine/core/components/page-list';
 import { CollectionService } from '@affine/core/modules/collection';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import type { NodeOperation } from '@affine/core/modules/explorer';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { ShareDocsListService } from '@affine/core/modules/share-doc';
 import type { Collection } from '@affine/env/filter';
 import { PublicPageMode } from '@affine/graphql';
@@ -11,13 +13,7 @@ import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
 import type { DocMeta } from '@blocksuite/affine/store';
 import { FilterMinusIcon, ViewLayersIcon } from '@blocksuite/icons/rc';
-import {
-  DocsService,
-  GlobalContextService,
-  LiveData,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { LiveData, useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useEffect, useMemo, useState } from 'react';

 import { AddItemPlaceholder } from '../../layouts/add-item-placeholder';
@@ -11,7 +11,9 @@ import { IsFavoriteIcon } from '@affine/core/components/pure/icons';
 import { CollectionService } from '@affine/core/modules/collection';
 import type { NodeOperation } from '@affine/core/modules/explorer';
 import { CompatibleFavoriteItemsAdapter } 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 { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import {
@@ -21,12 +23,7 @@ import {
  PlusIcon,
  SplitViewIcon,
 } from '@blocksuite/icons/rc';
-import {
-  FeatureFlagService,
-  useLiveData,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';

 import { CollectionRenameSubMenu } from './dialog';
@@ -1,13 +1,13 @@
 import { Loading } from '@affine/component';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { DocsSearchService } from '@affine/core/modules/docs-search';
 import type { NodeOperation } from '@affine/core/modules/explorer';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { useI18n } from '@affine/i18n';
 import {
-  DocsService,
-  FeatureFlagService,
-  GlobalContextService,
  LiveData,
  useLiveData,
  useService,
@@ -10,9 +10,12 @@ import { usePageHelper } from '@affine/core/components/blocksuite/block-suite-pa
 import { useBlockSuiteMetaHelper } from '@affine/core/components/hooks/affine/use-block-suite-meta-helper';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
 import { IsFavoriteIcon } from '@affine/core/components/pure/icons';
+import { DocsService } from '@affine/core/modules/doc';
 import type { NodeOperation } from '@affine/core/modules/explorer';
 import { CompatibleFavoriteItemsAdapter } 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 { preventDefault } from '@affine/core/utils';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
@@ -25,14 +28,7 @@ import {
  PlusIcon,
  SplitViewIcon,
 } from '@blocksuite/icons/rc';
-import {
-  DocsService,
-  FeatureFlagService,
-  useLiveData,
-  useService,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';

 import { DocFrameScope, DocInfoSheet } from '../../../doc-info';
@@ -13,10 +13,12 @@ import type {
  NodeOperation,
 } from '@affine/core/modules/explorer';
 import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/favorite';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import {
  type FolderNode,
  OrganizeService,
 } from '@affine/core/modules/organize';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
 import track from '@affine/track';
 import {
@@ -29,12 +31,7 @@ import {
  RemoveFolderIcon,
  TagsIcon,
 } from '@blocksuite/icons/rc';
-import {
-  FeatureFlagService,
-  useLiveData,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { difference } from 'lodash-es';
 import { useCallback, useMemo, useState } from 'react';

@@ -1,12 +1,9 @@
 import type { NodeOperation } from '@affine/core/modules/explorer';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import type { Tag } from '@affine/core/modules/tag';
 import { TagService } from '@affine/core/modules/tag';
 import { useI18n } from '@affine/i18n';
-import {
-  GlobalContextService,
-  useLiveData,
-  useServices,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import clsx from 'clsx';
 import { useCallback, useMemo, useState } from 'react';

@@ -8,10 +8,14 @@ import {
 import { usePageHelper } from '@affine/core/components/blocksuite/block-suite-page-list/utils';
 import { IsFavoriteIcon } from '@affine/core/components/pure/icons';
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import type { NodeOperation } from '@affine/core/modules/explorer';
 import { FavoriteService } from '@affine/core/modules/favorite';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { GlobalCacheService } from '@affine/core/modules/storage';
 import { TagService } from '@affine/core/modules/tag';
 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 {
@@ -20,15 +24,7 @@ import {
  PlusIcon,
  SplitViewIcon,
 } from '@blocksuite/icons/rc';
-import {
-  DocsService,
-  FeatureFlagService,
-  GlobalCacheService,
-  useLiveData,
-  useService,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useService, useServices } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';

 import { TagRenameSubMenu } from './dialog';
@@ -5,12 +5,9 @@ import {
 } from '@affine/core/modules/explorer';
 import type { FavoriteSupportTypeUnion } from '@affine/core/modules/favorite';
 import { FavoriteService } from '@affine/core/modules/favorite';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { useI18n } from '@affine/i18n';
-import {
-  useLiveData,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useCallback } from 'react';

 import { AddItemPlaceholder } from '../../layouts/add-item-placeholder';
@@ -1,9 +1,10 @@
 import { Avatar } from '@affine/component';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
+import { WorkspaceAvatar } from '@affine/core/components/workspace-avatar';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { ArrowDownSmallIcon } from '@blocksuite/icons/rc';
-import { useServiceOptional, WorkspaceService } from '@toeverything/infra';
+import { useServiceOptional } from '@toeverything/infra';
 import clsx from 'clsx';
 import { forwardRef, type HTMLAttributes } from 'react';

@@ -1,6 +1,7 @@
 import { MobileMenu } from '@affine/component';
+import { WorkspacesService } from '@affine/core/modules/workspace';
 import { track } from '@affine/track';
-import { useServiceOptional, WorkspacesService } from '@toeverything/infra';
+import { useServiceOptional } from '@toeverything/infra';
 import {
  forwardRef,
  type HTMLAttributes,
@@ -1,15 +1,14 @@
 import { IconButton } from '@affine/component';
-import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
-import { CloseIcon, CollaborationIcon } from '@blocksuite/icons/rc';
+import { WorkspaceAvatar } from '@affine/core/components/workspace-avatar';
 import {
-  useLiveData,
-  useService,
  type WorkspaceMetadata,
  WorkspaceService,
  WorkspacesService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/workspace';
+import { CloseIcon, CollaborationIcon } from '@blocksuite/icons/rc';
+import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
 import { type HTMLAttributes, useCallback, useMemo } from 'react';

@@ -3,9 +3,10 @@ import type {
  DialogComponentProps,
  WORKSPACE_DIALOG_SCHEMA,
 } from '@affine/core/modules/dialogs';
+import { DocsService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { useI18n } from '@affine/i18n';
-import { DocsService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { cssVarV2 } from '@toeverything/theme/v2';
 import { useMemo } from 'react';

@@ -1,13 +1,12 @@
 import { Switch } from '@affine/component';
-import { useI18n } from '@affine/i18n';
-import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
 import {
  AFFINE_FLAGS,
  FeatureFlagService,
  type Flag,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+} from '@affine/core/modules/feature-flag';
+import { useI18n } from '@affine/i18n';
+import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useState } from 'react';

 import { SettingGroup } from '../group';
@@ -1,4 +1,5 @@
-import { type Framework, WorkspaceScope } from '@toeverything/infra';
+import { WorkspaceScope } from '@affine/core/modules/workspace';
+import { type Framework } from '@toeverything/infra';

 import { MobileSearchService } from './service/search';

@@ -1,12 +1,9 @@
 import { notify, useThemeColorV2 } from '@affine/component';
 import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
 import { CollectionService } from '@affine/core/modules/collection';
-import {
-  GlobalContextService,
-  useLiveData,
-  useServices,
-  WorkspaceService,
-} from '@toeverything/infra';
+import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { useLiveData, useServices } from '@toeverything/infra';
 import { useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';

@@ -1,11 +1,11 @@
 import { IconButton, Menu } from '@affine/component';
+import { type DocRecord, 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 { EditIcon, TodayIcon } from '@blocksuite/icons/rc';
-import type { DocRecord } from '@toeverything/infra';
-import { DocsService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useMemo } from 'react';

 import * as styles from './journal-conflict-block.css';
@@ -6,18 +6,17 @@ import {
  useConfirmModal,
 } from '@affine/component';
 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, TodayIcon } 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 { type MouseEvent, useCallback, useMemo } from 'react';

 import * as styles from './journal-conflicts.css';
@@ -1,17 +1,16 @@
 import { MenuItem, MenuSeparator, MobileMenuSub } from '@affine/component';
 import { sortPagesByDate } from '@affine/core/desktop/pages/workspace/detail-page/tabs/journal';
+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 { HistoryIcon } 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 dayjs from 'dayjs';
 import { type ReactNode, useCallback, useMemo } from 'react';

@@ -10,11 +10,15 @@ import { PageDetailEditor } from '@affine/core/components/page-detail-editor';
 import { DetailPageWrapper } from '@affine/core/desktop/pages/workspace/detail-page/detail-page-wrapper';
 import { PageHeader } from '@affine/core/mobile/components';
 import { useGlobalEvent } from '@affine/core/mobile/hooks/use-global-events';
+import { DocService } from '@affine/core/modules/doc';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { EditorService } from '@affine/core/modules/editor';
+import { FeatureFlagService } from '@affine/core/modules/feature-flag';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { JournalService } from '@affine/core/modules/journal';
 import { WorkbenchService } from '@affine/core/modules/workbench';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { i18nTime } from '@affine/i18n';
 import {
  BookmarkBlockService,
@@ -28,14 +32,10 @@ import {
 import { DisposableGroup } from '@blocksuite/affine/global/utils';
 import { type AffineEditorContainer } from '@blocksuite/affine/presets';
 import {
-  DocService,
-  FeatureFlagService,
  FrameworkScope,
-  GlobalContextService,
  useLiveData,
  useService,
  useServices,
-  WorkspaceService,
 } from '@toeverything/infra';
 import { cssVarV2 } from '@toeverything/theme/v2';
 import clsx from 'clsx';
@@ -9,6 +9,7 @@ import { useFavorite } from '@affine/core/components/blocksuite/block-suite-head
 import { IsFavoriteIcon } from '@affine/core/components/pure/icons';
 import { EditorOutlinePanel } from '@affine/core/desktop/pages/workspace/detail-page/tabs/outline';
 import { DocInfoSheet } from '@affine/core/mobile/components';
+import { DocService } from '@affine/core/modules/doc';
 import { EditorService } from '@affine/core/modules/editor';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
 import { preventDefault } from '@affine/core/utils';
@@ -21,7 +22,7 @@ import {
  PageIcon,
  TocIcon,
 } from '@blocksuite/icons/rc';
-import { DocService, useLiveData, useService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useEffect, useState } from 'react';

 import { JournalConflictsMenuItem } from './menu/journal-conflicts';
@@ -1,8 +1,10 @@
 import { IconButton, MobileMenu } from '@affine/component';
 import { SharePage } from '@affine/core/components/affine/share-page-modal/share-menu/share-page';
 import { useEnableCloud } from '@affine/core/components/hooks/affine/use-enable-cloud';
+import { DocService } from '@affine/core/modules/doc';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import { ShareiOsIcon } from '@blocksuite/icons/rc';
-import { DocService, useServices, WorkspaceService } from '@toeverything/infra';
+import { useServices } from '@toeverything/infra';

 import * as styles from './page-header-share-button.css';

@@ -2,11 +2,8 @@ import { AffineErrorBoundary } from '@affine/core/components/affine/affine-error
 import { AffineErrorComponent } from '@affine/core/components/affine/affine-error-boundary/affine-error-fallback';
 import { PageNotFound } from '@affine/core/desktop/pages/404';
 import { workbenchRoutes } from '@affine/core/mobile/workbench-router';
-import {
-  useLiveData,
-  useServices,
-  WorkspacesService,
-} from '@toeverything/infra';
+import { WorkspacesService } from '@affine/core/modules/workspace';
+import { useLiveData, useServices } from '@toeverything/infra';
 import {
  lazy as reactLazy,
  Suspense,
@@ -10,15 +10,14 @@ import {
  DefaultServerService,
  WorkspaceServerService,
 } from '@affine/core/modules/cloud';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { PeekViewManagerModal } from '@affine/core/modules/peek-view';
-import type { Workspace, WorkspaceMetadata } from '@toeverything/infra';
-import {
-  FrameworkScope,
-  GlobalContextService,
-  useLiveData,
-  useServices,
-  WorkspacesService,
-} from '@toeverything/infra';
+import type {
+  Workspace,
+  WorkspaceMetadata,
+} from '@affine/core/modules/workspace';
+import { WorkspacesService } from '@affine/core/modules/workspace';
+import { FrameworkScope, useLiveData, useServices } from '@toeverything/infra';
 import {
  type PropsWithChildren,
  useEffect,
@@ -1,11 +1,8 @@
 import { useThemeColorV2 } from '@affine/component';
 import { PageNotFound } from '@affine/core/desktop/pages/404';
+import { GlobalContextService } from '@affine/core/modules/global-context';
 import { TagService } from '@affine/core/modules/tag';
-import {
-  GlobalContextService,
-  useLiveData,
-  useService,
-} from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';

@@ -6,11 +6,12 @@ import {
  useFilteredPageMetas,
 } from '@affine/core/components/page-list';
 import type { Tag } from '@affine/core/modules/tag';
+import { WorkspaceService } from '@affine/core/modules/workspace';
 import type { Collection, Filter } from '@affine/env/filter';
 import type { DocMeta } from '@blocksuite/affine/store';
 import { ToggleExpandIcon } from '@blocksuite/icons/rc';
 import * as Collapsible from '@radix-ui/react-collapsible';
-import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
+import { useLiveData, useService } from '@toeverything/infra';
 import { useMemo } from 'react';

 import * as styles from './list.css';
@@ -1,5 +1,6 @@
 import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';
-import { useService, WorkspaceService } from '@toeverything/infra';
+import { WorkspaceService } from '@affine/core/modules/workspace';
+import { useService } from '@toeverything/infra';
 import { useMemo } from 'react';

 import { DocCard } from '../../components/doc-card';