chore: sync affine blocksuite to packages (#9097)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: Saul-Mirone

packages/affine/all/package.json

@@ -55,6 +55,7 @@
     "@blocksuite/affine-widget-edgeless-auto-connect": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/affine-widget-frame-title": "workspace:*",
+    "@blocksuite/affine-widget-linked-doc": "workspace:*",
     "@blocksuite/affine-widget-remote-selection": "workspace:*",
     "@blocksuite/affine-widget-scroll-anchoring": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
@@ -115,6 +116,7 @@
     "./widgets/edgeless-auto-connect": "./src/widgets/edgeless-auto-connect.ts",
     "./widgets/edgeless-toolbar": "./src/widgets/edgeless-toolbar.ts",
     "./widgets/frame-title": "./src/widgets/frame-title.ts",
+    "./widgets/linked-doc": "./src/widgets/linked-doc.ts",
     "./widgets/remote-selection": "./src/widgets/remote-selection.ts",
     "./widgets/scroll-anchoring": "./src/widgets/scroll-anchoring.ts",
     "./widgets/slash-menu": "./src/widgets/slash-menu.ts",

packages/affine/all/src/__tests__/adapters/markdown.unit.spec.ts

@@ -3769,6 +3769,48 @@ bbb
       });
       expect(nanoidReplacement(rawBlockSnapshot)).toEqual(blockSnapshot);
     });
