There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(editor): support text highlight html adapter (#9632)
donteatfriedrice5c4e87ddb558
diff --git a/blocksuite/affine/block-embed/src/common/adapters/utils.ts b/blocksuite/affine/block-embed/src/common/adapters/utils.tsdeleted file mode 100644index 8f2607c106..0000000000--- a/blocksuite/affine/block-embed/src/common/adapters/utils.ts+++ /dev/null@@ -1,13 +0,0 @@-import type { ReferenceParams } from '@blocksuite/affine-model';-import { TextUtils } from '@blocksuite/affine-shared/adapters';--export function generateDocUrl(- docBaseUrl: string,- pageId: string,- params: ReferenceParams-) {- const search = TextUtils.toURLSearchParams(params);- const query = search?.size ? `?${search.toString()}` : '';- const url = docBaseUrl ? `${docBaseUrl}/${pageId}${query}` : '';- return url;-}diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/html.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/html.tsindex aa29fdab01..cd81dac2a9 100644--- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/html.ts+++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/html.ts@@ -2,10 +2,9 @@ import { EmbedLinkedDocBlockSchema } from '@blocksuite/affine-model';import {BlockHtmlAdapterExtension,type BlockHtmlAdapterMatcher,+ TextUtils,} from '@blocksuite/affine-shared/adapters';-import { generateDocUrl } from '../../common/adapters/utils.js';-export const embedLinkedDocBlockHtmlAdapterMatcher: BlockHtmlAdapterMatcher = {flavour: EmbedLinkedDocBlockSchema.model.flavour,toMatch: () => false,@@ -19,7 +18,7 @@ export const embedLinkedDocBlockHtmlAdapterMatcher: BlockHtmlAdapterMatcher = {return;}const title = configs.get('title:' + o.node.props.pageId) ?? 'untitled';- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(o.node.props.pageId),o.node.props.params ?? Object.create(null)diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/markdown.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/markdown.tsindex 5dce356718..eafa6b52a1 100644--- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/markdown.ts+++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/markdown.ts@@ -2,10 +2,9 @@ import { EmbedLinkedDocBlockSchema } from '@blocksuite/affine-model';import {BlockMarkdownAdapterExtension,type BlockMarkdownAdapterMatcher,+ TextUtils,} from '@blocksuite/affine-shared/adapters';-import { generateDocUrl } from '../../common/adapters/utils.js';-export const embedLinkedDocBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcher ={flavour: EmbedLinkedDocBlockSchema.model.flavour,@@ -20,7 +19,7 @@ export const embedLinkedDocBlockMarkdownAdapterMatcher: BlockMarkdownAdapterMatcreturn;}const title = configs.get('title:' + o.node.props.pageId) ?? 'untitled';- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(o.node.props.pageId),o.node.props.params ?? Object.create(null)diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/plain-text.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/plain-text.tsindex 439ca333c9..2df2e154e2 100644--- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/plain-text.ts+++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/adapters/plain-text.ts@@ -2,10 +2,9 @@ import { EmbedLinkedDocBlockSchema } from '@blocksuite/affine-model';import {BlockPlainTextAdapterExtension,type BlockPlainTextAdapterMatcher,+ TextUtils,} from '@blocksuite/affine-shared/adapters';-import { generateDocUrl } from '../../common/adapters/utils.js';-export const embedLinkedDocBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMatcher ={flavour: EmbedLinkedDocBlockSchema.model.flavour,@@ -20,7 +19,7 @@ export const embedLinkedDocBlockPlainTextAdapterMatcher: BlockPlainTextAdapterMareturn;}const title = configs.get('title:' + o.node.props.pageId) ?? 'untitled';- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(o.node.props.pageId),o.node.props.params ?? Object.create(null)diff --git a/blocksuite/affine/block-embed/src/index.ts b/blocksuite/affine/block-embed/src/index.tsindex 57019e6957..faa54643da 100644--- a/blocksuite/affine/block-embed/src/index.ts+++ b/blocksuite/affine/block-embed/src/index.ts@@ -21,7 +21,6 @@ export const EmbedExtensions: ExtensionType[] = [export { createEmbedBlockHtmlAdapterMatcher } from './common/adapters/html';export { createEmbedBlockMarkdownAdapterMatcher } from './common/adapters/markdown';export { createEmbedBlockPlainTextAdapterMatcher } from './common/adapters/plain-text';-export { generateDocUrl } from './common/adapters/utils';export { EmbedBlockComponent } from './common/embed-block-element';export { insertEmbedCard } from './common/insert-embed-card.js';export {diff --git a/blocksuite/affine/components/package.json b/blocksuite/affine/components/package.jsonindex 8446119f55..e1c8bc9b9e 100644--- a/blocksuite/affine/components/package.json+++ b/blocksuite/affine/components/package.json@@ -25,11 +25,15 @@"@lottiefiles/dotlottie-wc": "^0.4.0","@preact/signals-core": "^1.8.0","@toeverything/theme": "^1.1.3",+ "@types/hast": "^3.0.4",+ "@types/mdast": "^4.0.4",+ "collapse-white-space": "^2.1.0","date-fns": "^4.0.0","katex": "^0.16.11","lit": "^3.2.0","lit-html": "^3.2.1","lodash.clonedeep": "^4.5.0",+ "remark-math": "^6.0.0","shiki": "^1.12.0","yjs": "^13.6.21","zod": "^3.23.8"diff --git a/blocksuite/affine/components/src/rich-text/all-extensions.ts b/blocksuite/affine/components/src/rich-text/all-extensions.tsindex 65ff46c2d5..deff7d00ee 100644--- a/blocksuite/affine/components/src/rich-text/all-extensions.ts+++ b/blocksuite/affine/components/src/rich-text/all-extensions.ts@@ -6,6 +6,7 @@ import {BoldInlineSpecExtension,CodeInlineSpecExtension,ColorInlineSpecExtension,+ InlineAdapterExtensions,InlineSpecExtensions,ItalicInlineSpecExtension,LatexInlineSpecExtension,@@ -38,4 +39,5 @@ export const RichTextExtensions: ExtensionType[] = [MarkdownExtensions,LatexEditorInlineManagerExtension,DefaultInlineManagerExtension,+ InlineAdapterExtensions,].flat();diff --git a/blocksuite/affine/components/src/rich-text/inline/adapters/extensions.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/extensions.tsnew file mode 100644index 0000000000..e0d2127509--- /dev/null+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/extensions.ts@@ -0,0 +1,17 @@+import type { ExtensionType } from '@blocksuite/store';++import { HtmlInlineToDeltaAdapterExtensions } from './html/html-inline';+import { InlineDeltaToHtmlAdapterExtensions } from './html/inline-delta';+import { InlineDeltaToMarkdownAdapterExtensions } from './markdown/inline-delta';+import { MarkdownInlineToDeltaAdapterExtensions } from './markdown/markdown-inline';+import { NotionHtmlInlineToDeltaAdapterExtensions } from './notion-html/html-inline';+import { InlineDeltaToPlainTextAdapterExtensions } from './plain-text/inline-delta';++export const InlineAdapterExtensions: ExtensionType[] = [+ HtmlInlineToDeltaAdapterExtensions,+ InlineDeltaToHtmlAdapterExtensions,+ InlineDeltaToPlainTextAdapterExtensions,+ NotionHtmlInlineToDeltaAdapterExtensions,+ InlineDeltaToMarkdownAdapterExtensions,+ MarkdownInlineToDeltaAdapterExtensions,+].flat();diff --git a/blocksuite/blocks/src/_common/adapters/html/delta-converter/html-inline.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/html/html-inline.tssimilarity index 99%rename from blocksuite/blocks/src/_common/adapters/html/delta-converter/html-inline.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/html/html-inline.tsindex 1a2704a9a6..5b39176fff 100644--- a/blocksuite/blocks/src/_common/adapters/html/delta-converter/html-inline.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/html/html-inline.ts@@ -221,7 +221,7 @@ export const htmlBrElementToDeltaMatcher = HtmlASTToDeltaExtension({},});-export const htmlInlineToDeltaMatchers = [+export const HtmlInlineToDeltaAdapterExtensions = [htmlTextToDeltaMatcher,htmlTextLikeElementToDeltaMatcher,htmlStrongElementToDeltaMatcher,diff --git a/blocksuite/blocks/src/_common/adapters/html/delta-converter/inline-delta.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/html/inline-delta.tssimilarity index 57%rename from blocksuite/blocks/src/_common/adapters/html/delta-converter/inline-delta.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/html/inline-delta.tsindex d8b0501e97..840d3cf948 100644--- a/blocksuite/blocks/src/_common/adapters/html/delta-converter/inline-delta.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/html/inline-delta.ts@@ -1,6 +1,9 @@-import { generateDocUrl } from '@blocksuite/affine-block-embed';import type { InlineHtmlAST } from '@blocksuite/affine-shared/adapters';-import { InlineDeltaToHtmlAdapterExtension } from '@blocksuite/affine-shared/adapters';+import {+ InlineDeltaToHtmlAdapterExtension,+ TextUtils,+} from '@blocksuite/affine-shared/adapters';+import { ThemeProvider } from '@blocksuite/affine-shared/services';export const boldDeltaToHtmlAdapterMatcher = InlineDeltaToHtmlAdapterExtension({name: 'bold',@@ -43,7 +46,7 @@ export const strikeDeltaToHtmlAdapterMatcher =},});-export const inlineCodeDeltaToMarkdownAdapterMatcher =+export const inlineCodeDeltaToHtmlAdapterMatcher =InlineDeltaToHtmlAdapterExtension({name: 'inlineCode',match: delta => !!delta.attributes?.code,@@ -87,7 +90,7 @@ export const referenceDeltaToHtmlAdapterMatcher =const { configs } = context;const title = configs.get(`title:${reference.pageId}`);- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(reference.pageId),reference.params ?? Object.create(null)@@ -131,12 +134,86 @@ export const linkDeltaToHtmlAdapterMatcher = InlineDeltaToHtmlAdapterExtension({},});-export const inlineDeltaToHtmlAdapterMatchers = [+export const highlightBackgroundDeltaToHtmlAdapterMatcher =+ InlineDeltaToHtmlAdapterExtension({+ name: 'highlight-background',+ match: delta => !!delta.attributes?.background,+ toAST: (delta, context, provider) => {+ const hast: InlineHtmlAST = {+ type: 'element',+ tagName: 'span',+ properties: {},+ children: [context.current],+ };+ if (!provider || !delta.attributes?.background) {+ return hast;+ }++ const theme = provider.getOptional(ThemeProvider);+ if (!theme) {+ return hast;+ }++ const backgroundVar = delta.attributes?.background.substring(+ 'var('.length,+ delta.attributes?.background.indexOf(')')+ );+ const background = theme.getCssVariableColor(backgroundVar);+ return {+ type: 'element',+ tagName: 'mark',+ properties: {+ style: `background-color: ${background};`,+ },+ children: [context.current],+ };+ },+ });++export const highlightColorDeltaToHtmlAdapterMatcher =+ InlineDeltaToHtmlAdapterExtension({+ name: 'highlight-color',+ match: delta => !!delta.attributes?.color,+ toAST: (delta, context, provider) => {+ const hast: InlineHtmlAST = {+ type: 'element',+ tagName: 'span',+ properties: {},+ children: [context.current],+ };+ if (!provider || !delta.attributes?.color) {+ return hast;+ }++ const theme = provider.getOptional(ThemeProvider);+ if (!theme) {+ return hast;+ }++ const colorVar = delta.attributes?.color.substring(+ 'var('.length,+ delta.attributes?.color.indexOf(')')+ );+ const color = theme.getCssVariableColor(colorVar);+ return {+ type: 'element',+ tagName: 'mark',+ properties: {+ style: `color: ${color};background-color: transparent`,+ },+ children: [context.current],+ };+ },+ });++export const InlineDeltaToHtmlAdapterExtensions = [boldDeltaToHtmlAdapterMatcher,italicDeltaToHtmlAdapterMatcher,strikeDeltaToHtmlAdapterMatcher,underlineDeltaToHtmlAdapterMatcher,- inlineCodeDeltaToMarkdownAdapterMatcher,+ highlightBackgroundDeltaToHtmlAdapterMatcher,+ highlightColorDeltaToHtmlAdapterMatcher,+ inlineCodeDeltaToHtmlAdapterMatcher,referenceDeltaToHtmlAdapterMatcher,linkDeltaToHtmlAdapterMatcher,];diff --git a/blocksuite/blocks/src/_common/adapters/markdown/delta-converter/inline-delta.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/markdown/inline-delta.tssimilarity index 93%rename from blocksuite/blocks/src/_common/adapters/markdown/delta-converter/inline-delta.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/markdown/inline-delta.tsindex 56142492a6..5fbc4bebbf 100644--- a/blocksuite/blocks/src/_common/adapters/markdown/delta-converter/inline-delta.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/markdown/inline-delta.ts@@ -1,5 +1,7 @@-import { generateDocUrl } from '@blocksuite/affine-block-embed';-import { InlineDeltaToMarkdownAdapterExtension } from '@blocksuite/affine-shared/adapters';+import {+ InlineDeltaToMarkdownAdapterExtension,+ TextUtils,+} from '@blocksuite/affine-shared/adapters';import type { PhrasingContent } from 'mdast';import type RemarkMath from 'remark-math';@@ -71,7 +73,7 @@ export const referenceDeltaToMarkdownAdapterMatcher =const { configs } = context;const title = configs.get(`title:${reference.pageId}`);const params = reference.params ?? {};- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(reference.pageId),params@@ -144,7 +146,7 @@ export const latexDeltaToMarkdownAdapterMatcher =},});-export const inlineDeltaToMarkdownAdapterMatchers = [+export const InlineDeltaToMarkdownAdapterExtensions = [referenceDeltaToMarkdownAdapterMatcher,linkDeltaToMarkdownAdapterMatcher,inlineCodeDeltaToMarkdownAdapterMatcher,diff --git a/blocksuite/blocks/src/_common/adapters/markdown/delta-converter/markdown-inline.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/markdown/markdown-inline.tssimilarity index 98%rename from blocksuite/blocks/src/_common/adapters/markdown/delta-converter/markdown-inline.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/markdown/markdown-inline.tsindex 17382604c8..701d5298cd 100644--- a/blocksuite/blocks/src/_common/adapters/markdown/delta-converter/markdown-inline.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/markdown/markdown-inline.ts@@ -138,7 +138,7 @@ export const markdownInlineMathToDeltaMatcher = MarkdownASTToDeltaExtension({},});-export const markdownInlineToDeltaMatchers = [+export const MarkdownInlineToDeltaAdapterExtensions = [markdownTextToDeltaMatcher,markdownInlineCodeToDeltaMatcher,markdownStrongToDeltaMatcher,diff --git a/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/notion-html/html-inline.tssimilarity index 99%rename from blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/notion-html/html-inline.tsindex 1ab3357745..d09787fe21 100644--- a/blocksuite/blocks/src/_common/adapters/notion-html/delta-converter/html-inline.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/notion-html/html-inline.ts@@ -283,7 +283,7 @@ export const notionHtmlStyleElementToDeltaMatcher =},});-export const notionHtmlInlineToDeltaMatchers: ExtensionType[] = [+export const NotionHtmlInlineToDeltaAdapterExtensions: ExtensionType[] = [notionHtmlTextToDeltaMatcher,notionHtmlSpanElementToDeltaMatcher,notionHtmlStrongElementToDeltaMatcher,diff --git a/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts b/blocksuite/affine/components/src/rich-text/inline/adapters/plain-text/inline-delta.tssimilarity index 91%rename from blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.tsrename to blocksuite/affine/components/src/rich-text/inline/adapters/plain-text/inline-delta.tsindex 86931c1a8e..09a9bdb7bd 100644--- a/blocksuite/blocks/src/_common/adapters/plain-text/delta-converter/inline-delta.ts+++ b/blocksuite/affine/components/src/rich-text/inline/adapters/plain-text/inline-delta.ts@@ -1,7 +1,7 @@-import { generateDocUrl } from '@blocksuite/affine-block-embed';import {InlineDeltaToPlainTextAdapterExtension,type TextBuffer,+ TextUtils,} from '@blocksuite/affine-shared/adapters';import type { ExtensionType } from '@blocksuite/store';@@ -20,7 +20,7 @@ export const referenceDeltaMarkdownAdapterMatch =const { configs } = context;const title = configs.get(`title:${reference.pageId}`) ?? '';- const url = generateDocUrl(+ const url = TextUtils.generateDocUrl(configs.get('docLinkBaseUrl') ?? '',String(reference.pageId),reference.params ?? Object.create(null)@@ -71,7 +71,7 @@ export const latexDeltaMarkdownAdapterMatch =},});-export const inlineDeltaToPlainTextAdapterMatchers: ExtensionType[] = [+export const InlineDeltaToPlainTextAdapterExtensions: ExtensionType[] = [referenceDeltaMarkdownAdapterMatch,linkDeltaMarkdownAdapterMatch,latexDeltaMarkdownAdapterMatch,diff --git a/blocksuite/affine/components/src/rich-text/inline/index.ts b/blocksuite/affine/components/src/rich-text/inline/index.tsindex 5fbeaff826..e1bf94badd 100644--- a/blocksuite/affine/components/src/rich-text/inline/index.ts+++ b/blocksuite/affine/components/src/rich-text/inline/index.ts@@ -1,3 +1,10 @@-export * from './presets/affine-inline-specs.js';-export * from './presets/markdown.js';-export * from './presets/nodes/index.js';+export * from './adapters/extensions';+export * from './adapters/html/html-inline';+export * from './adapters/html/inline-delta';+export * from './adapters/markdown/inline-delta';+export * from './adapters/markdown/markdown-inline';+export * from './adapters/notion-html/html-inline';+export * from './adapters/plain-text/inline-delta';+export * from './presets/affine-inline-specs';+export * from './presets/markdown';+export * from './presets/nodes/index';diff --git a/blocksuite/affine/shared/src/adapters/html/delta-converter.ts b/blocksuite/affine/shared/src/adapters/html/delta-converter.tsindex 02128f13bb..dce670ac78 100644--- a/blocksuite/affine/shared/src/adapters/html/delta-converter.ts+++ b/blocksuite/affine/shared/src/adapters/html/delta-converter.ts@@ -1,6 +1,7 @@import {createIdentifier,type ServiceIdentifier,+ type ServiceProvider,} from '@blocksuite/global/di';import type { DeltaInsert } from '@blocksuite/inline';import type { ExtensionType } from '@blocksuite/store';@@ -62,7 +63,8 @@ export class HtmlDeltaConverter extends DeltaASTConverter<constructor(readonly configs: Map<string, string>,readonly inlineDeltaMatchers: InlineDeltaToHtmlAdapterMatcher[],- readonly htmlASTToDeltaMatchers: HtmlASTToDeltaMatcher[]+ readonly htmlASTToDeltaMatchers: HtmlASTToDeltaMatcher[],+ readonly provider: ServiceProvider) {super();}@@ -84,7 +86,7 @@ export class HtmlDeltaConverter extends DeltaASTConverter<};for (const matcher of this.inlineDeltaMatchers) {if (matcher.match(delta)) {- hast = matcher.toAST(delta, context);+ hast = matcher.toAST(delta, context, this.provider);context.current = hast;}}diff --git a/blocksuite/affine/shared/src/adapters/html/html.ts b/blocksuite/affine/shared/src/adapters/html/html.tsindex 4920616d04..49a4bb393b 100644--- a/blocksuite/affine/shared/src/adapters/html/html.ts+++ b/blocksuite/affine/shared/src/adapters/html/html.ts@@ -132,6 +132,7 @@ export class HtmlAdapter extends BaseAdapter<Html> {configs: this.configs,job: this.job,deltaConverter: this.deltaConverter,+ provider: this.provider,textBuffer: { content: '' },assets,updateAssetIds: (assetsId: string) => {@@ -155,6 +156,7 @@ export class HtmlAdapter extends BaseAdapter<Html> {configs: this.configs,job: this.job,deltaConverter: this.deltaConverter,+ provider: this.provider,textBuffer: { content: '' },assets,};@@ -172,7 +174,10 @@ export class HtmlAdapter extends BaseAdapter<Html> {readonly blockMatchers: BlockHtmlAdapterMatcher[];- constructor(job: Transformer, provider: ServiceProvider) {+ constructor(+ job: Transformer,+ readonly provider: ServiceProvider+ ) {super(job);const blockMatchers = Array.from(provider.getAll(BlockHtmlAdapterMatcherIdentifier).values()@@ -187,7 +192,8 @@ export class HtmlAdapter extends BaseAdapter<Html> {this.deltaConverter = new HtmlDeltaConverter(job.adapterConfigs,inlineDeltaToHtmlAdapterMatchers,- htmlInlineToDeltaMatchers+ htmlInlineToDeltaMatchers,+ provider);}diff --git a/blocksuite/affine/shared/src/adapters/types/adapter.ts b/blocksuite/affine/shared/src/adapters/types/adapter.tsindex 81b052a15b..d438532487 100644--- a/blocksuite/affine/shared/src/adapters/types/adapter.ts+++ b/blocksuite/affine/shared/src/adapters/types/adapter.ts@@ -152,7 +152,8 @@ export type InlineDeltaMatcher<TNode extends object = never> = {context: {configs: Map<string, string>;current: TNode;- }+ },+ provider?: ServiceProvider) => TNode;};diff --git a/blocksuite/affine/shared/src/adapters/utils/text.ts b/blocksuite/affine/shared/src/adapters/utils/text.tsindex f642f4098a..ce9c5da607 100644--- a/blocksuite/affine/shared/src/adapters/utils/text.ts+++ b/blocksuite/affine/shared/src/adapters/utils/text.ts@@ -1,3 +1,4 @@+import type { ReferenceParams } from '@blocksuite/affine-model';import { isEqual } from '@blocksuite/global/utils';import type { DeltaInsert } from '@blocksuite/inline';@@ -74,10 +75,22 @@ function toURLSearchParams();}+function generateDocUrl(+ docBaseUrl: string,+ pageId: string,+ params: ReferenceParams+) {+ const search = toURLSearchParams(params);+ const query = search?.size ? `?${search.toString()}` : '';+ const url = docBaseUrl ? `${docBaseUrl}/${pageId}${query}` : '';+ return url;+}+export const TextUtils = {mergeDeltas,isNullish,createText,isText,toURLSearchParams,+ generateDocUrl,};diff --git a/blocksuite/blocks/package.json b/blocksuite/blocks/package.jsonindex 11bfb851f0..04f1994252 100644--- a/blocksuite/blocks/package.json+++ b/blocksuite/blocks/package.json@@ -47,9 +47,6 @@"@lit/context": "^1.1.2","@preact/signals-core": "^1.8.0","@toeverything/theme": "^1.1.3",- "@types/hast": "^3.0.4",- "@types/mdast": "^4.0.4",- "collapse-white-space": "^2.1.0","date-fns": "^4.0.0","dompurify": "^3.1.6","fflate": "^0.8.2",@@ -60,26 +57,11 @@"lit": "^3.2.0","lodash.isequal": "^4.5.0","lz-string": "^1.5.0",- "mdast-util-gfm-autolink-literal": "^2.0.1",- "mdast-util-gfm-strikethrough": "^2.0.0",- "mdast-util-gfm-table": "^2.0.0",- "mdast-util-gfm-task-list-item": "^2.0.0",- "micromark-extension-gfm-autolink-literal": "^2.1.0",- "micromark-extension-gfm-strikethrough": "^2.1.0",- "micromark-extension-gfm-table": "^2.1.0",- "micromark-extension-gfm-task-list-item": "^2.1.0",- "micromark-util-combine-extensions": "^2.0.0","minimatch": "^10.0.1","nanoid": "^5.0.7","pdf-lib": "^1.17.1",- "rehype-parse": "^9.0.0",- "rehype-stringify": "^10.0.0",- "remark-math": "^6.0.0",- "remark-parse": "^11.0.0",- "remark-stringify": "^11.0.0","shiki": "^1.14.1","simple-xml-to-json": "^1.2.2",- "unified": "^11.0.5","yjs": "^13.6.21","zod": "^3.23.8"},diff --git a/blocksuite/blocks/src/__tests__/adapters/html.unit.spec.ts b/blocksuite/blocks/src/__tests__/adapters/html.unit.spec.tsindex a6d39fb15e..d3c5059950 100644--- a/blocksuite/blocks/src/__tests__/adapters/html.unit.spec.ts+++ b/blocksuite/blocks/src/__tests__/adapters/html.unit.spec.ts@@ -1,3 +1,7 @@+import {+ HtmlInlineToDeltaAdapterExtensions,+ InlineDeltaToHtmlAdapterExtensions,+} from '@blocksuite/affine-components/rich-text';import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';import { HtmlAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';@@ -10,17 +14,15 @@ import { AssetsManager, MemoryBlobCRUD } from '@blocksuite/store';import { describe, expect, test } from 'vitest';import { defaultBlockHtmlAdapterMatchers } from '../../_common/adapters/html/block-matcher.js';-import { htmlInlineToDeltaMatchers } from '../../_common/adapters/html/delta-converter/html-inline.js';-import { inlineDeltaToHtmlAdapterMatchers } from '../../_common/adapters/html/delta-converter/inline-delta.js';import { nanoidReplacement } from '../../_common/test-utils/test-utils.js';import { embedSyncedDocMiddleware } from '../../_common/transformers/middlewares.js';import { createJob } from '../utils/create-job.js';const container = new Container();[- ...htmlInlineToDeltaMatchers,+ ...HtmlInlineToDeltaAdapterExtensions,...defaultBlockHtmlAdapterMatchers,- ...inlineDeltaToHtmlAdapterMatchers,+ ...InlineDeltaToHtmlAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/blocksuite/blocks/src/__tests__/adapters/markdown.unit.spec.ts b/blocksuite/blocks/src/__tests__/adapters/markdown.unit.spec.tsindex 1a1ba78db1..5654c16353 100644--- a/blocksuite/blocks/src/__tests__/adapters/markdown.unit.spec.ts+++ b/blocksuite/blocks/src/__tests__/adapters/markdown.unit.spec.ts@@ -1,3 +1,7 @@+import {+ InlineDeltaToMarkdownAdapterExtensions,+ MarkdownInlineToDeltaAdapterExtensions,+} from '@blocksuite/affine-components/rich-text';import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';import { MarkdownAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';@@ -10,18 +14,16 @@ import type {import { AssetsManager, MemoryBlobCRUD } from '@blocksuite/store';import { describe, expect, test } from 'vitest';-import { inlineDeltaToMarkdownAdapterMatchers } from '../../_common/adapters/markdown/delta-converter/inline-delta.js';-import { markdownInlineToDeltaMatchers } from '../../_common/adapters/markdown/delta-converter/markdown-inline.js';-import { defaultBlockMarkdownAdapterMatchers } from '../../_common/adapters/markdown/index.js';+import { defaultBlockMarkdownAdapterMatchers } from '../../_common/adapters/markdown/block-matcher.js';import { nanoidReplacement } from '../../_common/test-utils/test-utils.js';import { embedSyncedDocMiddleware } from '../../_common/transformers/middlewares.js';import { createJob } from '../utils/create-job.js';const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts b/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.tsindex 2146922cb7..8d30f55eb5 100644--- a/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts+++ b/blocksuite/blocks/src/__tests__/adapters/notion-html.unit.spec.ts@@ -1,3 +1,4 @@+import { NotionHtmlInlineToDeltaAdapterExtensions } from '@blocksuite/affine-components/rich-text';import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';import { NotionHtmlAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';@@ -9,13 +10,12 @@ import {import { describe, expect, test } from 'vitest';import { defaultBlockNotionHtmlAdapterMatchers } from '../../_common/adapters/notion-html/block-matcher.js';-import { notionHtmlInlineToDeltaMatchers } from '../../_common/adapters/notion-html/delta-converter/html-inline.js';import { nanoidReplacement } from '../../_common/test-utils/test-utils.js';import { createJob } from '../utils/create-job.js';const container = new Container();[- ...notionHtmlInlineToDeltaMatchers,+ ...NotionHtmlInlineToDeltaAdapterExtensions,...defaultBlockNotionHtmlAdapterMatchers,].forEach(ext => {ext.setup(container);diff --git a/blocksuite/blocks/src/__tests__/adapters/plain-text.unit.spec.ts b/blocksuite/blocks/src/__tests__/adapters/plain-text.unit.spec.tsindex e323f2d017..ee951b2555 100644--- a/blocksuite/blocks/src/__tests__/adapters/plain-text.unit.spec.ts+++ b/blocksuite/blocks/src/__tests__/adapters/plain-text.unit.spec.ts@@ -1,3 +1,4 @@+import { InlineDeltaToPlainTextAdapterExtensions } from '@blocksuite/affine-components/rich-text';import { DefaultTheme, NoteDisplayMode } from '@blocksuite/affine-model';import { PlainTextAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';@@ -9,14 +10,13 @@ import type {import { describe, expect, test } from 'vitest';import { defaultBlockPlainTextAdapterMatchers } from '../../_common/adapters/plain-text/block-matcher.js';-import { inlineDeltaToPlainTextAdapterMatchers } from '../../_common/adapters/plain-text/delta-converter/inline-delta.js';import { embedSyncedDocMiddleware } from '../../_common/transformers/middlewares.js';import { createJob } from '../utils/create-job.js';const container = new Container();[...defaultBlockPlainTextAdapterMatchers,- ...inlineDeltaToPlainTextAdapterMatchers,+ ...InlineDeltaToPlainTextAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/blocksuite/blocks/src/_common/adapters/extension.ts b/blocksuite/blocks/src/_common/adapters/extension.tsindex 9d29930636..561fc44417 100644--- a/blocksuite/blocks/src/_common/adapters/extension.ts+++ b/blocksuite/blocks/src/_common/adapters/extension.ts@@ -10,20 +10,7 @@ import {} from '@blocksuite/affine-shared/adapters';import type { ExtensionType } from '@blocksuite/store';-import { htmlInlineToDeltaMatchers } from './html/delta-converter/html-inline.js';-import { inlineDeltaToHtmlAdapterMatchers } from './html/delta-converter/inline-delta.js';-import { inlineDeltaToMarkdownAdapterMatchers } from './markdown/delta-converter/inline-delta.js';-import { markdownInlineToDeltaMatchers } from './markdown/delta-converter/markdown-inline.js';-import { notionHtmlInlineToDeltaMatchers } from './notion-html/delta-converter/html-inline.js';-import { inlineDeltaToPlainTextAdapterMatchers } from './plain-text/delta-converter/inline-delta.js';-export const AdapterFactoryExtensions: ExtensionType[] = [- ...htmlInlineToDeltaMatchers,- ...inlineDeltaToHtmlAdapterMatchers,- ...notionHtmlInlineToDeltaMatchers,- ...inlineDeltaToPlainTextAdapterMatchers,- ...markdownInlineToDeltaMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,AttachmentAdapterFactoryExtension,ImageAdapterFactoryExtension,MarkdownAdapterFactoryExtension,diff --git a/blocksuite/blocks/src/_common/adapters/html/index.ts b/blocksuite/blocks/src/_common/adapters/html/index.tsdeleted file mode 100644index e0f7f02e75..0000000000--- a/blocksuite/blocks/src/_common/adapters/html/index.ts+++ /dev/null@@ -1 +0,0 @@-export { defaultBlockHtmlAdapterMatchers } from './block-matcher.js';diff --git a/blocksuite/blocks/src/_common/adapters/index.ts b/blocksuite/blocks/src/_common/adapters/index.tsindex 832906d6c7..355576fd15 100644--- a/blocksuite/blocks/src/_common/adapters/index.ts+++ b/blocksuite/blocks/src/_common/adapters/index.ts@@ -1,3 +1,5 @@export * from './extension.js';-export * from './markdown/index.js';-export * from './notion-html/index.js';+export * from './html/block-matcher.js';+export * from './markdown/block-matcher.js';+export * from './notion-html/block-matcher.js';+export * from './plain-text/block-matcher.js';diff --git a/blocksuite/blocks/src/_common/adapters/markdown/index.ts b/blocksuite/blocks/src/_common/adapters/markdown/index.tsdeleted file mode 100644index bd8c0e4c76..0000000000--- a/blocksuite/blocks/src/_common/adapters/markdown/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export { defaultBlockMarkdownAdapterMatchers } from './block-matcher.js';-export { inlineDeltaToMarkdownAdapterMatchers } from './delta-converter/inline-delta.js';-export { markdownInlineToDeltaMatchers } from './delta-converter/markdown-inline.js';diff --git a/blocksuite/blocks/src/_common/adapters/notion-html/index.ts b/blocksuite/blocks/src/_common/adapters/notion-html/index.tsdeleted file mode 100644index 0e7d1f0faa..0000000000--- a/blocksuite/blocks/src/_common/adapters/notion-html/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export { defaultBlockNotionHtmlAdapterMatchers } from './block-matcher.js';-export { notionHtmlInlineToDeltaMatchers } from './delta-converter/html-inline.js';diff --git a/blocksuite/blocks/src/_common/transformers/html.ts b/blocksuite/blocks/src/_common/transformers/html.tsindex 48ba9b75c4..0857f3e15e 100644--- a/blocksuite/blocks/src/_common/transformers/html.ts+++ b/blocksuite/blocks/src/_common/transformers/html.ts@@ -1,3 +1,7 @@+import {+ HtmlInlineToDeltaAdapterExtensions,+ InlineDeltaToHtmlAdapterExtensions,+} from '@blocksuite/affine-components/rich-text';import { HtmlAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';import { sha } from '@blocksuite/global/utils';@@ -5,8 +9,6 @@ import type { Store, Workspace } from '@blocksuite/store';import { extMimeMap, Transformer } from '@blocksuite/store';import { defaultBlockHtmlAdapterMatchers } from '../adapters/html/block-matcher.js';-import { htmlInlineToDeltaMatchers } from '../adapters/html/delta-converter/html-inline.js';-import { inlineDeltaToHtmlAdapterMatchers } from '../adapters/html/delta-converter/inline-delta.js';import {defaultImageProxyMiddleware,docLinkBaseURLMiddleware,@@ -28,9 +30,9 @@ type ImportHTMLZipOptions = {const container = new Container();[- ...htmlInlineToDeltaMatchers,+ ...HtmlInlineToDeltaAdapterExtensions,...defaultBlockHtmlAdapterMatchers,- ...inlineDeltaToHtmlAdapterMatchers,+ ...InlineDeltaToHtmlAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/blocksuite/blocks/src/_common/transformers/markdown.ts b/blocksuite/blocks/src/_common/transformers/markdown.tsindex 5836c75391..eb2a84be74 100644--- a/blocksuite/blocks/src/_common/transformers/markdown.ts+++ b/blocksuite/blocks/src/_common/transformers/markdown.ts@@ -1,3 +1,7 @@+import {+ InlineDeltaToMarkdownAdapterExtensions,+ MarkdownInlineToDeltaAdapterExtensions,+} from '@blocksuite/affine-components/rich-text';import { MarkdownAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';@@ -6,8 +10,6 @@ import type { Store, Workspace } from '@blocksuite/store';import { extMimeMap, Transformer } from '@blocksuite/store';import { defaultBlockMarkdownAdapterMatchers } from '../adapters/index.js';-import { inlineDeltaToMarkdownAdapterMatchers } from '../adapters/markdown/delta-converter/inline-delta.js';-import { markdownInlineToDeltaMatchers } from '../adapters/markdown/delta-converter/markdown-inline.js';import {defaultImageProxyMiddleware,docLinkBaseURLMiddleware,@@ -18,9 +20,9 @@ import { createAssetsArchive, download, Unzip } from './utils.js';const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/blocksuite/blocks/src/_common/transformers/notion-html.ts b/blocksuite/blocks/src/_common/transformers/notion-html.tsindex a6c2b0e0b2..c5aa2b387d 100644--- a/blocksuite/blocks/src/_common/transformers/notion-html.ts+++ b/blocksuite/blocks/src/_common/transformers/notion-html.ts@@ -1,10 +1,10 @@+import { NotionHtmlInlineToDeltaAdapterExtensions } from '@blocksuite/affine-components/rich-text';import { NotionHtmlAdapter } from '@blocksuite/affine-shared/adapters';import { Container } from '@blocksuite/global/di';import { sha } from '@blocksuite/global/utils';import { extMimeMap, Transformer, type Workspace } from '@blocksuite/store';import { defaultBlockNotionHtmlAdapterMatchers } from '../adapters/notion-html/block-matcher.js';-import { notionHtmlInlineToDeltaMatchers } from '../adapters/notion-html/delta-converter/html-inline.js';import { defaultImageProxyMiddleware } from './middlewares.js';import { Unzip } from './utils.js';@@ -15,7 +15,7 @@ type ImportNotionZipOptions = {const container = new Container();[- ...notionHtmlInlineToDeltaMatchers,+ ...NotionHtmlInlineToDeltaAdapterExtensions,...defaultBlockNotionHtmlAdapterMatchers,].forEach(ext => {ext.setup(container);diff --git a/blocksuite/blocks/src/index.ts b/blocksuite/blocks/src/index.tsindex cfeb95c33f..0a37a53f55 100644--- a/blocksuite/blocks/src/index.ts+++ b/blocksuite/blocks/src/index.ts@@ -7,7 +7,6 @@ import { splitElements } from './root-block/edgeless/utils/clipboard-utils.js';import { isCanvasElement } from './root-block/edgeless/utils/query.js';export * from './_common/adapters/index.js';-export * from './_common/adapters/markdown';export { type NavigatorMode } from './_common/edgeless/frame/consts.js';export {ExportManager,diff --git a/packages/frontend/apps/ios/src/app.tsx b/packages/frontend/apps/ios/src/app.tsxindex f5d1e5e288..91fb67f76b 100644--- a/packages/frontend/apps/ios/src/app.tsx+++ b/packages/frontend/apps/ios/src/app.tsx@@ -32,9 +32,9 @@ import { I18n } from '@affine/i18n';import {defaultBlockMarkdownAdapterMatchers,docLinkBaseURLMiddleware,- inlineDeltaToMarkdownAdapterMatchers,+ InlineDeltaToMarkdownAdapterExtensions,MarkdownAdapter,- markdownInlineToDeltaMatchers,+ MarkdownInlineToDeltaAdapterExtensions,titleMiddleware,} from '@blocksuite/affine/blocks';import { Container } from '@blocksuite/affine/global/di';@@ -198,9 +198,9 @@ const frameworkProvider = framework.provider();const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts b/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.tsindex 27100c2095..de3080e4ee 100644--- a/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts+++ b/packages/frontend/core/src/blocksuite/presets/_common/components/text-renderer.ts@@ -11,9 +11,9 @@ import {CodeBlockComponent,defaultBlockMarkdownAdapterMatchers,DividerBlockComponent,- inlineDeltaToMarkdownAdapterMatchers,+ InlineDeltaToMarkdownAdapterExtensions,ListBlockComponent,- markdownInlineToDeltaMatchers,+ MarkdownInlineToDeltaAdapterExtensions,ParagraphBlockComponent,} from '@blocksuite/affine/blocks';import { Container, type ServiceProvider } from '@blocksuite/affine/global/di';@@ -201,9 +201,9 @@ export class TextRenderer extends WithDisposable(ShadowlessElement) {} else {const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.tsindex be68835b12..0a70aec0cc 100644--- a/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts+++ b/packages/frontend/core/src/blocksuite/presets/ai/mini-mindmap/__tests__/mindmap-preview.unit.spec.ts@@ -1,7 +1,7 @@import {defaultBlockMarkdownAdapterMatchers,- inlineDeltaToMarkdownAdapterMatchers,- markdownInlineToDeltaMatchers,+ InlineDeltaToMarkdownAdapterExtensions,+ MarkdownInlineToDeltaAdapterExtensions,} from '@blocksuite/affine/blocks';import { Container } from '@blocksuite/affine/global/di';import { Schema } from '@blocksuite/store';@@ -12,9 +12,9 @@ import { markdownToMindmap } from '../mindmap-preview.js';const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts b/packages/frontend/core/src/modules/docs-search/worker/in-worker.tsindex e03d34b4df..b962de193a 100644--- a/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts+++ b/packages/frontend/core/src/modules/docs-search/worker/in-worker.ts@@ -7,9 +7,9 @@ import type {} from '@blocksuite/affine/blocks';import {defaultBlockMarkdownAdapterMatchers,- inlineDeltaToMarkdownAdapterMatchers,+ InlineDeltaToMarkdownAdapterExtensions,MarkdownAdapter,- markdownInlineToDeltaMatchers,+ MarkdownInlineToDeltaAdapterExtensions,} from '@blocksuite/affine/blocks';import { Container } from '@blocksuite/affine/global/di';import {@@ -184,9 +184,9 @@ function generateMarkdownPreviewBuilder(const container = new Container();[- ...markdownInlineToDeltaMatchers,+ ...MarkdownInlineToDeltaAdapterExtensions,...defaultBlockMarkdownAdapterMatchers,- ...inlineDeltaToMarkdownAdapterMatchers,+ ...InlineDeltaToMarkdownAdapterExtensions,].forEach(ext => {ext.setup(container);});diff --git a/yarn.lock b/yarn.lockindex f27ba752f1..d741fb214c 100644--- a/yarn.lock+++ b/yarn.lock@@ -3649,13 +3649,17 @@ __metadata:"@lottiefiles/dotlottie-wc": "npm:^0.4.0""@preact/signals-core": "npm:^1.8.0""@toeverything/theme": "npm:^1.1.3"+ "@types/hast": "npm:^3.0.4""@types/katex": "npm:^0.16.7""@types/lodash.clonedeep": "npm:^4.5.9"+ "@types/mdast": "npm:^4.0.4"+ collapse-white-space: "npm:^2.1.0"date-fns: "npm:^4.0.0"katex: "npm:^0.16.11"lit: "npm:^3.2.0"lit-html: "npm:^3.2.1"lodash.clonedeep: "npm:^4.5.0"+ remark-math: "npm:^6.0.0"shiki: "npm:^1.12.0"yjs: "npm:^13.6.21"zod: "npm:^3.23.8"@@ -3861,11 +3865,8 @@ __metadata:"@lit/context": "npm:^1.1.2""@preact/signals-core": "npm:^1.8.0""@toeverything/theme": "npm:^1.1.3"- "@types/hast": "npm:^3.0.4""@types/katex": "npm:^0.16.7""@types/lodash.isequal": "npm:^4.5.8"- "@types/mdast": "npm:^4.0.4"- collapse-white-space: "npm:^2.1.0"date-fns: "npm:^4.0.0"dompurify: "npm:^3.1.6"fflate: "npm:^0.8.2"@@ -3876,26 +3877,11 @@ __metadata:lit: "npm:^3.2.0"lodash.isequal: "npm:^4.5.0"lz-string: "npm:^1.5.0"- mdast-util-gfm-autolink-literal: "npm:^2.0.1"- mdast-util-gfm-strikethrough: "npm:^2.0.0"- mdast-util-gfm-table: "npm:^2.0.0"- mdast-util-gfm-task-list-item: "npm:^2.0.0"- micromark-extension-gfm-autolink-literal: "npm:^2.1.0"- micromark-extension-gfm-strikethrough: "npm:^2.1.0"- micromark-extension-gfm-table: "npm:^2.1.0"- micromark-extension-gfm-task-list-item: "npm:^2.1.0"- micromark-util-combine-extensions: "npm:^2.0.0"minimatch: "npm:^10.0.1"nanoid: "npm:^5.0.7"pdf-lib: "npm:^1.17.1"- rehype-parse: "npm:^9.0.0"- rehype-stringify: "npm:^10.0.0"- remark-math: "npm:^6.0.0"- remark-parse: "npm:^11.0.0"- remark-stringify: "npm:^11.0.0"shiki: "npm:^1.14.1"simple-xml-to-json: "npm:^1.2.2"- unified: "npm:^11.0.5"yjs: "npm:^13.6.21"zod: "npm:^3.23.8"languageName: unknown