fix(server): distinguish local mutex correctly (#9444)

a workaround fix AF-1940

.docker/dev/compose.yml.example

@@ -11,7 +11,7 @@ services:
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
     volumes:
-      - ${DATABASE_LOCATION}:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
 
   redis:
     image: redis:latest
@@ -26,3 +26,6 @@ services:
 
 networks:
   dev:
+
+volumes:
+  postgres_data:

.github/actions/build-rust/action.yml

@@ -7,6 +7,10 @@ inputs:
   package:
     description: 'Package to build'
     required: true
+  no-build:
+    description: 'Whether to skip building'
+    required: false
+    default: 'false'
 
 runs:
   using: 'composite'
@@ -14,20 +18,34 @@ runs:
     - name: Print rustup toolchain version
       shell: bash
       id: rustup-version
+      working-directory: ${{ env.DEV_DRIVE_WORKSPACE || github.workspace }}
       run: |
         export RUST_TOOLCHAIN_VERSION="$(grep 'channel' rust-toolchain.toml | head -1 | awk -F '"' '{print $2}')"
         echo "Rust toolchain version: $RUST_TOOLCHAIN_VERSION"
         echo "RUST_TOOLCHAIN_VERSION=$RUST_TOOLCHAIN_VERSION" >> "$GITHUB_OUTPUT"
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@stable
+      if: ${{ runner.os != 'Windows' }}
       with:
         toolchain: '${{ steps.rustup-version.outputs.RUST_TOOLCHAIN_VERSION }}'
         targets: ${{ inputs.target }}
       env:
         CARGO_INCREMENTAL: '1'
 
+    - name: Setup Rust
+      uses: dtolnay/rust-toolchain@stable
+      if: ${{ runner.os == 'Windows' }}
+      with:
+        toolchain: '${{ steps.rustup-version.outputs.RUST_TOOLCHAIN_VERSION }}'
+        targets: ${{ inputs.target }}
+      env:
+        CARGO_INCREMENTAL: '1'
+        CARGO_HOME: ${{ env.DEV_DRIVE }}/.cargo
+        RUSTUP_HOME: ${{ env.DEV_DRIVE }}/.rustup
+
     - name: Set CC
-      if: ${{ contains(inputs.target, 'linux') && inputs.package != '@affine/native' }}
+      if: ${{ contains(inputs.target, 'linux') && inputs.package != '@affine/native' && inputs.no-build != 'true' }}
+      working-directory: ${{ env.DEV_DRIVE_WORKSPACE || github.workspace }}
       shell: bash
       run: |
         echo "CC=clang" >> "$GITHUB_ENV"
@@ -35,12 +53,37 @@ runs:
 
     - name: Cache cargo
       uses: Swatinem/rust-cache@v2
+      if: ${{ runner.os == 'Windows' }}
+      with:
+        workspaces: ${{ env.DEV_DRIVE_WORKSPACE }}
+        save-if: ${{ github.ref_name == 'canary' }}
+        shared-key: ${{ inputs.target }}-${{ inputs.package }}
+      env:
+        CARGO_HOME: ${{ env.DEV_DRIVE }}/.cargo
+        RUSTUP_HOME: ${{ env.DEV_DRIVE }}/.rustup
+
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v2
+      if: ${{ runner.os != 'Windows' }}
       with:
         save-if: ${{ github.ref_name == 'canary' }}
-        shared-key: ${{ inputs.target }}-inputs.package
+        shared-key: ${{ inputs.target }}-${{ inputs.package }}
+
     - name: Build
       shell: bash
+      if: ${{ runner.os != 'Windows' && inputs.no-build != 'true' }}
       run: |
         yarn workspace ${{ inputs.package }} build --target ${{ inputs.target }} --use-napi-cross
       env:
         DEBUG: 'napi:*'
+
+    - name: Build
+      working-directory: ${{ env.DEV_DRIVE_WORKSPACE || github.workspace }}
+      shell: bash
+      if: ${{ runner.os == 'Windows' && inputs.no-build != 'true' }}
+      run: |
+        yarn workspace ${{ inputs.package }} build --target ${{ inputs.target }} --use-napi-cross
+      env:
+        DEBUG: 'napi:*'
+        CARGO_HOME: ${{ env.DEV_DRIVE }}/.cargo
+        RUSTUP_HOME: ${{ env.DEV_DRIVE }}/.rustup

.github/actions/setup-node/action.yml

@@ -35,10 +35,19 @@ inputs:
   full-cache:
     description: 'Full installation cache'
     required: false
-
 runs:
   using: 'composite'
   steps:
+    - name: Output workspace path
+      id: workspace-path
+      shell: bash
+      run: |
+        if [ -n "${{ env.DEV_DRIVE_WORKSPACE }}" ]; then
+          echo "workspace_path=${{ env.DEV_DRIVE_WORKSPACE }}" >> $GITHUB_OUTPUT
+        else
+          echo "workspace_path=${{ github.workspace }}" >> $GITHUB_OUTPUT
+        fi
+
     - name: Setup Node.js
       uses: actions/setup-node@v4
       with:
@@ -52,26 +61,31 @@ runs:
     - name: Init CorePack
       if: ${{ inputs.corepack-install == 'true' }}
       shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: corepack enable
 
     - name: Set nmMode
       if: ${{ inputs.hard-link-nm == 'false' }}
       shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: yarn config set nmMode classic
 
     - name: Set nmHoistingLimits
       if: ${{ inputs.nmHoistingLimits }}
       shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: yarn config set nmHoistingLimits ${{ inputs.nmHoistingLimits }}
 
     - name: Set enableScripts
       if: ${{ inputs.enableScripts == 'false' }}
       shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: yarn config set enableScripts false
 
     - name: Set yarn global cache path
       shell: bash
       id: yarn-cache
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: node -e "const p = $(yarn config cacheFolder --json).effective; console.log('yarn_global_cache=' + p)" >> $GITHUB_OUTPUT
 
     - name: Cache non-full yarn cache on Linux
@@ -79,7 +93,7 @@ runs:
       if: ${{ inputs.full-cache != 'true' && runner.os == 'Linux' }}
       with:
         path: |
-          node_modules
+          ${{ steps.workspace-path.outputs.workspace_path }}/node_modules
           ${{ steps.yarn-cache.outputs.yarn_global_cache }}
         key: node_modules-cache-${{ github.job }}-${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}
 
@@ -115,17 +129,7 @@ runs:
       if: ${{ inputs.package-install == 'true' }}
       continue-on-error: true
       shell: bash
-      run: yarn ${{ inputs.extra-flags }}
-      env:
-        HUSKY: '0'
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1'
-        ELECTRON_SKIP_BINARY_DOWNLOAD: '1'
-        SENTRYCLI_SKIP_DOWNLOAD: '1'
-        DEBUG: '*'
-
-    - name: yarn install (try again)
-      if: ${{ steps.install.outcome == 'failure' }}
-      shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: yarn ${{ inputs.extra-flags }}
       env:
         HUSKY: '0'
@@ -138,6 +142,7 @@ runs:
       id: playwright-version
       if: ${{ inputs.playwright-install == 'true' }}
       shell: bash
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       run: echo "version=$(yarn why --json @playwright/test | grep -h 'workspace:.' | jq --raw-output '.children[].locator' | sed -e 's/@playwright\/test@.*://' | head -n 1)" >> $GITHUB_OUTPUT
 
       # Attempt to restore the correct Playwright browser binaries based on the
@@ -150,7 +155,7 @@ runs:
       id: playwright-cache
       if: ${{ inputs.playwright-install == 'true' }}
       with:
-        path: ${{ github.workspace }}/node_modules/.cache/ms-playwright
+        path: ${{ steps.workspace-path.outputs.workspace_path }}/node_modules/.cache/ms-playwright
         key: '${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}-playwright-${{ steps.playwright-version.outputs.version }}'
         # As a fallback, if the Playwright version has changed, try use the
         # most recently cached version. There's a good chance that at least one
@@ -169,12 +174,14 @@ runs:
       shell: bash
       if: inputs.playwright-install == 'true'
       run: yarn playwright install --with-deps chromium webkit
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       env:
-        PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/node_modules/.cache/ms-playwright
+        PLAYWRIGHT_BROWSERS_PATH: ${{ steps.workspace-path.outputs.workspace_path }}/node_modules/.cache/ms-playwright
 
     - name: Get installed Electron version
       id: electron-version
       if: ${{ inputs.electron-install == 'true' }}
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       shell: bash
       run: |
         echo "version=$(yarn why --json electron | grep -h 'workspace:.' | jq --raw-output '.children[].locator' | sed -e 's/@playwright\/test@.*://' | head -n 1)" >> $GITHUB_OUTPUT
@@ -183,7 +190,7 @@ runs:
       id: electron-cache
       if: ${{ inputs.electron-install == 'true' }}
       with:
-        path: 'node_modules/.cache/electron'
+        path: ${{ steps.workspace-path.outputs.workspace_path }}/node_modules/.cache/electron
         key: '${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}-electron-${{ steps.electron-version.outputs.version }}'
         restore-keys: |
           ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.name }}-${{ steps.system-info.outputs.release }}-${{ steps.system-info.outputs.version }}-electron-
