From b0bb925ef6bffc58bee521530b785d5c402d370e Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Tue, 11 Jul 2023 16:53:01 +0800 Subject: [PATCH] refactor: remove unused code (#3149) (cherry picked from commit 8c1fcee13522b061e472b561aa41f2736d38c160) --- .../components/__debug__/client/editor.tsx | 6 +-- .../hooks/src/use-block-suite-workspace.ts | 2 +- packages/workspace/src/atom.ts | 9 +++-- packages/workspace/src/utils.ts | 38 +++++-------------- 4 files changed, 18 insertions(+), 37 deletions(-) diff --git a/apps/web/src/components/__debug__/client/editor.tsx b/apps/web/src/components/__debug__/client/editor.tsx index 782b9a9ddf..d8cd535d70 100644 --- a/apps/web/src/components/__debug__/client/editor.tsx +++ b/apps/web/src/components/__debug__/client/editor.tsx @@ -3,7 +3,6 @@ import { WorkspaceFlavour } from '@affine/env/workspace'; import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils'; import type { EditorContainer } from '@blocksuite/editor'; import type { Page } from '@blocksuite/store'; -import { Generator } from '@blocksuite/store'; import type React from 'react'; import { useCallback } from 'react'; @@ -11,10 +10,7 @@ import { BlockSuiteEditor } from '../../blocksuite/block-suite-editor'; const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace( 'test', - WorkspaceFlavour.LOCAL, - { - idGenerator: Generator.AutoIncrement, - } + WorkspaceFlavour.LOCAL ); const page = blockSuiteWorkspace.createPage({ id: 'page0' }); diff --git a/packages/hooks/src/use-block-suite-workspace.ts b/packages/hooks/src/use-block-suite-workspace.ts index 33ad178bc0..a7e90fdf50 100644 --- a/packages/hooks/src/use-block-suite-workspace.ts +++ b/packages/hooks/src/use-block-suite-workspace.ts @@ -1,4 +1,3 @@ -// guid -> Workspace import type { ActiveDocProvider, Workspace } from '@blocksuite/store'; import type { PassiveDocProvider } from '@blocksuite/store'; import { useAtomValue } from 'jotai/react'; @@ -8,6 +7,7 @@ import { useEffect } from 'react'; /** * DO NOT ACCESS THIS MAP IN PRODUCTION, OR YOU WILL BE FIRED + * Map: guid -> Workspace */ export const INTERNAL_BLOCKSUITE_HASH_MAP = new Map([]); diff --git a/packages/workspace/src/atom.ts b/packages/workspace/src/atom.ts index 6105ae5209..5379e36b1d 100644 --- a/packages/workspace/src/atom.ts +++ b/packages/workspace/src/atom.ts @@ -174,10 +174,13 @@ const rootWorkspacesMetadataPromiseAtom = atom< const metadataMap = new Map(metadata.map(x => [x.id, x])); // init workspace data metadataMap.forEach((meta, id) => { - if (meta.flavour === WorkspaceFlavour.AFFINE_CLOUD) { - createEmptyBlockSuiteWorkspace(id, meta.flavour, {}); - } else if (meta.flavour === WorkspaceFlavour.LOCAL) { + if ( + meta.flavour === WorkspaceFlavour.AFFINE_CLOUD || + meta.flavour === WorkspaceFlavour.LOCAL + ) { createEmptyBlockSuiteWorkspace(id, meta.flavour); + } else { + throw new Error(`unknown flavour ${meta.flavour}`); } }); return Array.from(metadataMap.values()); diff --git a/packages/workspace/src/utils.ts b/packages/workspace/src/utils.ts index a88bb81395..c508f29279 100644 --- a/packages/workspace/src/utils.ts +++ b/packages/workspace/src/utils.ts @@ -6,12 +6,12 @@ import { createLocalProviders, } from '@affine/workspace/providers'; import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models'; -import type { - DocProviderCreator, +import type { DocProviderCreator, StoreOptions } from '@blocksuite/store'; +import { + createIndexeddbStorage, Generator, - StoreOptions, + Workspace, } from '@blocksuite/store'; -import { createIndexeddbStorage, Workspace } from '@blocksuite/store'; import { INTERNAL_BLOCKSUITE_HASH_MAP } from '@toeverything/hooks/use-block-suite-workspace'; import { createStaticStorage } from './blob/local-static-storage'; @@ -32,35 +32,17 @@ function setEditorFlags(workspace: Workspace) { export function createEmptyBlockSuiteWorkspace( id: string, - flavour: WorkspaceFlavour.AFFINE_CLOUD, - config: { - cachePrefix?: string; - idGenerator?: Generator; - } + flavour: WorkspaceFlavour.AFFINE_CLOUD | WorkspaceFlavour.LOCAL ): Workspace; export function createEmptyBlockSuiteWorkspace( id: string, - flavour: WorkspaceFlavour.LOCAL, - config?: { - cachePrefix?: string; - idGenerator?: Generator; - } -): Workspace; -export function createEmptyBlockSuiteWorkspace( - id: string, - flavour: WorkspaceFlavour, - config?: { - cachePrefix?: string; - idGenerator?: Generator; - } + flavour: WorkspaceFlavour ): Workspace { const providerCreators: DocProviderCreator[] = []; - const prefix: string = config?.cachePrefix ?? ''; - const cacheKey = `${prefix}${id}`; - if (INTERNAL_BLOCKSUITE_HASH_MAP.has(cacheKey)) { - return INTERNAL_BLOCKSUITE_HASH_MAP.get(cacheKey) as Workspace; + if (INTERNAL_BLOCKSUITE_HASH_MAP.has(id)) { + return INTERNAL_BLOCKSUITE_HASH_MAP.get(id) as Workspace; } - const idGenerator = config?.idGenerator; + const idGenerator = Generator.NanoID; const blobStorages: StoreOptions['blobStorages'] = []; @@ -95,6 +77,6 @@ export function createEmptyBlockSuiteWorkspace( .register(AffineSchemas) .register(__unstableSchemas); setEditorFlags(workspace); - INTERNAL_BLOCKSUITE_HASH_MAP.set(cacheKey, workspace); + INTERNAL_BLOCKSUITE_HASH_MAP.set(id, workspace); return workspace; }