+
+    test('escapes dollar signs followed by a digit or space and digit', async () => {
+      const markdown =
+        'The price of the T-shirt is $9.15 and the price of the hat is $ 8\n';
+      const blockSnapshot: BlockSnapshot = {
+        type: 'block',
+        id: 'matchesReplaceMap[0]',
+        flavour: 'affine:note',
+        props: {
+          xywh: '[0,0,800,95]',
+          background: DefaultTheme.noteBackgrounColor,
+          index: 'a0',
+          hidden: false,
+          displayMode: NoteDisplayMode.DocAndEdgeless,
+        },
+        children: [
+          {
+            type: 'block',
+            id: 'matchesReplaceMap[1]',
+            flavour: 'affine:paragraph',
+            props: {
+              type: 'text',
+              text: {
+                '$blocksuite:internal:text$': true,
+                delta: [
+                  {
+                    insert:
+                      'The price of the T-shirt is $9.15 and the price of the hat is $ 8',
+                  },
+                ],
+              },
+            },
+            children: [],
+          },
+        ],
+      };
+      const mdAdapter = new MarkdownAdapter(createJob(), provider);
+      const rawBlockSnapshot = await mdAdapter.toBlockSnapshot({
+        file: markdown,
+      });
+      expect(nanoidReplacement(rawBlockSnapshot)).toEqual(blockSnapshot);
+    });
   });
 
   test('reference', async () => {

packages/affine/all/src/adapters/extension.ts

@@ -24,36 +24,46 @@ import { defaultMarkdownPreprocessors } from './markdown/preprocessor';
 import { defaultBlockNotionHtmlAdapterMatchers } from './notion-html/block-matcher';
 import { defaultBlockPlainTextAdapterMatchers } from './plain-text/block-matcher';
 
-export const AdapterFactoryExtensions: ExtensionType[] = [
-  AttachmentAdapterFactoryExtension,
-  ImageAdapterFactoryExtension,
-  MarkdownAdapterFactoryExtension,
-  PlainTextAdapterFactoryExtension,
-  HtmlAdapterFactoryExtension,
-  NotionTextAdapterFactoryExtension,
-  NotionHtmlAdapterFactoryExtension,
-  MixTextAdapterFactoryExtension,
-];
+export function getAdapterFactoryExtensions(): ExtensionType[] {
+  return [
+    AttachmentAdapterFactoryExtension,
+    ImageAdapterFactoryExtension,
+    MarkdownAdapterFactoryExtension,
+    PlainTextAdapterFactoryExtension,
+    HtmlAdapterFactoryExtension,
+    NotionTextAdapterFactoryExtension,
+    NotionHtmlAdapterFactoryExtension,
+    MixTextAdapterFactoryExtension,
+  ];
+}
 
-export const HtmlAdapterExtension: ExtensionType[] = [
-  ...HtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockHtmlAdapterMatchers,
-  ...InlineDeltaToHtmlAdapterExtensions,
-];
+export function getHtmlAdapterExtensions(): ExtensionType[] {
+  return [
+    ...HtmlInlineToDeltaAdapterExtensions,
+    ...defaultBlockHtmlAdapterMatchers,
+    ...InlineDeltaToHtmlAdapterExtensions,
+  ];
+}
 
-export const MarkdownAdapterExtension: ExtensionType[] = [
-  ...MarkdownInlineToDeltaAdapterExtensions,
-  ...defaultBlockMarkdownAdapterMatchers,
-  ...InlineDeltaToMarkdownAdapterExtensions,
-  ...defaultMarkdownPreprocessors,
-];
+export function getMarkdownAdapterExtensions(): ExtensionType[] {
+  return [
+    ...MarkdownInlineToDeltaAdapterExtensions,
+    ...defaultBlockMarkdownAdapterMatchers,
+    ...InlineDeltaToMarkdownAdapterExtensions,
+    ...defaultMarkdownPreprocessors,
+  ];
+}
 
-export const NotionHtmlAdapterExtension: ExtensionType[] = [
-  ...NotionHtmlInlineToDeltaAdapterExtensions,
-  ...defaultBlockNotionHtmlAdapterMatchers,
-];
+export function getNotionHtmlAdapterExtensions(): ExtensionType[] {
+  return [
+    ...NotionHtmlInlineToDeltaAdapterExtensions,
+    ...defaultBlockNotionHtmlAdapterMatchers,
+  ];
+}
 
-export const PlainTextAdapterExtension: ExtensionType[] = [
-  ...defaultBlockPlainTextAdapterMatchers,
-  ...InlineDeltaToPlainTextAdapterExtensions,
-];
+export function getPlainTextAdapterExtensions(): ExtensionType[] {
+  return [
+    ...defaultBlockPlainTextAdapterMatchers,
+    ...InlineDeltaToPlainTextAdapterExtensions,
+  ];
+}

packages/affine/all/src/extensions/store.ts

@@ -51,11 +51,11 @@ import {
 import type { ExtensionType } from '@blocksuite/store';
 
 import {
-  AdapterFactoryExtensions,
-  HtmlAdapterExtension,
-  MarkdownAdapterExtension,
-  NotionHtmlAdapterExtension,
-  PlainTextAdapterExtension,
+  getAdapterFactoryExtensions,
+  getHtmlAdapterExtensions,
+  getMarkdownAdapterExtensions,
+  getNotionHtmlAdapterExtensions,
+  getPlainTextAdapterExtensions,
 } from '../adapters/extension.js';
 
 export const StoreExtensions: ExtensionType[] = [
@@ -96,11 +96,11 @@ export const StoreExtensions: ExtensionType[] = [
   DatabaseSelectionExtension,
   TableSelectionExtension,
 
-  HtmlAdapterExtension,
-  MarkdownAdapterExtension,
-  NotionHtmlAdapterExtension,
-  PlainTextAdapterExtension,
-  AdapterFactoryExtensions,
+  getHtmlAdapterExtensions(),
+  getMarkdownAdapterExtensions(),
+  getNotionHtmlAdapterExtensions(),
+  getPlainTextAdapterExtensions(),
+  getAdapterFactoryExtensions(),
 
   FeatureFlagService,
   LinkPreviewerService,

packages/affine/all/src/widgets/linked-doc.ts

@@ -0,0 +1 @@
+export * from '@blocksuite/affine-widget-linked-doc';

packages/affine/all/tsconfig.json

@@ -7,29 +7,29 @@
   },
   "include": ["./src"],
   "references": [
-    { "path": "../blocks/block-attachment" },
-    { "path": "../blocks/block-bookmark" },
-    { "path": "../blocks/block-callout" },
-    { "path": "../blocks/block-code" },
-    { "path": "../blocks/block-data-view" },
-    { "path": "../blocks/block-database" },
-    { "path": "../blocks/block-divider" },
-    { "path": "../blocks/block-edgeless-text" },
-    { "path": "../blocks/block-embed" },
-    { "path": "../blocks/block-frame" },
-    { "path": "../blocks/block-image" },
-    { "path": "../blocks/block-latex" },
-    { "path": "../blocks/block-list" },
-    { "path": "../blocks/block-note" },
-    { "path": "../blocks/block-paragraph" },
-    { "path": "../blocks/block-root" },
-    { "path": "../blocks/block-surface" },
-    { "path": "../blocks/block-surface-ref" },
-    { "path": "../blocks/block-table" },
+    { "path": "../blocks/attachment" },
+    { "path": "../blocks/bookmark" },
+    { "path": "../blocks/callout" },
+    { "path": "../blocks/code" },
+    { "path": "../blocks/data-view" },
+    { "path": "../blocks/database" },
+    { "path": "../blocks/divider" },
+    { "path": "../blocks/edgeless-text" },
+    { "path": "../blocks/embed" },
+    { "path": "../blocks/frame" },
+    { "path": "../blocks/image" },
+    { "path": "../blocks/latex" },
+    { "path": "../blocks/list" },
+    { "path": "../blocks/note" },
+    { "path": "../blocks/paragraph" },
+    { "path": "../blocks/root" },
+    { "path": "../blocks/surface" },
+    { "path": "../blocks/surface-ref" },
+    { "path": "../blocks/table" },
     { "path": "../components" },
-    { "path": "../fragments/fragment-doc-title" },
-    { "path": "../fragments/fragment-frame-panel" },
-    { "path": "../fragments/fragment-outline" },
+    { "path": "../fragments/doc-title" },
+    { "path": "../fragments/frame-panel" },
+    { "path": "../fragments/outline" },
     { "path": "../gfx/brush" },
     { "path": "../gfx/connector" },
     { "path": "../gfx/group" },
@@ -48,14 +48,15 @@
     { "path": "../model" },
     { "path": "../rich-text" },
     { "path": "../shared" },
-    { "path": "../widgets/widget-drag-handle" },
-    { "path": "../widgets/widget-edgeless-auto-connect" },
-    { "path": "../widgets/widget-edgeless-toolbar" },
-    { "path": "../widgets/widget-frame-title" },
-    { "path": "../widgets/widget-remote-selection" },
-    { "path": "../widgets/widget-scroll-anchoring" },
-    { "path": "../widgets/widget-slash-menu" },
-    { "path": "../widgets/widget-toolbar" },
+    { "path": "../widgets/drag-handle" },
+    { "path": "../widgets/edgeless-auto-connect" },
+    { "path": "../widgets/edgeless-toolbar" },
+    { "path": "../widgets/frame-title" },
+    { "path": "../widgets/linked-doc" },
+    { "path": "../widgets/remote-selection" },
+    { "path": "../widgets/scroll-anchoring" },
+    { "path": "../widgets/slash-menu" },
+    { "path": "../widgets/toolbar" },
     { "path": "../data-view" },
     { "path": "../../framework/global" },
     { "path": "../../framework/std" },

packages/affine/blocks/block-attachment/package.json renamed to packages/affine/blocks/attachment/package.json

@@ -7,12 +7,12 @@
   },
   "include": ["./src"],
   "references": [
-    { "path": "../block-note" },
-    { "path": "../block-surface" },
+    { "path": "../embed" },
+    { "path": "../surface" },
     { "path": "../../components" },
     { "path": "../../model" },
     { "path": "../../shared" },
-    { "path": "../../widgets/widget-slash-menu" },
+    { "path": "../../widgets/slash-menu" },
     { "path": "../../../framework/global" },
     { "path": "../../../framework/std" },
     { "path": "../../../framework/store" }