@@ -192,5 +199,11 @@ runs:
       shell: bash
       if: inputs.electron-install == 'true'
       run: node ./node_modules/electron/install.js
+      working-directory: ${{ steps.workspace-path.outputs.workspace_path }}
       env:
-        electron_config_cache: ./node_modules/.cache/electron
+        electron_config_cache: ${{ steps.workspace-path.outputs.workspace_path }}/node_modules/.cache/electron
+
+    - name: Write PLAYWRIGHT_BROWSERS_PATH env
+      shell: bash
+      run: |
+        echo "PLAYWRIGHT_BROWSERS_PATH=${{ steps.workspace-path.outputs.workspace_path }}/node_modules/.cache/ms-playwright" >> $GITHUB_ENV

.github/actions/setup-rust/action.yml

@@ -1,28 +0,0 @@
-name: 'Rust setup'
-description: 'Rust setup, including cache configuration'
-inputs:
-  components:
-    description: 'Cargo components'
-    required: false
-  targets:
-    description: 'Cargo target'
-    required: false
-  toolchain:
-    description: 'Rustup toolchain'
-    required: false
-    default: 'stable'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Setup Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: ${{ inputs.toolchain }}
-        targets: ${{ inputs.targets }}
-        components: ${{ inputs.components }}
-    - name: Add Targets
-      if: ${{ inputs.targets }}
-      run: rustup target add ${{ inputs.targets }}
-      shell: bash
-    - uses: Swatinem/rust-cache@v2

.github/helm/affine/Chart.yaml

@@ -3,4 +3,4 @@ name: affine
 description: AFFiNE cloud chart
 type: application
 version: 0.0.0
-appVersion: "0.18.0"
+appVersion: "0.19.0"

.github/helm/affine/charts/graphql/Chart.yaml

@@ -3,7 +3,7 @@ name: graphql
 description: AFFiNE GraphQL server
 type: application
 version: 0.0.0
-appVersion: "0.18.0"
+appVersion: "0.19.0"
 dependencies:
   - name: gcloud-sql-proxy
     version: 0.0.0

.github/helm/affine/charts/sync/Chart.yaml

@@ -3,7 +3,7 @@ name: sync
 description: AFFiNE Sync Server
 type: application
 version: 0.0.0
-appVersion: "0.18.0"
+appVersion: "0.19.0"
 dependencies:
   - name: gcloud-sql-proxy
     version: 0.0.0

.github/workflows/build-test.yml

@@ -19,7 +19,6 @@ env:
   AFFINE_ENV: dev
   COVERAGE: true
   MACOSX_DEPLOYMENT_TARGET: '10.13'
-  PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/node_modules/.cache/ms-playwright
   DEPLOYMENT_TYPE: affine
 
 concurrency:
@@ -280,11 +279,16 @@ jobs:
         spec:
           - { os: ubuntu-latest, target: x86_64-unknown-linux-gnu }
           - { os: windows-latest, target: x86_64-pc-windows-msvc }
-          - { os: macos-14, target: x86_64-apple-darwin }
-          - { os: macos-14, target: aarch64-apple-darwin }
+          - { os: macos-latest, target: x86_64-apple-darwin }
+          - { os: macos-latest, target: aarch64-apple-darwin }
 
     steps:
       - uses: actions/checkout@v4
