fix: move workspace to top level (#2717)

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';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+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;
-  name: string;
-  filterList: Filter[];
-};
+
+declare module '@affine/env/filter' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  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 {
-  Filter,
-  FilterVariable,
-  LiteralValue,
-  VariableMap,
-} from './shared-types';
+import type { FilterVariable } 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';
-import { WorkspaceFlavour } from '@affine/workspace/type';
+} from '@affine/env/workspace';
+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": [
-    "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"
-  ],
+  "exclude": ["lib"],
   "include": ["./src/**/*", "./src/**/*.json"],
   "compilerOptions": {
     "composite": true,
@@ -30,7 +24,6 @@
     {
       "path": "../../apps/electron"
     },
-    { "path": "./tsconfig.workspace.json" },
     { "path": "../../tests/fixtures" }
   ]
 }