fix: move workspace to top level (#2717)

apps/web/src/adapters/affine/fetcher.ts

@@ -1,9 +1,9 @@
 import { Unreachable } from '@affine/env/constant';
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore } from '@affine/workspace/atom';
 import { createAffineProviders } from '@affine/workspace/providers';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { assertExists } from '@blocksuite/store';
 

apps/web/src/adapters/affine/index.tsx

@@ -5,6 +5,12 @@
 import { AFFINE_STORAGE_KEY, config } from '@affine/env';
 import { initEmptyPage } from '@affine/env/blocksuite';
 import { PageNotFoundError } from '@affine/env/constant';
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
+import {
+  LoadPriority,
+  ReleaseType,
+  WorkspaceFlavour,
+} from '@affine/env/workspace';
 import { currentAffineUserAtom } from '@affine/workspace/affine/atom';
 import {
   clearLoginStorage,
@@ -21,12 +27,6 @@ import {
   createIndexedDBBackgroundProvider,
 } from '@affine/workspace/providers';
 import { createAffineDownloadProvider } from '@affine/workspace/providers';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
-import {
-  LoadPriority,
-  ReleaseType,
-  WorkspaceFlavour,
-} from '@affine/workspace/type';
 import {
   cleanupWorkspace,
   createEmptyBlockSuiteWorkspace,

apps/web/src/adapters/local/index.tsx

@@ -6,16 +6,16 @@ import {
 } from '@affine/env';
 import { initEmptyPage, initPageWithPreloading } from '@affine/env/blocksuite';
 import { PageNotFoundError } from '@affine/env/constant';
+import {
+  LoadPriority,
+  ReleaseType,
+  WorkspaceFlavour,
+} from '@affine/env/workspace';
 import {
   CRUD,
   saveWorkspaceToLocalStorage,
 } from '@affine/workspace/local/crud';
 import { createIndexedDBBackgroundProvider } from '@affine/workspace/providers';
-import {
-  LoadPriority,
-  ReleaseType,
-  WorkspaceFlavour,
-} from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 

apps/web/src/adapters/type.tsx

@@ -2,12 +2,12 @@ import type {
   AppEvents,
   WorkspaceCRUD,
   WorkspaceUISchema,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 import type {
   LoadPriority,
   ReleaseType,
   WorkspaceFlavour,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 
 export interface WorkspaceAdapter<Flavour extends WorkspaceFlavour> {
   releaseType: ReleaseType;

apps/web/src/adapters/workspace.ts

@@ -1,10 +1,10 @@
 import { Unreachable } from '@affine/env';
-import type { AppEvents, WorkspaceUISchema } from '@affine/workspace/type';
+import type { AppEvents, WorkspaceUISchema } from '@affine/env/workspace';
 import {
   LoadPriority,
   ReleaseType,
   WorkspaceFlavour,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 
 import { AffineAdapter } from './affine';
 import { LocalAdapter } from './local';

apps/web/src/atoms/__tests__/atom.spec.ts

@@ -4,12 +4,12 @@
 import 'fake-indexeddb/auto';
 
 import { initEmptyPage } from '@affine/env/blocksuite';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
 import { createIndexedDBDownloadProvider } from '@affine/workspace/providers';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   _cleanupBlockSuiteWorkspaceCache,
   createEmptyBlockSuiteWorkspace,

apps/web/src/atoms/index.ts

@@ -1,7 +1,7 @@
 import { DebugLogger } from '@affine/debug';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import type { RootWorkspaceMetadata } from '@affine/workspace/atom';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import type { Page } from '@blocksuite/store';
 import { atom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';

apps/web/src/atoms/public-workspace/index.ts

@@ -1,8 +1,8 @@
 import type { BlockSuiteFeatureFlags } from '@affine/env';
 import { config } from '@affine/env';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { atom } from 'jotai';
 

apps/web/src/atoms/root.ts

@@ -1,15 +1,15 @@
 //#region async atoms that to load the real workspace data
 import { DebugLogger } from '@affine/debug';
 import { config } from '@affine/env';
+import type {
+  NecessaryProvider,
+  WorkspaceRegistry,
+} from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type {
-  NecessaryProvider,
-  WorkspaceRegistry,
-} from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import { atom } from 'jotai';
 

apps/web/src/components/__debug__/client/editor.tsx

@@ -1,5 +1,5 @@
 import { initEmptyPage } from '@affine/env/blocksuite';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import type { EditorContainer } from '@blocksuite/editor';
 import type { Page } from '@blocksuite/store';

apps/web/src/components/affine/workspace-setting-detail/index.tsx

@@ -1,6 +1,6 @@
+import type { SettingPanel, WorkspaceRegistry } from '@affine/env/workspace';
+import { settingPanel, WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { SettingPanel, WorkspaceRegistry } from '@affine/workspace/type';
-import { settingPanel, WorkspaceFlavour } from '@affine/workspace/type';
 import type { MouseEvent } from 'react';
 import type React from 'react';
 import { Suspense, useCallback, useEffect, useMemo, useRef } from 'react';

apps/web/src/components/affine/workspace-setting-detail/panel/collaboration/index.tsx

@@ -1,13 +1,13 @@
 import { Button, IconButton, Menu, MenuItem, Wrapper } from '@affine/component';
 import { config } from '@affine/env';
 import { Unreachable } from '@affine/env/constant';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { PermissionType } from '@affine/workspace/affine/api';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import {
   DeleteTemporarilyIcon,
   EmailIcon,

apps/web/src/components/affine/workspace-setting-detail/panel/general/delete/index.tsx

@@ -1,7 +1,7 @@
 import { Button, Input, Modal, ModalCloseButton } from '@affine/component';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import { useCallback, useState } from 'react';
 

apps/web/src/components/affine/workspace-setting-detail/panel/publish/index.tsx

@@ -7,12 +7,12 @@ import {
 } from '@affine/component';
 import { config } from '@affine/env';
 import { Unreachable } from '@affine/env/constant';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { Box } from '@mui/material';
 import type React from 'react';
 import { useCallback, useEffect, useState } from 'react';

apps/web/src/components/affine/workspace-setting-detail/panel/sync/index.tsx

@@ -1,7 +1,7 @@
 import { Content, FlexWrapper, styled } from '@affine/component';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useBlockSuiteWorkspaceAvatarUrl } from '@toeverything/hooks/use-block-suite-workspace-avatar-url';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import type React from 'react';

apps/web/src/components/blocksuite/block-suite-page-list/index.tsx

@@ -5,7 +5,7 @@ import {
   PageList,
   PageListTrashView,
 } from '@affine/component/page-list';
-import type { View } from '@affine/component/page-list/filter/shared-types';
+import type { View } from '@affine/env/filter';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
 import type { PageMeta } from '@blocksuite/store';

apps/web/src/components/blocksuite/workspace-header/header-right-items/share-menu.tsx

@@ -4,8 +4,8 @@ import { Unreachable } from '@affine/env/constant';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import type { Page } from '@blocksuite/store';
 import { assertEquals } from '@blocksuite/store';
 import { useRouter } from 'next/router';

apps/web/src/components/blocksuite/workspace-header/header-right-items/sync-user.tsx

@@ -1,5 +1,7 @@
 import { displayFlex, IconButton, styled, Tooltip } from '@affine/component';
 import { config } from '@affine/env';
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import {
   getLoginStorage,
@@ -7,8 +9,6 @@ import {
   SignMethod,
 } from '@affine/workspace/affine/login';
 import { affineAuth } from '@affine/workspace/affine/shared';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   CloudWorkspaceIcon,
   LocalWorkspaceIcon,

apps/web/src/components/blocksuite/workspace-header/header.tsx

@@ -4,7 +4,7 @@ import {
   appSidebarOpenAtom,
 } from '@affine/component/app-sidebar';
 import { SidebarSwitch } from '@affine/component/app-sidebar/sidebar-header';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { CloseIcon, MinusIcon, RoundedRectangleIcon } from '@blocksuite/icons';
 import type { Page } from '@blocksuite/store';
 import { affinePluginsAtom } from '@toeverything/plugin-infra/manager';

apps/web/src/components/pure/workspace-list-modal/index.tsx

@@ -7,13 +7,13 @@ import {
   Tooltip,
 } from '@affine/component';
 import { WorkspaceList } from '@affine/component/workspace-list';
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { AccessTokenMessage } from '@affine/workspace/affine/login';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
+import type { AccessTokenMessage } from '@affine/workspace/affine/login';
 import { HelpIcon, ImportIcon, PlusIcon } from '@blocksuite/icons';
 import type { DragEndEvent } from '@dnd-kit/core';
 import { useCallback, useRef } from 'react';

apps/web/src/components/root-app-sidebar/index.tsx

@@ -10,8 +10,8 @@ import {
   SidebarScrollableContainer,
 } from '@affine/component/app-sidebar';
 import { config } from '@affine/env';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
   DeleteTemporarilyIcon,
   FolderIcon,

apps/web/src/components/workspace-header.tsx

@@ -6,9 +6,9 @@ import {
   ViewList,
 } from '@affine/component/page-list';
 import { config } from '@affine/env';
+import type { WorkspaceHeaderProps } from '@affine/env/workspace';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { WorkspaceHeaderProps } from '@affine/workspace/type';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import { SettingsIcon } from '@blocksuite/icons';
 import { RESET } from 'jotai/utils';
 import type { ReactElement } from 'react';

apps/web/src/hooks/__tests__/index.spec.tsx

@@ -5,8 +5,8 @@ import 'fake-indexeddb/auto';
 
 import assert from 'node:assert';
 
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import type { PageBlockModel } from '@blocksuite/blocks';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Page } from '@blocksuite/store';

apps/web/src/hooks/__tests__/use-recent-views.spec.tsx

@@ -1,12 +1,12 @@
 /**
  * @vitest-environment happy-dom
  */
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/workspace/type';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Page } from '@blocksuite/store';
 import { assertExists } from '@blocksuite/store';

apps/web/src/hooks/__tests__/use-router-helper.spec.ts

@@ -1,7 +1,7 @@
 /**
  * @vitest-environment happy-dom
  */
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { renderHook } from '@testing-library/react';
 import { useRouter } from 'next/router';
 import routerMock from 'next-router-mock';

apps/web/src/hooks/affine/use-affine-log-in.ts

@@ -1,4 +1,4 @@
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useRouter } from 'next/router';
 import { useCallback } from 'react';
 

apps/web/src/hooks/affine/use-affine-log-out.ts

@@ -1,4 +1,4 @@
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { useRouter } from 'next/router';
 import { useCallback } from 'react';
 

apps/web/src/hooks/affine/use-is-workspace-owner.ts

@@ -1,5 +1,5 @@
-import { PermissionType } from '@affine/workspace/affine/api';
+import { WorkspaceFlavour } from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
 
 import type { AffineOfficialWorkspace } from '../../shared';
 

apps/web/src/hooks/affine/use-members.ts

@@ -1,4 +1,4 @@
-import type { Member } from '@affine/workspace/affine/api';
+import type { Member } from '@affine/env/workspace/legacy-cloud';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { useCallback } from 'react';
 import useSWR from 'swr';

apps/web/src/hooks/affine/use-toggle-workspace-publish.ts

@@ -1,6 +1,6 @@
+import type { AffineLegacyCloudWorkspace } from '@affine/env/workspace';
 import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore, rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
 import { useCallback } from 'react';
 import useSWR from 'swr';
 

apps/web/src/hooks/root/use-on-transform-workspace.ts

@@ -1,3 +1,5 @@
+import type { WorkspaceRegistry } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { currentAffineUserAtom } from '@affine/workspace/affine/atom';
 import {
   getLoginStorage,
@@ -8,8 +10,6 @@ import {
 } from '@affine/workspace/affine/login';
 import { affineAuth } from '@affine/workspace/affine/shared';
 import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useSetAtom } from 'jotai';
 import { useCallback } from 'react';
 

apps/web/src/hooks/use-router-helper.ts

@@ -1,4 +1,4 @@
-import type { WorkspaceSubPath } from '@affine/workspace/type';
+import type { WorkspaceSubPath } from '@affine/env/workspace';
 import type { NextRouter } from 'next/router';
 import { useCallback } from 'react';
 

apps/web/src/hooks/use-transform-workspace.ts

@@ -1,6 +1,6 @@
+import type { WorkspaceFlavour } from '@affine/env/workspace';
+import type { WorkspaceRegistry } from '@affine/env/workspace';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import type { WorkspaceFlavour } from '@affine/workspace/type';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
 import { useSetAtom } from 'jotai';
 import { useCallback } from 'react';
 

apps/web/src/hooks/use-workspaces.ts

@@ -1,8 +1,8 @@
 import { DebugLogger } from '@affine/debug';
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
 import { saveWorkspaceToLocalStorage } from '@affine/workspace/local/crud';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 import { useAtomValue, useSetAtom } from 'jotai';

apps/web/src/layouts/public-workspace-layout.tsx

@@ -1,5 +1,5 @@
 import { AppContainer, MainContainer } from '@affine/component/workspace';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
 import { useAtom } from 'jotai';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/layouts/workspace-layout.tsx

@@ -12,6 +12,8 @@ import {
 import { DebugLogger } from '@affine/debug';
 import { config, DEFAULT_HELLO_WORLD_PAGE_ID } from '@affine/env';
 import { initEmptyPage, initPageWithPreloading } from '@affine/env/blocksuite';
+import type { BackgroundProvider } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { setUpLanguage, useI18N } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { createAffineGlobalChannel } from '@affine/workspace/affine/sync';
@@ -21,8 +23,6 @@ import {
   rootStore,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import type { BackgroundProvider } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { assertEquals, assertExists, nanoid } from '@blocksuite/store';
 import type { DragEndEvent } from '@dnd-kit/core';
 import {

apps/web/src/pages/_debug/broadcast.dev.tsx

@@ -1,9 +1,9 @@
 import { Button } from '@affine/component';
 import { AppContainer, MainContainer } from '@affine/component/workspace';
 import { DebugLogger } from '@affine/debug';
+import type { BroadCastChannelProvider } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createBroadCastChannelProvider } from '@affine/workspace/providers';
-import type { BroadCastChannelProvider } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 import { Typography } from '@mui/material';

apps/web/src/pages/index.tsx

@@ -1,6 +1,6 @@
 import { WorkspaceFallback } from '@affine/component/workspace';
 import { DebugLogger } from '@affine/debug';
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import type { NextPage } from 'next';
 import { useRouter } from 'next/router';
 import { Suspense, useEffect } from 'react';

apps/web/src/pages/invite/[invite-code].tsx

@@ -1,7 +1,7 @@
 import { displayFlex, styled } from '@affine/component';
 import { Button } from '@affine/component';
-import type { Permission } from '@affine/workspace/affine/api';
+import { WorkspaceSubPath } from '@affine/env/workspace';
-import { WorkspaceSubPath } from '@affine/workspace/type';
+import type { Permission } from '@affine/env/workspace/legacy-cloud';
 import {
   SucessfulDuotoneIcon,
   UnsucessfulDuotoneIcon,

apps/web/src/pages/workspace/[workspaceId]/all.tsx

@@ -1,7 +1,7 @@
 import { useAllPageSetting } from '@affine/component/page-list';
 import { QueryParamError } from '@affine/env/constant';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/pages/workspace/[workspaceId]/setting.tsx

@@ -1,10 +1,10 @@
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
+import type { SettingPanel } from '@affine/env/workspace';
-import type { SettingPanel } from '@affine/workspace/type';
 import {
   settingPanel,
   settingPanelValues,
   WorkspaceSubPath,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { assertExists } from '@blocksuite/store';
 import { useAtom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';

apps/web/src/pages/workspace/[workspaceId]/shared.tsx

@@ -1,5 +1,5 @@
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/pages/workspace/[workspaceId]/trash.tsx

@@ -1,5 +1,5 @@
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { assertExists } from '@blocksuite/store';
 import Head from 'next/head';
 import { useRouter } from 'next/router';

apps/web/src/providers/modal-provider.tsx

@@ -1,9 +1,9 @@
 import { env } from '@affine/env';
+import { WorkspaceSubPath } from '@affine/env/workspace';
 import {
   rootCurrentWorkspaceIdAtom,
   rootWorkspacesMetadataAtom,
 } from '@affine/workspace/atom';
-import { WorkspaceSubPath } from '@affine/workspace/type';
 import { arrayMove } from '@dnd-kit/sortable';
 import { useAtom, useSetAtom } from 'jotai';
 import { useRouter } from 'next/router';

apps/web/src/shared/index.ts

@@ -1,9 +1,9 @@
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import type { AffinePublicWorkspace } from '@affine/workspace/type';
+import type { AffinePublicWorkspace } from '@affine/env/workspace';
-import type { WorkspaceRegistry } from '@affine/workspace/type';
+import type { WorkspaceRegistry } from '@affine/env/workspace';
 import { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
 import type { NextPage } from 'next';
 import type { ReactElement, ReactNode } from 'react';

packages/component/src/components/card/workspace-card/index.tsx

@@ -1,10 +1,10 @@
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import { PermissionType } from '@affine/workspace/affine/api';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { SettingsIcon } from '@blocksuite/icons';
 import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import type { FC } from 'react';

packages/component/src/components/page-list/__tests__/filter.spec.tsx

@@ -3,6 +3,12 @@
  */
 import 'fake-indexeddb/auto';
 
+import type {
+  Filter,
+  LiteralValue,
+  Ref,
+  VariableMap,
+} from '@affine/env/filter';
 import { assertExists } from '@blocksuite/global/utils';
 import { render } from '@testing-library/react';
 import { useState } from 'react';
@@ -10,12 +16,6 @@ import { describe, expect, test } from 'vitest';
 
 import { Condition } from '../filter/condition';
 import { tBoolean, tDate } from '../filter/logical/custom-type';
-import type {
-  Filter,
-  LiteralValue,
-  Ref,
-  VariableMap,
-} from '../filter/shared-types';
 import { toLiteral } from '../filter/shared-types';
 import type { FilterMatcherDataType } from '../filter/vars';
 import { filterMatcher } from '../filter/vars';

packages/component/src/components/page-list/filter/condition.tsx

@@ -1,3 +1,4 @@
+import type { Filter, Literal } from '@affine/env/filter';
 import type { ReactNode } from 'react';
 import { useMemo } from 'react';
 
@@ -5,7 +6,6 @@ import { Menu, MenuItem } from '../../../ui/menu';
 import * as styles from './index.css';
 import { literalMatcher } from './literal-matcher';
 import type { TFunction, TType } from './logical/typesystem';
-import type { Filter, Literal } from './shared-types';
 import { filterMatcher, VariableSelect, vars } from './vars';
 
 export const Condition = ({

packages/component/src/components/page-list/filter/eval.ts

@@ -1,4 +1,5 @@
-import type { Filter, Literal, Ref, VariableMap } from './shared-types';
+import type { Filter, Literal, Ref, VariableMap } from '@affine/env/filter';
+
 import { filterMatcher } from './vars';
 
 const evalRef = (ref: Ref, variableMap: VariableMap) => {

packages/component/src/components/page-list/filter/filter-list.tsx

@@ -1,9 +1,9 @@
+import type { Filter } from '@affine/env/filter';
 import { CloseIcon, PlusIcon } from '@blocksuite/icons';
 
 import { Menu } from '../../..';
 import { Condition } from './condition';
 import * as styles from './index.css';
-import type { Filter } from './shared-types';
 import { CreateFilterMenu } from './vars';
 export const FilterList = ({
   value,

packages/component/src/components/page-list/filter/literal-matcher.tsx

@@ -1,3 +1,4 @@
+import type { Literal } from '@affine/env/filter';
 import dayjs from 'dayjs';
 import type { ReactNode } from 'react';
 
@@ -6,7 +7,6 @@ import { tBoolean, tDate } from './logical/custom-type';
 import { Matcher } from './logical/matcher';
 import type { TType } from './logical/typesystem';
 import { typesystem } from './logical/typesystem';
-import type { Literal } from './shared-types';
 
 export const literalMatcher = new Matcher<{
   render: (props: {

packages/component/src/components/page-list/filter/shared-types.tsx

@@ -1,34 +1,14 @@
+import type { Literal, LiteralValue, VariableMap } from '@affine/env/filter';
 import { DateTimeIcon, FavoritedIcon } from '@blocksuite/icons';
 import type { ReactElement } from 'react';
 
 import { tBoolean, tDate } from './logical/custom-type';
 import type { TType } from './logical/typesystem';
 
-export type Ref = {
-  type: 'ref';
-  name: keyof VariableMap;
-};
-
-export type Filter = {
-  type: 'filter';
-  left: Ref;
-  funcName: string;
-  args: Literal[];
-};
-export type LiteralValue =
-  | number
-  | string
-  | boolean
-  | { [K: string]: LiteralValue }
-  | Array<LiteralValue>;
 export const toLiteral = (value: LiteralValue): Literal => ({
   type: 'literal',
   value,
 });
-export type Literal = {
-  type: 'literal';
-  value: LiteralValue;
-};
 
 export type FilterVariable = {
   name: keyof VariableMap;
@@ -56,11 +36,12 @@ export const variableDefineMap = {
   //   type: tBoolean.create(),
   // },
 } as const;
-export type VariableMap = {
+
+export type InternalVariableMap = {
   [K in keyof typeof variableDefineMap]: LiteralValue;
 };
-export type View = {
+
-  id: string;
+declare module '@affine/env/filter' {
-  name: string;
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  filterList: Filter[];
+  interface VariableMap extends InternalVariableMap {}
-};
+}

packages/component/src/components/page-list/filter/vars.tsx

@@ -1,3 +1,4 @@
+import type { Filter, LiteralValue, VariableMap } from '@affine/env/filter';
 import dayjs from 'dayjs';
 import type { ReactNode } from 'react';
 
@@ -7,12 +8,7 @@ import { tBoolean, tDate } from './logical/custom-type';
 import { Matcher } from './logical/matcher';
 import type { TFunction } from './logical/typesystem';
 import { tFunction, typesystem } from './logical/typesystem';
-import type {
+import type { FilterVariable } from './shared-types';
-  Filter,
-  FilterVariable,
-  LiteralValue,
-  VariableMap,
-} from './shared-types';
 import { variableDefineMap } from './shared-types';
 
 export const vars: FilterVariable[] = Object.entries(variableDefineMap).map(

packages/component/src/components/page-list/use-all-page-setting.ts

@@ -1,3 +1,4 @@
+import type { Filter, VariableMap, View } from '@affine/env/filter';
 import type { DBSchema } from 'idb';
 import { openDB } from 'idb';
 import type { IDBPDatabase } from 'idb/build/entry';
@@ -8,7 +9,6 @@ import useSWRImmutable from 'swr/immutable';
 import { NIL } from 'uuid';
 
 import { evalFilterList } from './filter';
-import type { Filter, VariableMap, View } from './filter/shared-types';
 
 type PersistenceView = View;
 

packages/component/src/components/page-list/view/create-view.tsx

@@ -1,10 +1,10 @@
+import type { Filter, View } from '@affine/env/filter';
 import { SaveIcon } from '@blocksuite/icons';
 import { uuidv4 } from '@blocksuite/store';
 import { useState } from 'react';
 
 import { Button, Input, Modal, ModalWrapper } from '../../..';
 import { FilterList } from '../filter';
-import type { Filter, View } from '../filter/shared-types';
 import * as styles from './view-list.css';
 
 type CreateViewProps = {

packages/component/src/components/share-menu/share-menu.tsx

@@ -1,7 +1,7 @@
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 import { ExportIcon, PublishIcon, ShareIcon } from '@blocksuite/icons';
 import type { Page } from '@blocksuite/store';
 import { useBlockSuiteWorkspacePageIsPublic } from '@toeverything/hooks/use-block-suite-workspace-page-is-public';

packages/component/src/components/share-menu/share-page.tsx

@@ -1,8 +1,8 @@
 import { prefixUrl } from '@affine/env';
+import type { LocalWorkspace } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
-import type { LocalWorkspace } from '@affine/workspace/type';
-import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useBlockSuiteWorkspacePageIsPublic } from '@toeverything/hooks/use-block-suite-workspace-page-is-public';
 import type { FC } from 'react';
 import { useState } from 'react';

packages/component/src/components/share-menu/share-workspace.tsx

@@ -1,9 +1,9 @@
-import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import type { FC } from 'react';
 
 import { descriptionStyle, menuItemStyle } from './index.css';

packages/component/src/components/workspace-avatar/index.tsx

@@ -2,7 +2,7 @@ import type {
   AffineLegacyCloudWorkspace,
   AffinePublicWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 import type { Workspace } from '@blocksuite/store';
 import * as RadixAvatar from '@radix-ui/react-avatar';
 import { useBlockSuiteWorkspaceAvatarUrl } from '@toeverything/hooks/use-block-suite-workspace-avatar-url';

packages/component/src/components/workspace-list/index.tsx

@@ -1,7 +1,7 @@
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
 import type { DragEndEvent } from '@dnd-kit/core';
 import {
   DndContext,

packages/component/tsconfig.json

@@ -1,12 +1,6 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": [
+  "exclude": ["lib"],
-    "lib",
-    "./src/components/page-list/filter/shared-types.tsx",
-    "./src/components/page-list/filter/logic/custom-type.ts",
-    "./src/components/page-list/filter/logic/matcher.ts",
-    "./src/components/page-list/filter/logic/typesystem.ts"
-  ],
   "include": ["./src/**/*", "./src/**/*.json"],
   "compilerOptions": {
     "composite": true,
@@ -30,7 +24,6 @@
     {
       "path": "../../apps/electron"
     },
-    { "path": "./tsconfig.workspace.json" },
     { "path": "../../tests/fixtures" }
   ]
 }

packages/env/package.json

@@ -15,6 +15,9 @@
     ".": "./src/index.ts",
     "./config": "./src/config.ts",
     "./constant": "./src/constant.ts",
+    "./workspace": "./src/workspace.ts",
+    "./workspace/legacy-cloud": "./src/workspace/legacy-cloud/index.ts",
+    "./filter": "./src/filter.ts",
     "./blocksuite": "./src/blocksuite/index.ts"
   },
   "peerDependencies": {

packages/env/src/filter.ts

@@ -0,0 +1,32 @@
+export type LiteralValue =
+  | number
+  | string
+  | boolean
+  | { [K: string]: LiteralValue }
+  | Array<LiteralValue>;
+
+export type Ref = {
+  type: 'ref';
+  name: keyof VariableMap;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface VariableMap {}
+
+export type Literal = {
+  type: 'literal';
+  value: LiteralValue;
+};
+
+export type Filter = {
+  type: 'filter';
+  left: Ref;
+  funcName: string;
+  args: Literal[];
+};
+
+export type View = {
+  id: string;
+  name: string;
+  filterList: Filter[];
+};

packages/env/src/workspace.ts

@@ -1,10 +1,10 @@
-import type { View } from '@affine/component/page-list/filter/shared-types';
 import type { EditorContainer } from '@blocksuite/editor';
 import type { Page } from '@blocksuite/store';
 import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
 import type { FC, PropsWithChildren } from 'react';
 
-import type { Workspace as RemoteWorkspace } from './affine/api';
+import type { View } from './filter';
+import type { Workspace as RemoteWorkspace } from './workspace/legacy-cloud';
 
 export enum WorkspaceSubPath {
   ALL = 'all',

packages/env/src/workspace/legacy-cloud/index.ts

@@ -0,0 +1,129 @@
+import { z } from 'zod';
+
+export interface User {
+  id: string;
+  name: string;
+  email: string;
+  avatar_url: string;
+  create_at: string;
+}
+
+export interface GetUserByEmailParams {
+  email: string;
+  workspace_id: string;
+}
+
+export const usageResponseSchema = z.object({
+  blob_usage: z.object({
+    usage: z.number(),
+    max_usage: z.number(),
+  }),
+});
+
+export type UsageResponse = z.infer<typeof usageResponseSchema>;
+
+export interface GetWorkspaceDetailParams {
+  id: string;
+}
+
+export enum WorkspaceType {
+  Private = 0,
+  Normal = 1,
+}
+
+export enum PermissionType {
+  Read = 0,
+  Write = 1,
+  Admin = 10,
+  Owner = 99,
+}
+
+export const userSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  email: z.string(),
+  avatar_url: z.string(),
+  created_at: z.number(),
+});
+
+export const workspaceSchema = z.object({
+  id: z.string(),
+  type: z.nativeEnum(WorkspaceType),
+  public: z.boolean(),
+  permission: z.nativeEnum(PermissionType),
+});
+
+export type Workspace = z.infer<typeof workspaceSchema>;
+
+export const workspaceDetailSchema = z.object({
+  ...workspaceSchema.shape,
+  permission: z.undefined(),
+  owner: userSchema,
+  member_count: z.number(),
+});
+
+export type WorkspaceDetail = z.infer<typeof workspaceDetailSchema>;
+
+export interface Permission {
+  id: string;
+  type: PermissionType;
+  workspace_id: string;
+  user_id: string;
+  user_email: string;
+  accepted: boolean;
+  create_at: number;
+}
+
+export interface RegisteredUser extends User {
+  type: 'Registered';
+}
+
+export interface UnregisteredUser {
+  type: 'Unregistered';
+  email: string;
+}
+
+export interface Member extends Permission {
+  user: RegisteredUser | UnregisteredUser;
+}
+
+export interface GetWorkspaceMembersParams {
+  id: string;
+}
+
+export interface CreateWorkspaceParams {
+  name: string;
+}
+
+export interface UpdateWorkspaceParams {
+  id: string;
+  public: boolean;
+}
+
+export interface DeleteWorkspaceParams {
+  id: string;
+}
+
+export interface InviteMemberParams {
+  id: string;
+  email: string;
+}
+
+export interface RemoveMemberParams {
+  permissionId: number;
+}
+
+export interface AcceptInvitingParams {
+  invitingCode: string;
+}
+
+export interface LeaveWorkspaceParams {
+  id: number | string;
+}
+
+export const createWorkspaceResponseSchema = z.object({
+  id: z.string(),
+  public: z.boolean(),
+  type: z.nativeEnum(WorkspaceType),
+  created_at: z.number(),
+});

packages/jotai/package.json

@@ -3,7 +3,6 @@
   "private": true,
   "main": "./src/index.ts",
   "dependencies": {
-    "@affine/env": "workspace:*",
     "jotai": "^2.1.1"
   },
   "devDependencies": {

packages/jotai/src/resource.ts

@@ -1,11 +1,10 @@
-import { env } from '@affine/env';
 import type { EditorContainer } from '@blocksuite/editor';
 import { atom } from 'jotai';
 
 export const lottieAtom = atom(import('lottie-web').then(m => m.default));
 
 export const editorContainerModuleAtom = atom<Promise<typeof EditorContainer>>(
-  env.isServer
+  typeof window === 'undefined'
     ? async () =>
         import('@blocksuite/editor').then(module => module.EditorContainer)
     : (import('@blocksuite/editor').then(

packages/jotai/tsconfig.json

@@ -5,6 +5,5 @@
     "composite": true,
     "noEmit": false,
     "outDir": "lib"
-  },
+  }
-  "references": [{ "path": "../env" }]
 }

packages/storybook/src/stories/card.stories.tsx

@@ -1,7 +1,7 @@
 import { toast } from '@affine/component';
 import { BlockCard } from '@affine/component/card/block-card';
 import { WorkspaceCard } from '@affine/component/card/workspace-card';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
 import { Workspace } from '@blocksuite/store';
 

packages/storybook/src/stories/image-preview-modal.stories.tsx

@@ -1,7 +1,7 @@
 import { BlockSuiteEditor } from '@affine/component/block-suite-editor';
 import { ImagePreviewModal } from '@affine/component/image-preview-modal';
 import { initEmptyPage } from '@affine/env/blocksuite';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import type { Meta } from '@storybook/react';
 

packages/storybook/src/stories/share-menu.stories.tsx

@@ -2,12 +2,15 @@ import { toast } from '@affine/component';
 import { PublicLinkDisableModal } from '@affine/component/share-menu/disable-public-link';
 import { ShareMenu } from '@affine/component/share-menu/share-menu';
 import { StyledDisableButton } from '@affine/component/share-menu/styles';
-import { PermissionType, WorkspaceType } from '@affine/workspace/affine/api';
 import type {
   AffineLegacyCloudWorkspace,
   LocalWorkspace,
-} from '@affine/workspace/type';
+} from '@affine/env/workspace';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import {
+  PermissionType,
+  WorkspaceType,
+} from '@affine/env/workspace/legacy-cloud';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import type { Page } from '@blocksuite/store';
 import { expect } from '@storybook/jest';

packages/storybook/src/stories/workspace-avatar.stories.tsx

@@ -1,6 +1,6 @@
 import type { WorkspaceAvatarProps } from '@affine/component/workspace-avatar';
 import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { Workspace } from '@blocksuite/store';
 import type { Meta, StoryFn } from '@storybook/react';
 

packages/storybook/src/stories/workspace-list.stories.tsx

@@ -1,6 +1,6 @@
 import type { WorkspaceListProps } from '@affine/component/workspace-list';
 import { WorkspaceList } from '@affine/component/workspace-list';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { arrayMove } from '@dnd-kit/sortable';
 import type { Meta } from '@storybook/react';

packages/workspace/src/affine/__tests__/api.spec.ts

@@ -6,6 +6,11 @@ import 'fake-indexeddb/auto';
 import { readFile } from 'node:fs/promises';
 
 import { MessageCode } from '@affine/env/constant';
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import {
+  createWorkspaceResponseSchema,
+  usageResponseSchema,
+} from '@affine/env/workspace/legacy-cloud';
 import user1 from '@affine-test/fixtures/built-in-user1.json';
 import user2 from '@affine-test/fixtures/built-in-user2.json';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
@@ -17,15 +22,8 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
 import { WebSocket } from 'ws';
 import { applyUpdate } from 'yjs';
 
-import { WorkspaceFlavour } from '../../type';
 import { createEmptyBlockSuiteWorkspace } from '../../utils';
-import {
+import { createUserApis, createWorkspaceApis, RequestError } from '../api';
-  createUserApis,
-  createWorkspaceApis,
-  createWorkspaceResponseSchema,
-  RequestError,
-  usageResponseSchema,
-} from '../api';
 import { createStatusApis } from '../api/status';
 import { KeckProvider } from '../keck';
 import {

packages/workspace/src/affine/__tests__/sync.spec.ts

@@ -3,6 +3,9 @@
  */
 import 'fake-indexeddb/auto';
 
+import { WorkspaceFlavour } from '@affine/env/workspace';
+import type { Workspace } from '@affine/env/workspace/legacy-cloud';
+import { PermissionType } from '@affine/env/workspace/legacy-cloud';
 import user1 from '@affine-test/fixtures/built-in-user1.json';
 import user2 from '@affine-test/fixtures/built-in-user2.json';
 import type { ParagraphBlockModel } from '@blocksuite/blocks/models';
@@ -13,10 +16,8 @@ import { WebSocket } from 'ws';
 
 import type { LoginResponse } from '../../affine/login';
 import { loginResponseSchema } from '../../affine/login';
-import { WorkspaceFlavour } from '../../type';
 import { createEmptyBlockSuiteWorkspace } from '../../utils';
-import type { Workspace } from '../api';
+import { createWorkspaceApis } from '../api';
-import { createWorkspaceApis, PermissionType } from '../api';
 import { KeckProvider } from '../keck';
 
 declare module '@blocksuite/store' {

packages/workspace/src/affine/api/index.ts

@@ -1,5 +1,20 @@
 import { MessageCode, Messages } from '@affine/env';
-import { z } from 'zod';
+import type {
+  AcceptInvitingParams,
+  DeleteWorkspaceParams,
+  GetUserByEmailParams,
+  GetWorkspaceDetailParams,
+  InviteMemberParams,
+  LeaveWorkspaceParams,
+  Member,
+  Permission,
+  RemoveMemberParams,
+  UpdateWorkspaceParams,
+  UsageResponse,
+  User,
+  Workspace,
+  WorkspaceDetail,
+} from '@affine/env/workspace/legacy-cloud';
 
 import { checkLoginStorage } from '../login';
 
@@ -28,28 +43,6 @@ function sendMessage(code: (typeof MessageCode)[keyof typeof MessageCode]) {
   );
 }
 
-export interface User {
-  id: string;
-  name: string;
-  email: string;
-  avatar_url: string;
-  create_at: string;
-}
-
-export interface GetUserByEmailParams {
-  email: string;
-  workspace_id: string;
-}
-
-export const usageResponseSchema = z.object({
-  blob_usage: z.object({
-    usage: z.number(),
-    max_usage: z.number(),
-  }),
-});
-
-export type UsageResponse = z.infer<typeof usageResponseSchema>;
-
 export function createUserApis(prefixUrl = '/') {
   return {
     getUsage: async (): Promise<UsageResponse> => {
@@ -78,112 +71,6 @@ export function createUserApis(prefixUrl = '/') {
   } as const;
 }
 
-export interface GetWorkspaceDetailParams {
-  id: string;
-}
-
-export enum WorkspaceType {
-  Private = 0,
-  Normal = 1,
-}
-
-export enum PermissionType {
-  Read = 0,
-  Write = 1,
-  Admin = 10,
-  Owner = 99,
-}
-
-export const userSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  email: z.string(),
-  avatar_url: z.string(),
-  created_at: z.number(),
-});
-
-export const workspaceSchema = z.object({
-  id: z.string(),
-  type: z.nativeEnum(WorkspaceType),
-  public: z.boolean(),
-  permission: z.nativeEnum(PermissionType),
-});
-
-export type Workspace = z.infer<typeof workspaceSchema>;
-
-export const workspaceDetailSchema = z.object({
-  ...workspaceSchema.shape,
-  permission: z.undefined(),
-  owner: userSchema,
-  member_count: z.number(),
-});
-
-export type WorkspaceDetail = z.infer<typeof workspaceDetailSchema>;
-
-export interface Permission {
-  id: string;
-  type: PermissionType;
-  workspace_id: string;
-  user_id: string;
-  user_email: string;
-  accepted: boolean;
-  create_at: number;
-}
-
-export interface RegisteredUser extends User {
-  type: 'Registered';
-}
-
-export interface UnregisteredUser {
-  type: 'Unregistered';
-  email: string;
-}
-
-export interface Member extends Permission {
-  user: RegisteredUser | UnregisteredUser;
-}
-
-export interface GetWorkspaceMembersParams {
-  id: string;
-}
-
-export interface CreateWorkspaceParams {
-  name: string;
-}
-
-export interface UpdateWorkspaceParams {
-  id: string;
-  public: boolean;
-}
-
-export interface DeleteWorkspaceParams {
-  id: string;
-}
-
-export interface InviteMemberParams {
-  id: string;
-  email: string;
-}
-
-export interface RemoveMemberParams {
-  permissionId: number;
-}
-
-export interface AcceptInvitingParams {
-  invitingCode: string;
-}
-
-export interface LeaveWorkspaceParams {
-  id: number | string;
-}
-
-export const createWorkspaceResponseSchema = z.object({
-  id: z.string(),
-  public: z.boolean(),
-  type: z.nativeEnum(WorkspaceType),
-  created_at: z.number(),
-});
-
 export function createWorkspaceApis(prefixUrl = '/') {
   return {
     getWorkspaces: async (): Promise<Workspace[]> => {

packages/workspace/src/affine/channel.ts

@@ -1,10 +1,10 @@
 import { DebugLogger } from '@affine/debug';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { assertExists } from '@blocksuite/global/utils';
 import * as url from 'lib0/url';
 import * as websocket from 'lib0/websocket';
 
 import { getLoginStorage, isExpired, parseIdToken } from '../affine/login';
-import { WorkspaceFlavour } from '../type';
 import { cleanupWorkspace } from '../utils';
 
 const RECONNECT_INTERVAL_TIME = 500;

packages/workspace/src/affine/sync.ts

@@ -1,15 +1,18 @@
 import { DebugLogger } from '@affine/debug';
 import { websocketPrefixUrl } from '@affine/env/api';
+import type { WorkspaceCRUD } from '@affine/env/workspace';
+import type { WorkspaceFlavour } from '@affine/env/workspace';
+import {
+  workspaceDetailSchema,
+  workspaceSchema,
+} from '@affine/env/workspace/legacy-cloud';
 import { assertExists } from '@blocksuite/global/utils';
 import type { Disposable } from '@blocksuite/store';
 import { z } from 'zod';
 
-import { workspaceDetailSchema, workspaceSchema } from '../affine/api';
 import { WebsocketClient } from '../affine/channel';
 import { storageChangeSlot } from '../affine/login';
 import { rootStore, rootWorkspacesMetadataAtom } from '../atom';
-import type { WorkspaceCRUD } from '../type';
-import type { WorkspaceFlavour } from '../type';
 
 const logger = new DebugLogger('affine-sync');
 

packages/workspace/src/atom.ts

@@ -1,10 +1,9 @@
+import type { WorkspaceFlavour } from '@affine/env/workspace';
 import type { EditorContainer } from '@blocksuite/editor';
 import { atom, createStore } from 'jotai';
 import { atomWithStorage, createJSONStorage } from 'jotai/utils';
 import Router from 'next/router';
 
-import type { WorkspaceFlavour } from './type';
-
 export type RootWorkspaceMetadata = {
   id: string;
   flavour: WorkspaceFlavour;

packages/workspace/src/local/__tests__/crud.spec.ts

@@ -3,12 +3,12 @@
  */
 import 'fake-indexeddb/auto';
 
+import type { LocalWorkspace, WorkspaceCRUD } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import { Workspace } from '@blocksuite/store';
 import { afterEach, assertType, describe, expect, test } from 'vitest';
 
-import type { LocalWorkspace, WorkspaceCRUD } from '../../type';
-import { WorkspaceFlavour } from '../../type';
 import { CRUD } from '../crud';
 
 afterEach(() => {

packages/workspace/src/local/crud.ts

@@ -1,12 +1,12 @@
 import { DebugLogger } from '@affine/debug';
+import type { LocalWorkspace, WorkspaceCRUD } from '@affine/env/workspace';
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { nanoid, Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
 import { createIndexedDBProvider } from '@toeverything/y-indexeddb';
 import { createJSONStorage } from 'jotai/utils';
 import { z } from 'zod';
 
 import { createLocalProviders } from '../providers';
-import type { LocalWorkspace, WorkspaceCRUD } from '../type';
-import { WorkspaceFlavour } from '../type';
 import { createEmptyBlockSuiteWorkspace } from '../utils';
 
 const getStorage = () => createJSONStorage(() => localStorage);

packages/workspace/src/providers/__tests__/sqlite-provider.spec.ts

@@ -1,9 +1,12 @@
+import type {
+  SQLiteDBDownloadProvider,
+  SQLiteProvider,
+} from '@affine/env/workspace';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Y as YType } from '@blocksuite/store';
 import { uuidv4, Workspace } from '@blocksuite/store';
 import { beforeEach, describe, expect, test, vi } from 'vitest';
 
-import type { SQLiteDBDownloadProvider, SQLiteProvider } from '../../type';
 import { createSQLiteDBDownloadProvider, createSQLiteProvider } from '../index';
 
 const Y = Workspace.Y;

packages/workspace/src/providers/affine-download.ts

@@ -1,8 +1,8 @@
 import { DebugLogger } from '@affine/debug';
+import type { AffineDownloadProvider } from '@affine/env/workspace';
 import { assertExists, Workspace } from '@blocksuite/store';
 
 import { affineApis } from '../affine/shared';
-import type { AffineDownloadProvider } from '../type';
 
 const hashMap = new Map<string, ArrayBuffer>();
 

packages/workspace/src/providers/broad-cast-channel/index.ts

@@ -1,3 +1,4 @@
+import type { BroadCastChannelProvider } from '@affine/env/workspace';
 import { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
 import { assertExists } from '@blocksuite/store';
 import type { Awareness } from 'y-protocols/awareness';
@@ -6,7 +7,6 @@ import {
   encodeAwarenessUpdate,
 } from 'y-protocols/awareness';
 
-import type { BroadCastChannelProvider } from '../../type';
 import { CallbackSet } from '../../utils';
 import { localProviderLogger } from '../logger';
 import type {

packages/workspace/src/providers/index.ts

@@ -1,4 +1,12 @@
 import { config, websocketPrefixUrl } from '@affine/env';
+import type {
+  AffineWebSocketProvider,
+  LocalIndexedDBBackgroundProvider,
+  LocalIndexedDBDownloadProvider,
+  Provider,
+  SQLiteDBDownloadProvider,
+  SQLiteProvider,
+} from '@affine/env/workspace';
 import type { BlobManager, Disposable } from '@blocksuite/store';
 import {
   assertExists,
@@ -12,14 +20,6 @@ import {
 
 import { KeckProvider } from '../affine/keck';
 import { getLoginStorage, storageChangeSlot } from '../affine/login';
-import type {
-  AffineWebSocketProvider,
-  LocalIndexedDBBackgroundProvider,
-  LocalIndexedDBDownloadProvider,
-  Provider,
-  SQLiteDBDownloadProvider,
-  SQLiteProvider,
-} from '../type';
 import { CallbackSet } from '../utils';
 import { createAffineDownloadProvider } from './affine-download';
 import { createBroadCastChannelProvider } from './broad-cast-channel';

packages/workspace/src/utils.ts

@@ -1,3 +1,4 @@
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Generator, StoreOptions } from '@blocksuite/store';
 import { createIndexeddbStorage, Workspace } from '@blocksuite/store';
@@ -6,7 +7,6 @@ import type { createWorkspaceApis } from './affine/api';
 import { rootStore, rootWorkspacesMetadataAtom } from './atom';
 import { createAffineBlobStorage } from './blob';
 import { createSQLiteStorage } from './blob/sqlite-blob-storage';
-import { WorkspaceFlavour } from './type';
 
 export function cleanupWorkspace(flavour: WorkspaceFlavour) {
   rootStore.set(rootWorkspacesMetadataAtom, metas =>

packages/workspace/tsconfig.json

@@ -12,7 +12,6 @@
     { "path": "../env" },
     { "path": "../debug" },
     { "path": "../hooks" },
-    { "path": "../component/tsconfig.workspace.json" },
     { "path": "../../apps/electron" }
   ]
 }

yarn.lock

@@ -234,7 +234,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@affine/jotai@workspace:packages/jotai"
   dependencies:
-    "@affine/env": "workspace:*"
     "@blocksuite/blocks": 0.0.0-20230606130340-805f430b-nightly
     "@blocksuite/editor": 0.0.0-20230606130340-805f430b-nightly
     "@blocksuite/global": 0.0.0-20230606130340-805f430b-nightly