+      - uses: samypr100/setup-dev-drive@v3
+        if: ${{ matrix.spec.os == 'windows-latest' }}
+        with:
+          workspace-copy: true
+          drive-size: 8GB
       - name: Setup Node.js
         uses: ./.github/actions/setup-node
         with:
@@ -292,6 +296,7 @@ jobs:
           electron-install: false
       - name: Setup filename
         id: filename
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE || github.workspace }}
         shell: bash
         run: |
           export PLATFORM_ARCH_ABI=$(node -e "console.log(require('@napi-rs/cli').parseTriple('${{ matrix.spec.target }}').platformArchABI)")
@@ -305,7 +310,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.filename.outputs.filename }}
-          path: ./packages/frontend/native/${{ steps.filename.outputs.filename }}
+          path: ${{ env.DEV_DRIVE_WORKSPACE || github.workspace }}/packages/frontend/native/${{ steps.filename.outputs.filename }}
           if-no-files-found: error
 
   build-server-native:
@@ -435,7 +440,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+        uses: ./.github/actions/build-rust
+        with:
+          package: 'affine'
+          no-build: 'true'
 
       - name: Install latest nextest release
         uses: taiki-e/install-action@nextest
@@ -717,14 +725,14 @@ jobs:
       matrix:
         spec:
           - {
-              os: macos-14,
+              os: macos-latest,
               platform: macos,
               arch: x64,
               target: x86_64-apple-darwin,
               test: false,
             }
           - {
-              os: macos-14,
+              os: macos-latest,
               platform: macos,
               arch: arm64,
               target: aarch64-apple-darwin,

.github/workflows/copilot-test.yml

@@ -3,9 +3,6 @@ name: Copilot Cron Test
 on:
   workflow_dispatch:
 
-env:
-  PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/node_modules/.cache/ms-playwright
-
 jobs:
   build-server-native:
     name: Build Server native

.github/workflows/release-mobile.yml

@@ -149,9 +149,11 @@ jobs:
           p12-file-base64: ${{ secrets.CERTIFICATES_P12_MOBILE }}
           p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD_MOBILE }}
       - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+        uses: ./.github/actions/build-rust
         with:
-          targets: 'aarch64-apple-ios'
+          target: 'aarch64-apple-ios'
+          package: 'affine_mobile_native'
+          no-build: 'true'
       - name: Build Rust
         run: |
           brew install swiftformat
@@ -195,9 +197,11 @@ jobs:
           hard-link-nm: false
           enableScripts: false
       - name: Setup Rust
-        uses: ./.github/actions/setup-rust
+        uses: ./.github/actions/build-rust
         with:
-          targets: 'aarch64-linux-android'
+          target: 'aarch64-linux-android'
+          package: 'affine_mobile_native'
+          no-build: 'true'
       - name: Cap sync
         run: yarn workspace @affine/android cap sync
       - uses: actions/setup-python@v5

.yarn/patches/yjs-npm-13.6.21-c9f1f3397c.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/yjs.cjs b/dist/yjs.cjs
-index d2dc06ae11a6eb44f8c8445d4298c0e89c3e4da2..a30ab04fa9f3b77666939caa88335c68c40f194c 100644
+index 8a343ca9d0a153e95b27ad337e0553a8cc80d5ca..7199cf6e05d9c2c3491e56c4d4bda109e1755563 100644
 --- a/dist/yjs.cjs
 +++ b/dist/yjs.cjs
