Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore(md): remove the dead rewrite diff path (#6892)
gbirmanc502ed5a6118
diff --git a/apps/web/src/features/block-md/component/Block.tsx b/apps/web/src/features/block-md/component/Block.tsxindex d3edb64212..2c6d11f17a 100644--- a/apps/web/src/features/block-md/component/Block.tsx+++ b/apps/web/src/features/block-md/component/Block.tsx@@ -30,7 +30,7 @@ import { DocumentDebouncedNotificationReadMarker } from '@notifications';import { useInstructionsMdIdQuery } from '@queries/storage/instructions-md';import { Show, Suspense } from 'solid-js';import { createMarkdownDocumentState } from '../context/markdown-document-state';-import type { MarkdownBlockSpec, MarkdownData } from '../definition';+import type { MarkdownData } from '../definition';import { OldOverlay } from '../history/OldOverlay';import { loadMarkdownCachedSnapshot } from '../queries/markdown-document-operations';import type { MarkdownDocumentKind, MarkdownDocumentSource } from '../types';@@ -78,18 +78,8 @@ export default function MarkdownBlockAdapter(props: BlockMarkdownProps) {const isInstructions = () =>instructionsMdId.isSuccess && documentId === instructionsMdId.data;const markdownState = createMarkdownDocumentState();- const { setRevisions, setRewriting } = markdownState.rewrite;createMethodRegistration(blockHandleSignal.get, {goToLocationFromParams: markdownState.params.navigate,- setPatches: ({- patches,- }: Parameters<MarkdownBlockSpec['setPatches']>[0]) => {- setRewriting(false);- setRevisions(patches);- },- setIsRewriting: () => {- setRewriting(true);- },});const notificationSource = useGlobalNotificationSource();diff --git a/apps/web/src/features/block-md/component/MarkdownEditor.tsx b/apps/web/src/features/block-md/component/MarkdownEditor.tsxindex 6fbcf22bb9..fde7a2c9e0 100644--- a/apps/web/src/features/block-md/component/MarkdownEditor.tsx+++ b/apps/web/src/features/block-md/component/MarkdownEditor.tsx@@ -236,7 +236,6 @@ export function MarkdownEditor(props: {findAndReplace: findAndReplaceStore,setFindAndReplace: setFindAndReplaceStore,} = documentState.editor;- const { revisions, setRevisions } = documentState.rewrite;const saveBlocked = () => documentState.comments.activeCommentThread === -1;const IS_SYNC = () => documentSource().type === 'sync';@@ -682,12 +681,7 @@ export function MarkdownEditor(props: {}if (ENABLE_MARKDOWN_DIFF) {- plugins.use(- diffPlugin({- revisionsSignal: [revisions, setRevisions],- nodeIdMap: lexicalWrapper.mapping!,- })- );+ plugins.use(diffPlugin());}const [accessoryStore, setAccessoryStore] = createAccessoryStore();diff --git a/apps/web/src/features/block-md/context/markdown-document-state.tsx b/apps/web/src/features/block-md/context/markdown-document-state.tsxindex 1cdb77a5bd..f77db71719 100644--- a/apps/web/src/features/block-md/context/markdown-document-state.tsx+++ b/apps/web/src/features/block-md/context/markdown-document-state.tsx@@ -20,7 +20,6 @@ import type {MarkStore,ThreadStore,} from '../comments/commentType';-import type { Diff } from '../types';type MdData = {editor?: LexicalEditor;@@ -83,9 +82,6 @@ export function createMarkdownDocumentState() {structuredClone(initialFindAndReplaceState));- const [rewriting, setRewriting] = createSignal(false);- const [revisions, setRevisions] = createSignal<Diff[]>();-const [isGenerating, setIsGenerating] = createSignal(false);const [generatedAndWaiting, setGeneratedAndWaiting] = createSignal(false);const [completion, setCompletion] = createSignal<Completion>();@@ -114,12 +110,6 @@ export function createMarkdownDocumentState() {findAndReplace,setFindAndReplace,},- rewrite: {- rewriting,- setRewriting,- revisions,- setRevisions,- },generation: {isGenerating,setIsGenerating,diff --git a/apps/web/src/features/block-md/definition.ts b/apps/web/src/features/block-md/definition.tsindex 3a6dfb3dd7..2a994bd55d 100644--- a/apps/web/src/features/block-md/definition.ts+++ b/apps/web/src/features/block-md/definition.ts@@ -11,7 +11,6 @@ import {resumeDocumentSpan,startDocumentSpan,} from './observability';-import type { Diff } from './types';export const definition = defineBlock({name: 'md',@@ -97,8 +96,3 @@ export const definition = defineBlock({});export type MarkdownData = ExtractLoadType<(typeof definition)['load']>;--export type MarkdownBlockSpec = {- setPatches: (args: { patches: Diff[] }) => Promise<void>;- setIsRewriting: () => Promise<void>;-};diff --git a/apps/web/src/features/block-md/types.ts b/apps/web/src/features/block-md/types.tsindex 3b5ac86de7..6dca3a5a98 100644--- a/apps/web/src/features/block-md/types.ts+++ b/apps/web/src/features/block-md/types.ts@@ -1,12 +1,6 @@import type { IDocumentStorageServiceFile } from '@filesystem/file';import type { LiveSyncSource } from '@macro-inc/collaboration/collab/source';-export interface Diff {- operation: string;- node_key: string;- markdown_text: string;-}-export type MarkdownDocumentKind = 'document' | 'task' | 'snippet' | 'skill';export type MarkdownDocumentSource =diff --git a/apps/web/src/lib/core/blockMethodRegistry.ts b/apps/web/src/lib/core/blockMethodRegistry.tsindex d1580d00d0..387c871eb7 100644--- a/apps/web/src/lib/core/blockMethodRegistry.ts+++ b/apps/web/src/lib/core/blockMethodRegistry.ts@@ -1,6 +1,5 @@import type { CanvasSpec } from '@block-canvas/definition';import type { BlockChatSpec } from '@block-chat/blockClient';-import type { MarkdownBlockSpec } from '@block-md/definition';import type { BlockName } from './block';// Base type for all block method specs@@ -24,7 +23,7 @@ export interface BlockMethodRegistry {write: EmptySpec;pdf: EmptySpec;html: EmptySpec;- md: AssertSpec<MarkdownBlockSpec>;+ md: EmptySpec;code: EmptySpec;image: EmptySpec;canvas: AssertSpec<CanvasSpec>;diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/diff/diffPlugin.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/diff/diffPlugin.tsindex 90543225a4..697bcc0783 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/diff/diffPlugin.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/diff/diffPlugin.ts@@ -1,265 +1,21 @@-import { useUserId } from '@core/context/user';-import { $wrapNodeInElement, mergeRegister } from '@lexical/utils';-import type { NodeIdMappings } from '@macro-inc/lexical-core';-import {- $createDiffDeleteNode,- $createDiffInsertNode,- $createDiffNode,- $diffNodeDeleteAtStart,- $getNodeById,- $isDiffNode,-} from '@macro-inc/lexical-core';+import { $diffNodeDeleteAtStart } from '@macro-inc/lexical-core';import type { LexicalEditor } from 'lexical';-import {- COMMAND_PRIORITY_CRITICAL,- COMMAND_PRIORITY_NORMAL,- createCommand,-} from 'lexical';-import { createEffect, type Signal } from 'solid-js';+import { COMMAND_PRIORITY_CRITICAL } from 'lexical';import { mapRegisterDelete } from '../shared/utils';-interface Diff {- operation: string;- node_key: string;- markdown_text: string;-}--type DiffPluginArgs = {- revisionsSignal: Signal<Diff[] | undefined>;- nodeIdMap: NodeIdMappings;-};--type DiffPayload = {- key: string;- markdownText: string;-};--const INSERT_BEFORE_DIFF_COMMAND = createCommand<DiffPayload>(- 'INSERT_BEFORE_DIFF_COMMAND'-);--const INSERT_AFTER_DIFF_COMMAND = createCommand<DiffPayload>(- 'INSERT_AFTER_DIFF_COMMAND'-);--const MODIFY_DIFF_COMMAND = createCommand<DiffPayload>('MODIFY_DIFF_COMMAND');--const DELETE_DIFF_COMMAND = createCommand<string>('DELETE_DIFF_COMMAND');--function registerDiffPlugin(editor: LexicalEditor, props: DiffPluginArgs) {- const userId = useUserId();- const [revisions, setRevisions] = props.revisionsSignal;-- createEffect(() => {- const revisionsResponse = revisions();- if (!revisionsResponse) {- return;- }- setRevisions(undefined);-- let cleanedRevisions: Diff[] = [];- for (const revision of revisionsResponse) {- const prev = cleanedRevisions[cleanedRevisions.length - 1];- if (!prev) {- cleanedRevisions.push(revision);- continue;- }- const prevOperation = prev.operation;- const prevNodeKey = prev.node_key;-- if (- revision.operation === prevOperation &&- revision.node_key === prevNodeKey- ) {- prev.markdown_text += `\n${revision.markdown_text}`;- continue;- }- cleanedRevisions.push(revision);- }-- for (const revision of cleanedRevisions) {- const key = revision.node_key;- const markdownText = revision.markdown_text;- switch (revision.operation) {- case 'INSERT_BEFORE':- editor.dispatchCommand(INSERT_BEFORE_DIFF_COMMAND, {- key,- markdownText,- });- break;- case 'INSERT_AFTER':- editor.dispatchCommand(INSERT_AFTER_DIFF_COMMAND, {- key,- markdownText,- });- break;- case 'MODIFY':- editor.dispatchCommand(MODIFY_DIFF_COMMAND, { key, markdownText });- break;- case 'DELETE':- editor.dispatchCommand(DELETE_DIFF_COMMAND, key);- break;- default:- break;- }- }- });-- return mergeRegister(- editor.registerCommand(- INSERT_AFTER_DIFF_COMMAND,- (args: DiffPayload) => {- let appliedSuccessfully = false;- editor.update(() => {- const node = $getNodeById(- editor,- props.nodeIdMap.idToNodeKeyMap,- args.key- );- if (!node) {- return;- }-- const parent = node.getParent();- if (!parent) {- return;- }-- for (const ancestor of parent.getParents()) {- if ($isDiffNode(ancestor)) return false;- }-- const diffNode = $createDiffNode(userId() ?? '');- node.insertAfter(diffNode);- const diffInsertNode = $createDiffInsertNode(args.markdownText);- diffNode.append(diffInsertNode as any);- appliedSuccessfully = true;- });- return appliedSuccessfully;- },- COMMAND_PRIORITY_NORMAL- ),- editor.registerCommand(- INSERT_BEFORE_DIFF_COMMAND,- (args: DiffPayload) => {- let appliedSuccessfully = false;- editor.update(() => {- const node = $getNodeById(- editor,- props.nodeIdMap.idToNodeKeyMap,- args.key- );- if (!node) {- return;- }-- const parent = node.getParent();- if (!parent) {- return;- }-- for (const ancestor of parent.getParents()) {- if ($isDiffNode(ancestor)) return false;- }-- const diffNode = $createDiffNode(userId() ?? '');- node.insertBefore(diffNode);- const diffInsertNode = $createDiffInsertNode(args.markdownText);- diffNode.append(diffInsertNode as any);- appliedSuccessfully = true;- });- return appliedSuccessfully;- },- COMMAND_PRIORITY_NORMAL- ),- editor.registerCommand(- MODIFY_DIFF_COMMAND,- (args: DiffPayload) => {- let appliedSuccessfully = false;- editor.update(() => {- const node = $getNodeById(- editor,- props.nodeIdMap.idToNodeKeyMap,- args.key- );-- if (!node || $isDiffNode(node)) {- return;- }-- const parent = node.getParent();- if (!parent) {- return;- }-- for (const ancestor of parent.getParents()) {- if ($isDiffNode(ancestor)) return false;- }-- const diffNode = $createDiffNode(userId() ?? '');- node.insertBefore(diffNode);- const diffInsertNode = $createDiffInsertNode(args.markdownText);- const diffDeleteNode = $wrapNodeInElement(- node,- $createDiffDeleteNode- );- diffNode.append(diffInsertNode as any, diffDeleteNode as any);- appliedSuccessfully = true;- });- return appliedSuccessfully;- },- COMMAND_PRIORITY_NORMAL- ),- editor.registerCommand(- DELETE_DIFF_COMMAND,- (key: string) => {- let appliedSuccessfully = false;- editor.update(() => {- const node = $getNodeById(- editor,- props.nodeIdMap.idToNodeKeyMap,- key- );- if (!node) {- return;- }-- const parent = node.getParent();- if (!parent) {- return;- }-- for (const ancestor of parent.getParents()) {- if ($isDiffNode(ancestor)) return false;- }-- const diffNode = $createDiffNode(userId() ?? '');- node.insertBefore(diffNode);- const diffInsertNode = $createDiffInsertNode('');- const diffDeleteNode = $wrapNodeInElement(- node,- $createDiffDeleteNode- );- diffNode.append(diffInsertNode as any, diffDeleteNode as any);- appliedSuccessfully = true;- });- return appliedSuccessfully;- },- COMMAND_PRIORITY_NORMAL- ),- mapRegisterDelete(- editor,- () => {- return $diffNodeDeleteAtStart();- },- COMMAND_PRIORITY_CRITICAL- )+function registerDiffPlugin(editor: LexicalEditor) {+ return mapRegisterDelete(+ editor,+ () => {+ return $diffNodeDeleteAtStart();+ },+ COMMAND_PRIORITY_CRITICAL);}/** The diff plugin registers the listeners for diff nodes. */-export function diffPlugin(props: DiffPluginArgs) {+export function diffPlugin() {return (editor: LexicalEditor) => {- return registerDiffPlugin(editor, props);+ return registerDiffPlugin(editor);};}