-@@ -414,7 +414,7 @@ const equalDeleteSets = (ds1, ds2) => {
+@@ -416,7 +416,7 @@ const equalDeleteSets = (ds1, ds2) => {
   */
  
  
@@ -12,10 +12,10 @@ index d2dc06ae11a6eb44f8c8445d4298c0e89c3e4da2..a30ab04fa9f3b77666939caa88335c68
  /**
   * @typedef {Object} DocOpts
 diff --git a/dist/yjs.mjs b/dist/yjs.mjs
-index 20c9e58c32bcb6bc714200a2561fd1f542c49523..14267e5e36d9781ca3810d5b70ff8c051dac779e 100644
+index 1c29ce7fe8f146b78911d0af9a53d1b516e86494..220fa0faacf4dc2a787e18f7cc79100e7c516e3a 100644
 --- a/dist/yjs.mjs
 +++ b/dist/yjs.mjs
-@@ -378,7 +378,7 @@ const equalDeleteSets = (ds1, ds2) => {
+@@ -379,7 +379,7 @@ const equalDeleteSets = (ds1, ds2) => {
   */
  
  
@@ -25,7 +25,7 @@ index 20c9e58c32bcb6bc714200a2561fd1f542c49523..14267e5e36d9781ca3810d5b70ff8c05
  /**
   * @typedef {Object} DocOpts
 diff --git a/src/utils/Doc.js b/src/utils/Doc.js
-index 62643617c86e57c64dd9babdb792fa8888357ec0..4df5048ab12af1ae0f1154da67f06dce1fda7b49 100644
+index d5165426f2314fc3c2388e64841e7cd6498a92a9..4bb2e5a8b79bb59f08a011af77e69af862312292 100644
 --- a/src/utils/Doc.js
 +++ b/src/utils/Doc.js
 @@ -20,7 +20,7 @@ import * as map from 'lib0/map'

.yarnrc.yml

@@ -12,4 +12,4 @@ npmPublishAccess: public
 
 npmPublishRegistry: "https://registry.npmjs.org"
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

Cargo.lock

@@ -2147,18 +2147,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",

blocksuite/affine/all/package.json

@@ -96,5 +96,6 @@
     "dist",
     "!src/__tests__",
     "!dist/__tests__"
-  ]
+  ],
+  "version": "0.19.0"
 }

blocksuite/affine/all/tsconfig.json

@@ -8,16 +8,7 @@
   "include": ["./src"],
   "references": [
     {
-      "path": "../../framework/global"
-    },
-    {
-      "path": "../../framework/store"
-    },
-    {
-      "path": "../../framework/block-std"
-    },
-    {
-      "path": "../../framework/inline"
+      "path": "../../framework"
     },
     {
       "path": "../../blocks"

blocksuite/affine/block-attachment/package.json

@@ -26,7 +26,7 @@
     "@floating-ui/dom": "^1.6.10",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.1",
+    "@toeverything/theme": "^1.1.3",
     "file-type": "^19.5.0",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",
@@ -41,5 +41,6 @@
     "dist",
     "!src/__tests__",
     "!dist/__tests__"
-  ]
+  ],
+  "version": "0.19.0"
 }

blocksuite/affine/block-attachment/src/attachment-service.ts

@@ -29,10 +29,7 @@ export const AttachmentDropOption = FileDropConfigExtension({
 
     if (!attachmentFiles.length) return false;
 
-    if (
-      targetModel &&
-      !matchFlavours(targetModel, ['affine:surface' as BlockSuite.Flavour])
-    ) {
+    if (targetModel && !matchFlavours(targetModel, ['affine:surface'])) {
       addSiblingAttachmentBlocks(
         std.host,
         attachmentFiles,

blocksuite/affine/block-attachment/src/index.ts

@@ -1,3 +1,7 @@
+import type * as SurfaceEffects from '@blocksuite/affine-block-surface/effects';
+
+declare type _GLOBAL_ = typeof SurfaceEffects;
+
 export * from './adapters/notion-html';
 export * from './attachment-block';
 export * from './attachment-service';

blocksuite/affine/block-attachment/tsconfig.json

@@ -8,16 +8,7 @@
   "include": ["./src"],
   "references": [
     {
-      "path": "../../framework/global"
-    },
-    {
-      "path": "../../framework/store"
-    },
-    {
-      "path": "../../framework/block-std"
-    },
-    {
-      "path": "../../framework/inline"
+      "path": "../../framework"
     },
     {
       "path": "../model"

blocksuite/affine/block-bookmark/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.10",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.1",
+    "@toeverything/theme": "^1.1.3",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",
     "zod": "^3.23.8"
@@ -39,5 +39,6 @@
     "dist",
     "!src/__tests__",
     "!dist/__tests__"
-  ]
+  ],
+  "version": "0.19.0"
 }

blocksuite/affine/block-bookmark/src/components/embed-card-modal/embed-card-create-modal.ts

@@ -6,6 +6,7 @@ import {
   EMBED_CARD_WIDTH,
 } from '@blocksuite/affine-shared/consts';
 import { EmbedOptionProvider } from '@blocksuite/affine-shared/services';
+import { isValidUrl } from '@blocksuite/affine-shared/utils';
 import type { EditorHost } from '@blocksuite/block-std';
 import { ShadowlessElement } from '@blocksuite/block-std';
 import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
@@ -15,8 +16,6 @@ import { html } from 'lit';
 import { property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 
-import type { EdgelessRootBlockComponent } from '../../../../root-block/edgeless/edgeless-root-block.js';
-import { getRootByEditorHost, isValidUrl } from '../../../utils/index.js';
 import { embedCardModalStyles } from './styles.js';
 
 export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
@@ -64,13 +63,6 @@ export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
         targetStyle = embedOptions.styles[0];
       }
 
-      const edgelessRoot = getRootByEditorHost(
-        this.host
-      ) as EdgelessRootBlockComponent | null;
-      if (!edgelessRoot) {
-        return;
-      }
-
       const gfx = this.host.std.get(GfxControllerIdentifier);
       const crud = this.host.std.get(EdgelessCRUDIdentifier);
 
@@ -95,7 +87,10 @@ export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {
         surfaceModel
       );
 
-      gfx.tool.setTool('default');
+      gfx.tool.setTool(
+        // @ts-expect-error FIXME: resolve after gfx tool refactor
+        'default'
+      );
     }
     this.onConfirm();
     this.remove();

blocksuite/affine/block-bookmark/src/components/embed-card-modal/embed-card-edit-modal.ts

@@ -37,8 +37,8 @@ import { choose } from 'lit/directives/choose.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { live } from 'lit/directives/live.js';
 
-import type { LinkableEmbedModel } from '../type.js';
-import { isInternalEmbedModel } from '../type.js';
+import type { LinkableEmbedModel } from './type.js';
+import { isInternalEmbedModel } from './type.js';
 
 export class EmbedCardEditModal extends SignalWatcher(
   WithDisposable(LitElement)

blocksuite/affine/block-bookmark/src/components/embed-card-modal/index.ts

@@ -0,0 +1,4 @@
+export * from './embed-card-caption-edit-modal';
+export * from './embed-card-create-modal';
+export * from './embed-card-edit-modal';
+export * from './type';

blocksuite/affine/block-bookmark/src/components/embed-card-modal/type.ts

@@ -1,4 +1,3 @@
-import { BookmarkBlockComponent } from '@blocksuite/affine-block-bookmark';
 import {
   EmbedFigmaBlockComponent,
   EmbedGithubBlockComponent,
@@ -22,6 +21,8 @@ import {
 } from '@blocksuite/affine-model';
 import type { BlockComponent } from '@blocksuite/block-std';
 
+import { BookmarkBlockComponent } from '../../bookmark-block';
+
 export type ExternalEmbedBlockComponent =
   | BookmarkBlockComponent
   | EmbedFigmaBlockComponent
@@ -37,7 +38,7 @@ export type LinkableEmbedBlockComponent =
   | ExternalEmbedBlockComponent
   | InternalEmbedBlockComponent;
 
-export type EmbedBlockComponent =
+export type BuiltInEmbedBlockComponent =
   | LinkableEmbedBlockComponent
   | EmbedHtmlBlockComponent;
 
@@ -52,11 +53,11 @@ export type InternalEmbedModel = EmbedLinkedDocModel | EmbedSyncedDocModel;
 
 export type LinkableEmbedModel = ExternalEmbedModel | InternalEmbedModel;
 
-export type EmbedModel = LinkableEmbedModel | EmbedHtmlModel;
+export type BuiltInEmbedModel = LinkableEmbedModel | EmbedHtmlModel;
 
 export function isEmbedCardBlockComponent(
   block: BlockComponent
-): block is EmbedBlockComponent {
+): block is BuiltInEmbedBlockComponent {
   return (
     block instanceof BookmarkBlockComponent ||
     block instanceof EmbedFigmaBlockComponent ||
@@ -70,7 +71,7 @@ export function isEmbedCardBlockComponent(
 }
 
 export function isInternalEmbedModel(
-  model: EmbedModel
+  model: BuiltInEmbedModel
 ): model is InternalEmbedModel {
   return (
     model instanceof EmbedLinkedDocModel || model instanceof EmbedSyncedDocModel

blocksuite/affine/block-bookmark/src/components/index.ts

@@ -0,0 +1,2 @@
+export * from './bookmark-card';
+export * from './embed-card-modal';

blocksuite/affine/block-bookmark/src/effects.ts

@@ -4,6 +4,11 @@ import type { BookmarkBlockService } from './bookmark-service';
 import type { insertBookmarkCommand } from './commands/insert-bookmark';
 import type { insertLinkByQuickSearchCommand } from './commands/insert-link-by-quick-search';
 import { BookmarkCard } from './components/bookmark-card';
+import {
+  EmbedCardCreateModal,
+  EmbedCardEditCaptionEditModal,
+  EmbedCardEditModal,
+} from './components/embed-card-modal';
 
 export function effects() {
   customElements.define(
@@ -12,6 +17,13 @@ export function effects() {
   );
   customElements.define('affine-bookmark', BookmarkBlockComponent);
   customElements.define('bookmark-card', BookmarkCard);
+
+  customElements.define('embed-card-create-modal', EmbedCardCreateModal);
+  customElements.define('embed-card-edit-modal', EmbedCardEditModal);
+  customElements.define(
+    'embed-card-caption-edit-modal',
+    EmbedCardEditCaptionEditModal
+  );
 }
 
 declare global {

blocksuite/affine/block-bookmark/src/index.ts

@@ -2,3 +2,4 @@ export * from './adapters';
 export * from './bookmark-block';
 export * from './bookmark-service';
 export * from './bookmark-spec';
+export * from './components';

blocksuite/affine/block-bookmark/tsconfig.json

@@ -8,16 +8,7 @@
   "include": ["./src"],
   "references": [
     {
-      "path": "../../framework/global"
-    },
-    {
-      "path": "../../framework/store"
-    },
-    {
-      "path": "../../framework/block-std"
-    },
-    {
-      "path": "../../framework/inline"
+      "path": "../../framework"
     },
     {
       "path": "../model"

blocksuite/affine/block-code/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "@blocksuite/affine-block-code",
+  "description": "Code block for BlockSuite.",
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "test:unit": "nx vite:test --run --passWithNoTests",
+    "test:unit:coverage": "nx vite:test --run --coverage",
+    "test:e2e": "playwright test"
+  },
+  "sideEffects": false,
+  "keywords": [],
+  "author": "toeverything",
+  "license": "MIT",
+  "dependencies": {
+    "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-model": "workspace:*",
+    "@blocksuite/affine-shared": "workspace:*",
+    "@blocksuite/block-std": "workspace:*",
+    "@blocksuite/global": "workspace:*",
+    "@blocksuite/inline": "workspace:*",
+    "@blocksuite/store": "workspace:*",
+    "@floating-ui/dom": "^1.6.10",
+    "@lit/context": "^1.1.2",
+    "@preact/signals-core": "^1.8.0",
+    "@toeverything/theme": "^1.1.3",
+    "@types/mdast": "^4.0.4",
+    "lit": "^3.2.0",
+    "minimatch": "^10.0.1",
+    "shiki": "^1.14.1",
+    "zod": "^3.23.8"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./effects": "./src/effects.ts"
+  },
+  "files": [
+    "src",
+    "dist",
+    "!src/__tests__",
+    "!dist/__tests__"
+  ],
+  "version": "0.19.0"
+}

blocksuite/affine/block-code/src/clipboard/index.ts

@@ -1,5 +1,6 @@
 import {
   HtmlAdapter,
+  pasteMiddleware,
   PlainTextAdapter,
 } from '@blocksuite/affine-shared/adapters';
 import {
@@ -7,9 +8,7 @@ import {
   Clipboard,
   type UIEventHandler,
 } from '@blocksuite/block-std';
-import { assertExists, DisposableGroup } from '@blocksuite/global/utils';
-
-import { pasteMiddleware } from '../../root-block/clipboard/middlewares/index.js';
+import { DisposableGroup } from '@blocksuite/global/utils';
 
 export class CodeClipboardController {
   private _clipboard!: Clipboard;
@@ -43,17 +42,15 @@ export class CodeClipboardController {
       .try(cmd => [
         cmd.getTextSelection().inline<'currentSelectionPath'>((ctx, next) => {
           const textSelection = ctx.currentTextSelection;
-          assertExists(textSelection);
+          if (!textSelection) return;
           const end = textSelection.to ?? textSelection.from;
           next({ currentSelectionPath: end.blockId });
         }),
         cmd.getBlockSelections().inline<'currentSelectionPath'>((ctx, next) => {
           const currentBlockSelections = ctx.currentBlockSelections;
-          assertExists(currentBlockSelections);
+          if (!currentBlockSelections) return;
           const blockSelection = currentBlockSelections.at(-1);
-          if (!blockSelection) {
-            return;
-          }
+          if (!blockSelection) return;
           next({ currentSelectionPath: blockSelection.blockId });
         }),
       ])

blocksuite/affine/block-code/src/code-block-spec.ts

@@ -6,13 +6,13 @@ import {
 } from '@blocksuite/block-std';
 import { literal, unsafeStatic } from 'lit/static-html.js';
 
-import { AFFINE_CODE_TOOLBAR_WIDGET } from '../root-block/widgets/code-toolbar/index.js';
 import { CodeBlockAdapterExtensions } from './adapters/extension.js';
 import {
   CodeBlockInlineManagerExtension,
   CodeBlockUnitSpecExtension,
 } from './code-block-inline.js';
 import { CodeBlockService } from './code-block-service.js';
+import { AFFINE_CODE_TOOLBAR_WIDGET } from './code-toolbar/index.js';
 
 export const CodeBlockSpec: ExtensionType[] = [
   FlavourExtension('affine:code'),

blocksuite/affine/block-code/src/code-block.ts

@@ -5,7 +5,10 @@ import {
 } from '@blocksuite/affine-components/rich-text';
 import type { CodeBlockModel } from '@blocksuite/affine-model';
 import { BRACKET_PAIRS, NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
-import { NotificationProvider } from '@blocksuite/affine-shared/services';
+import {
+  DocModeProvider,
+  NotificationProvider,
+} from '@blocksuite/affine-shared/services';
 import { getViewportElement } from '@blocksuite/affine-shared/utils';
 import type { BlockComponent } from '@blocksuite/block-std';
 import { getInlineRangeProvider } from '@blocksuite/block-std';
@@ -24,7 +27,6 @@ import { query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import type { ThemedToken } from 'shiki';
 
-import { EdgelessRootBlockComponent } from '../root-block/edgeless/edgeless-root-block.js';
 import { CodeClipboardController } from './clipboard/index.js';
 import { CodeBlockInlineManagerExtension } from './code-block-inline.js';
 import type { CodeBlockService } from './code-block-service.js';
@@ -72,9 +74,8 @@ export class CodeBlockComponent extends CaptionedBlockComponent<
   }
 
   override get topContenteditableElement() {
-    if (this.rootComponent instanceof EdgelessRootBlockComponent) {
-      const el = this.closest<BlockComponent>(NOTE_SELECTOR);
-      return el;
+    if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/block-code/src/code-toolbar/components/lang-button.ts

@@ -11,7 +11,7 @@ import { property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { html } from 'lit/static-html.js';
 
-import type { CodeBlockComponent } from '../../../../code-block/code-block.js';
+import type { CodeBlockComponent } from '../..';
 
 export class LanguageListButton extends WithDisposable(
   SignalWatcher(LitElement)

blocksuite/affine/block-code/src/code-toolbar/context.ts

@@ -1,6 +1,6 @@
 import { MenuContext } from '@blocksuite/affine-components/toolbar';
 
-import type { CodeBlockComponent } from '../../../code-block/code-block.js';
+import type { CodeBlockComponent } from '../code-block';
 
 export class CodeBlockToolbarContext extends MenuContext {
   override close = () => {

blocksuite/affine/block-code/src/code-toolbar/index.ts

@@ -13,7 +13,7 @@ import { WidgetComponent } from '@blocksuite/block-std';
 import { limitShift, shift } from '@floating-ui/dom';
 import { html } from 'lit';
 
-import type { CodeBlockComponent } from '../../../code-block/code-block.js';
+import type { CodeBlockComponent } from '../code-block.js';
 import { MORE_GROUPS, PRIMARY_GROUPS } from './config.js';
 import { CodeBlockToolbarContext } from './context.js';
 

blocksuite/affine/block-code/src/effects.ts

@@ -0,0 +1,35 @@
+import type * as CommandsType from '@blocksuite/affine-shared/commands';
+
+import { CodeBlockComponent } from './code-block';
+import type { CodeBlockConfig } from './code-block-config';
+import {
+  AFFINE_CODE_TOOLBAR_WIDGET,
+  AffineCodeToolbarWidget,
+} from './code-toolbar';
+import { AffineCodeToolbar } from './code-toolbar/components/code-toolbar';
+import { LanguageListButton } from './code-toolbar/components/lang-button';
+import { AffineCodeUnit } from './highlight/affine-code-unit';
+
+export function effects() {
+  customElements.define('language-list-button', LanguageListButton);
+  customElements.define('affine-code-toolbar', AffineCodeToolbar);
+  customElements.define(AFFINE_CODE_TOOLBAR_WIDGET, AffineCodeToolbarWidget);
+  customElements.define('affine-code-unit', AffineCodeUnit);
+  customElements.define('affine-code', CodeBlockComponent);
+}
+
+declare type _GLOBAL_ = typeof CommandsType;
+
+declare global {
+  namespace BlockSuite {
+    interface BlockConfigs {
+      'affine:code': CodeBlockConfig;
+    }
+  }
+
+  interface HTMLElementTagNameMap {
+    'language-list-button': LanguageListButton;
+    'affine-code-toolbar': AffineCodeToolbar;
+    [AFFINE_CODE_TOOLBAR_WIDGET]: AffineCodeToolbarWidget;
+  }
+}

blocksuite/affine/block-code/src/index.ts

@@ -0,0 +1,5 @@
+export * from './adapters';
+export * from './code-block';
+export * from './code-block-config';
+export * from './code-block-spec';
+export * from './code-toolbar';

blocksuite/affine/block-code/tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src/",
+    "outDir": "./dist/",
+    "noEmit": false
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../../framework"
+    },
+    {
+      "path": "../model"
+    },
+    {
+      "path": "../components"
+    },
+    {
+      "path": "../shared"
+    }
+  ]
+}

blocksuite/affine/block-data-view/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "@blocksuite/affine-block-data-view",
+  "description": "Data view block for BlockSuite.",
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "test:unit": "nx vite:test --run --passWithNoTests",
+    "test:unit:coverage": "nx vite:test --run --coverage",
+    "test:e2e": "playwright test"
+  },
+  "sideEffects": false,
+  "keywords": [],
+  "author": "toeverything",
+  "license": "MIT",
+  "dependencies": {
+    "@blocksuite/affine-block-database": "workspace:*",
+    "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-model": "workspace:*",
+    "@blocksuite/affine-shared": "workspace:*",
+    "@blocksuite/block-std": "workspace:*",
+    "@blocksuite/data-view": "workspace:*",
+    "@blocksuite/global": "workspace:*",
+    "@blocksuite/inline": "workspace:*",
+    "@blocksuite/store": "workspace:*",
+    "@floating-ui/dom": "^1.6.10",
+    "@lit/context": "^1.1.2",
+    "@preact/signals-core": "^1.8.0",
+    "@toeverything/theme": "^1.1.3",
+    "@types/mdast": "^4.0.4",
+    "lit": "^3.2.0",
+    "minimatch": "^10.0.1",
+    "zod": "^3.23.8"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./effects": "./src/effects.ts"
+  },
+  "files": [
+    "src",
+    "dist",
+    "!src/__tests__",
+    "!dist/__tests__"
+  ],
+  "version": "0.19.0"
+}

blocksuite/affine/block-data-view/src/block-meta/todo.ts

@@ -1,7 +1,7 @@
+import { richTextColumnConfig } from '@blocksuite/affine-block-database';
 import { type ListBlockModel, ListBlockSchema } from '@blocksuite/affine-model';
 import { propertyPresets } from '@blocksuite/data-view/property-presets';
 
-import { richTextColumnConfig } from '../../database-block/properties/rich-text/cell-renderer.js';
 import { createBlockMeta } from './base.js';
 
 export const todoMeta = createBlockMeta<ListBlockModel>({

blocksuite/affine/block-data-view/src/columns/index.ts

@@ -1,8 +1,7 @@
+import { richTextColumnConfig } from '@blocksuite/affine-block-database';
 import type { PropertyMetaConfig } from '@blocksuite/data-view';
 import { propertyPresets } from '@blocksuite/data-view/property-presets';
 
-import { richTextColumnConfig } from '../../database-block/properties/rich-text/cell-renderer.js';
-
 export const queryBlockColumns = [
   propertyPresets.datePropertyConfig,
   propertyPresets.numberPropertyConfig,

blocksuite/affine/block-data-view/src/data-source.ts

@@ -1,3 +1,7 @@
+import {
+  databaseBlockAllPropertyMap,
+  databasePropertyConverts,
+} from '@blocksuite/affine-block-database';
 import type { Column } from '@blocksuite/affine-model';
 import {
   insertPositionToIndex,
@@ -9,10 +13,6 @@ import { propertyPresets } from '@blocksuite/data-view/property-presets';
 import { assertExists, Slot } from '@blocksuite/global/utils';
 import type { Block, Doc } from '@blocksuite/store';
 
-import {
-  databaseBlockAllPropertyMap,
-  databasePropertyConverts,
-} from '../database-block/properties/index.js';
 import type { BlockMeta } from './block-meta/base.js';
 import { blockMetaMap } from './block-meta/index.js';
 import { queryBlockAllColumnMap, queryBlockColumns } from './columns/index.js';

blocksuite/affine/block-data-view/src/data-view-block.ts

@@ -1,4 +1,4 @@
-import type { NoteBlockComponent } from '@blocksuite/affine-block-note';
+import { BlockRenderer, NoteRenderer } from '@blocksuite/affine-block-database';
 import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
 import {
   menu,
@@ -12,12 +12,17 @@ import {
 } from '@blocksuite/affine-components/icons';
 import { PeekViewProvider } from '@blocksuite/affine-components/peek';
 import { toast } from '@blocksuite/affine-components/toast';
+import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
+  DocModeProvider,
   NotificationProvider,
   type TelemetryEventMap,
   TelemetryProvider,
 } from '@blocksuite/affine-shared/services';
-import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std';
+import {
+  type BlockComponent,
+  RANGE_SYNC_EXCLUDE_ATTR,
+} from '@blocksuite/block-std';
 import {
   createRecordDetail,
   createUniComponentFromWebComponent,
@@ -39,12 +44,6 @@ import { computed, signal } from '@preact/signals-core';
 import { css, nothing, unsafeCSS } from 'lit';
 import { html } from 'lit/static-html.js';
 
-import { BlockRenderer } from '../database-block/detail-panel/block-renderer.js';
-import { NoteRenderer } from '../database-block/detail-panel/note-renderer.js';
-import {
-  EdgelessRootBlockComponent,
-  type RootService,
-} from '../root-block/index.js';
 import { BlockQueryDataSource } from './data-source.js';
 import type { DataViewBlockModel } from './data-view-model.js';
 
@@ -154,10 +153,6 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
     };
   };
 
-  getRootService = () => {
-    return this.std.getService<RootService>('affine:page');
-  };
-
   headerWidget: DataViewWidget = defineUniComponent(
     (props: DataViewWidgetProps) => {
       return html`
@@ -231,9 +226,8 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
   }
 
   override get topContenteditableElement() {
-    if (this.rootComponent instanceof EdgelessRootBlockComponent) {
-      const note = this.closest<NoteBlockComponent>('affine-note');
-      return note;
+    if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/block-data-view/src/effects.ts

@@ -0,0 +1,14 @@
+import { DataViewBlockComponent } from './data-view-block';
+import type { DataViewBlockModel } from './data-view-model';
+
+export function effects() {
+  customElements.define('affine-data-view', DataViewBlockComponent);
+}
+
+declare global {
+  namespace BlockSuite {
+    interface BlockModels {
+      'affine:data-view': DataViewBlockModel;
+    }
+  }
+}

blocksuite/affine/block-data-view/src/index.ts

@@ -0,0 +1,3 @@
+export * from './data-view-block.js';
+export * from './data-view-model.js';
+export * from './data-view-spec.js';

blocksuite/affine/block-data-view/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "./src/",
+    "outDir": "./dist/",
+    "noEmit": false
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../../framework"
+    },
+    {
+      "path": "../model"
+    },
+    {
+      "path": "../components"
+    },
+    {
+      "path": "../shared"
+    },
+    {
+      "path": "../data-view"
+    },
+    {
+      "path": "../block-database"
+    }
+  ]
+}

blocksuite/affine/block-database/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@blocksuite/affine-block-database",
+  "description": "Database block for BlockSuite.",
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "test:unit": "nx vite:test --run --passWithNoTests",
+    "test:unit:coverage": "nx vite:test --run --coverage",
+    "test:e2e": "playwright test"
+  },
+  "sideEffects": false,
+  "keywords": [],
+  "author": "toeverything",
+  "license": "MIT",
+  "dependencies": {
+    "@blocksuite/affine-components": "workspace:*",
+    "@blocksuite/affine-model": "workspace:*",
+    "@blocksuite/affine-shared": "workspace:*",
+    "@blocksuite/affine-widget-drag-handle": "workspace:*",
+    "@blocksuite/block-std": "workspace:*",
+    "@blocksuite/data-view": "workspace:*",
+    "@blocksuite/global": "workspace:*",
+    "@blocksuite/inline": "workspace:*",
+    "@blocksuite/store": "workspace:*",
+    "@floating-ui/dom": "^1.6.10",
+    "@lit/context": "^1.1.2",
+    "@preact/signals-core": "^1.8.0",
+    "@toeverything/theme": "^1.1.3",
+    "@types/mdast": "^4.0.4",
+    "date-fns": "^4.0.0",
+    "lit": "^3.2.0",
+    "minimatch": "^10.0.1",
+    "zod": "^3.23.8"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./effects": "./src/effects.ts"
+  },
+  "files": [
+    "src",
+    "dist",
+    "!src/__tests__",
+    "!dist/__tests__"
+  ],
+  "version": "0.19.0"
+}

blocksuite/affine/block-database/src/adapters/index.ts

@@ -0,0 +1,4 @@
+export * from './html';
+export * from './markdown';
+export * from './notion-html';
+export * from './plain-text';

blocksuite/affine/block-database/src/data-source.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import type { DatabaseBlockModel } from '@blocksuite/affine-model';
 import {
   insertPositionToIndex,

blocksuite/affine/block-database/src/database-block.ts

@@ -1,4 +1,3 @@
-import type { NoteBlockComponent } from '@blocksuite/affine-block-note';
 import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
 import {
   menu,
@@ -16,7 +15,11 @@ import {
   type TelemetryEventMap,
   TelemetryProvider,
 } from '@blocksuite/affine-shared/services';
-import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/block-std';
+import { getDropResult } from '@blocksuite/affine-widget-drag-handle';
+import {
+  type BlockComponent,
+  RANGE_SYNC_EXCLUDE_ATTR,
+} from '@blocksuite/block-std';
 import {
   createRecordDetail,
   createUniComponentFromWebComponent,
@@ -45,8 +48,6 @@ import { autoUpdate } from '@floating-ui/dom';
 import { computed, signal } from '@preact/signals-core';
 import { css, html, nothing, unsafeCSS } from 'lit';
 
-import { EdgelessRootBlockComponent } from '../root-block/index.js';
-import { getDropResult } from '../root-block/widgets/drag-handle/utils.js';
 import { popSideDetail } from './components/layout.js';
 import type { DatabaseOptionsConfig } from './config.js';
 import { HostContextKey } from './context/host-context.js';
@@ -346,14 +347,13 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<
   get optionsConfig(): DatabaseOptionsConfig {
     return {
       configure: (_model, options) => options,
-      ...this.std.getConfig('affine:page')?.databaseOptions,
+      ...this.std.getConfig('affine:database'),
     };
   }
 
   override get topContenteditableElement() {
-    if (this.rootComponent instanceof EdgelessRootBlockComponent) {
-      const note = this.closest<NoteBlockComponent>(NOTE_SELECTOR);
-      return note;
+    if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/block-database/src/detail-panel/note-renderer.ts

@@ -1,8 +1,8 @@
-import { REFERENCE_NODE } from '@blocksuite/affine-components/rich-text';
 import type {
   DatabaseBlockModel,
   RootBlockModel,
 } from '@blocksuite/affine-model';
+import { REFERENCE_NODE } from '@blocksuite/affine-shared/consts';
 import { TelemetryProvider } from '@blocksuite/affine-shared/services';
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import {

blocksuite/affine/block-database/src/effects.ts

@@ -0,0 +1,68 @@
+import type { insertDatabaseBlockCommand } from './commands';
+import { CenterPeek } from './components/layout';
+import { DatabaseTitle } from './components/title';
+import type { DatabaseOptionsConfig } from './config';
+import { DatabaseBlockComponent } from './database-block';
+import type { DatabaseBlockService } from './database-service';
+import { BlockRenderer } from './detail-panel/block-renderer';
+import { NoteRenderer } from './detail-panel/note-renderer';
+import { LinkCell, LinkCellEditing } from './properties/link/cell-renderer';
+import { LinkNode } from './properties/link/components/link-node';
+import {
+  RichTextCell,
+  RichTextCellEditing,
+} from './properties/rich-text/cell-renderer';
+import { IconCell } from './properties/title/icon';
+import {
+  HeaderAreaTextCell,
+  HeaderAreaTextCellEditing,
+} from './properties/title/text';
+
+export function effects() {
+  customElements.define('affine-database-title', DatabaseTitle);
+  customElements.define('data-view-header-area-icon', IconCell);
+  customElements.define('affine-database-link-cell', LinkCell);
+  customElements.define('affine-database-link-cell-editing', LinkCellEditing);
+  customElements.define('data-view-header-area-text', HeaderAreaTextCell);
+  customElements.define(
+    'data-view-header-area-text-editing',
+    HeaderAreaTextCellEditing
+  );
+  customElements.define('affine-database-rich-text-cell', RichTextCell);
+  customElements.define(
+    'affine-database-rich-text-cell-editing',
+    RichTextCellEditing
+  );
+  customElements.define('center-peek', CenterPeek);
+  customElements.define('database-datasource-note-renderer', NoteRenderer);
+  customElements.define('database-datasource-block-renderer', BlockRenderer);
+  customElements.define('affine-database-link-node', LinkNode);
+  customElements.define('affine-database', DatabaseBlockComponent);
+}
+
+declare global {
+  namespace BlockSuite {
+    interface BlockConfigs {
+      'affine:database': Partial<DatabaseOptionsConfig>;
+    }
+
+    interface CommandContext {
+      insertedDatabaseBlockId?: string;
+    }
+
+    interface Commands {
+      /**
+       * insert a database block after or before the current block selection
+       * @param latex the LaTeX content. A input dialog will be shown if not provided
+       * @param removeEmptyLine remove the current block if it is empty
+       * @param place where to insert the LaTeX block
+       * @returns the id of the inserted LaTeX block
+       */
+      insertDatabaseBlock: typeof insertDatabaseBlockCommand;
+    }
+
+    interface BlockServices {
+      'affine:database': DatabaseBlockService;
+    }
+  }
+}

blocksuite/affine/block-database/src/index.ts

@@ -0,0 +1,16 @@
+import type * as CommandType from '@blocksuite/affine-shared/commands';
+
+declare type _GLOBAL_ = typeof CommandType;
+
+export * from './adapters';
+export type { DatabaseOptionsConfig } from './config';
+export * from './data-source';
+export * from './database-block';
+export * from './database-service';
+export * from './database-spec';
+export * from './detail-panel/block-renderer';
+export * from './detail-panel/note-renderer';
+export * from './properties';
+export * from './properties/rich-text/cell-renderer';
+export * from './properties/utils';
+export * from './utils/block-utils';