@dxos/plugin-markdown 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/src/operations/update.test.ts

@@ -0,0 +1,215 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { MemoizedAiService } from '@dxos/ai/testing';
+import { AgentService } from '@dxos/assistant';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { Blueprint } from '@dxos/blueprints';
+import { SpaceProperties } from '@dxos/client-protocol';
+import { Database, Feed, Obj, Query, Ref } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
+import { TestHelpers } from '@dxos/effect/testing';
+import { FunctionInvocationService } from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+import { ObjectId } from '@dxos/keys';
+import { Markdown } from '@dxos/plugin-markdown/types';
+import { HasSubject } from '@dxos/types';
+import { trim } from '@dxos/util';
+
+import { WithProperties } from '#testing';
+
+import MarkdownBlueprint from '../blueprints/markdown-blueprint';
+import { Update } from './definitions';
+import { MarkdownOperationHandlerSet } from './index';
+
+ObjectId.dangerouslyDisableRandomness();
+
+const TestLayer = AssistantTestLayer({
+  aiServicePreset: 'edge-remote',
+  operationHandlers: MarkdownOperationHandlerSet,
+  types: [
+    SpaceProperties,
+    Collection.Collection,
+    Blueprint.Blueprint,
+    Markdown.Document,
+    HasSubject.HasSubject,
+    Feed.Feed,
+  ],
+  blueprints: [MarkdownBlueprint.make()],
+  tracing: 'pretty',
+});
+
+describe('update', () => {
+  it.effect(
+    'call a function to update a markdown document',
+    Effect.fnUntraced(
+      function* (_) {
+        const doc = Markdown.make({
+          name: 'BlueYard',
+          content: 'Founders and portfolio of BlueYard.',
+        });
+        yield* Database.add(doc);
+
+        yield* FunctionInvocationService.invokeFunction(Update, {
+          doc: Ref.make(doc),
+          edits: [{ oldString: 'Founders', newString: '# Founders' }],
+        });
+
+        const updatedDoc = yield* Database.resolve(Obj.getDXN(doc), Markdown.Document);
+        expect(updatedDoc.name).toBe(doc.name);
+        const text = yield* Database.load(updatedDoc.content);
+        expect(text.content).toBe('# Founders and portfolio of BlueYard.');
+      },
+      WithProperties,
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+  );
+
+  it.effect(
+    'create and update a markdown document',
+    Effect.fnUntraced(
+      function* (_) {
+        const agent = yield* AgentService.createSession({
+          blueprints: [MarkdownBlueprint.make()],
+        });
+
+        yield* agent.submitPrompt('Create a document with a cookie recipe.');
+        yield* agent.waitForCompletion();
+        {
+          const docs = yield* Database.runQuery(Query.type(Markdown.Document));
+          if (docs.length !== 1) {
+            throw new Error(`Expected 1 document; got ${docs.length}: ${docs.map((_) => _.name)}`);
+          }
+
+          const doc = docs[0];
+          invariant(Obj.instanceOf(Markdown.Document, doc));
+          console.log({
+            name: doc.name,
+            content: yield* Database.load(doc.content).pipe(Effect.map((_) => _.content)),
+          });
+        }
+
+        yield* agent.submitPrompt('Add a section with a holiday-themed variation.');
+        yield* agent.waitForCompletion();
+        {
+          const docs = yield* Database.runQuery(Query.type(Markdown.Document));
+          if (docs.length !== 1) {
+            throw new Error(`Expected 1 document; got ${docs.length}: ${docs.map((_) => _.name)}`);
+          }
+
+          const doc = docs[0];
+          invariant(Obj.instanceOf(Markdown.Document, doc));
+          console.log({
+            name: doc.name,
+            content: yield* Database.load(doc.content).pipe(Effect.map((_) => _.content)),
+          });
+        }
+      },
+      WithProperties,
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    MemoizedAiService.isGenerationEnabled() ? 240_000 : 30_000,
+  );
+
+  it.effect(
+    'update existing document',
+    Effect.fnUntraced(
+      function* (_) {
+        const document = yield* Database.add(
+          Markdown.make({
+            name: 'Cookie Recipe',
+            content: trim`
+                Ingredients: 
+                  - 2 cups of ???
+                  - 1 cup of sugar
+                  - 1 cup of butter
+                  - 1 cup of eggs
+          `,
+          }),
+        );
+        const agent = yield* AgentService.createSession({
+          blueprints: [MarkdownBlueprint.make()],
+          context: [Ref.make(document)],
+        });
+
+        yield* agent.submitPrompt('Add the missing ingredient (its flour).');
+        yield* agent.waitForCompletion();
+
+        {
+          const docs = yield* Database.runQuery(Query.type(Markdown.Document));
+          if (docs.length !== 1) {
+            throw new Error(`Expected 1 document; got ${docs.length}: ${docs.map((_) => _.name)}`);
+          }
+
+          const doc = docs[0];
+          invariant(Obj.instanceOf(Markdown.Document, doc));
+          const content = yield* Database.load(doc.content).pipe(Effect.map((_) => _.content));
+          console.log({
+            name: doc.name,
+            content: yield* Database.load(doc.content).pipe(Effect.map((_) => _.content)),
+          });
+          expect(content.toLowerCase()).toContain('flour');
+        }
+      },
+      WithProperties,
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    MemoizedAiService.isGenerationEnabled() ? 240_000 : 30_000,
+  );
+
+  it.effect(
+    'add lines to document one by one',
+    Effect.fnUntraced(
+      function* (_) {
+        const document = yield* Database.add(
+          Markdown.make({
+            name: 'Shopping list',
+            content: trim`
+              # Shopping list
+            `,
+          }),
+        );
+        const agent = yield* AgentService.createSession({
+          blueprints: [MarkdownBlueprint.make()],
+          context: [Ref.make(document)],
+        });
+
+        yield* agent.submitPrompt('Add milk to the shopping list.');
+        yield* agent.waitForCompletion();
+        yield* agent.submitPrompt('Add bread to the shopping list.');
+        yield* agent.waitForCompletion();
+        yield* agent.submitPrompt('Add eggs to the shopping list.');
+        yield* agent.waitForCompletion();
+
+        {
+          const docs = yield* Database.runQuery(Query.type(Markdown.Document));
+          if (docs.length !== 1) {
+            throw new Error(`Expected 1 document; got ${docs.length}: ${docs.map((_) => _.name)}`);
+          }
+
+          const doc = docs[0];
+          invariant(Obj.instanceOf(Markdown.Document, doc));
+          const content = yield* Database.load(doc.content).pipe(Effect.map((_) => _.content));
+          console.log({
+            name: doc.name,
+            content: yield* Database.load(doc.content).pipe(Effect.map((_) => _.content)),
+          });
+          expect(content.toLowerCase()).toContain('milk');
+          expect(content.toLowerCase()).toContain('bread');
+          expect(content.toLowerCase()).toContain('eggs');
+        }
+      },
+      WithProperties,
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    MemoizedAiService.isGenerationEnabled() ? 240_000 : 30_000,
+  );
+});

package/src/operations/update.ts

@@ -0,0 +1,51 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { next as A, type Doc } from '@automerge/automerge';
+import * as Effect from 'effect/Effect';
+
+import { Database } from '@dxos/echo';
+import { DocAccessor, createDocAccessor } from '@dxos/echo-db';
+import { Operation } from '@dxos/operation';
+
+import { Update } from './definitions';
+
+const handler: Operation.WithHandler<typeof Update> = Update.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ doc, edits }) {
+      const content = yield* doc.pipe(
+        Database.load,
+        Effect.map((_) => _.content),
+        Effect.flatMap(Database.load),
+      );
+      const accessor = createDocAccessor(content, ['content']);
+
+      for (const edit of edits) {
+        accessor.handle.change((doc: Doc<typeof content>) => {
+          const text = DocAccessor.getValue<string>(accessor);
+          if (edit.replaceAll) {
+            let idx = text.indexOf(edit.oldString);
+            while (idx !== -1) {
+              A.splice(doc, accessor.path as A.Prop[], idx, edit.oldString.length, edit.newString);
+              const updated = DocAccessor.getValue<string>(accessor);
+              idx = updated.indexOf(edit.oldString, idx + edit.newString.length);
+            }
+          } else {
+            const idx = text.indexOf(edit.oldString);
+            if (idx === -1) {
+              throw new Error(`Edit not found: ${JSON.stringify(edit.oldString)}`);
+            }
+            A.splice(doc, accessor.path as A.Prop[], idx, edit.oldString.length, edit.newString);
+          }
+        });
+      }
+
+      return {
+        newContent: DocAccessor.getValue<string>(accessor),
+      };
+    }),
+  ),
+);
+
+export default handler;

package/src/testing.ts

@@ -5,18 +5,18 @@
 import * as Toolkit from '@effect/ai/Toolkit';
 import * as Effect from 'effect/Effect';
 
-import { PropertiesType } from '@dxos/client-protocol';
+import { SpaceProperties } from '@dxos/client-protocol';
 import { Obj, Ref } from '@dxos/echo';
-import { DatabaseService } from '@dxos/functions';
-import { Collection } from '@dxos/schema';
+import { Database } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 
 // TODO(wittjosiah): Factor out.
-export const WithProperties = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R | DatabaseService> =>
+export const WithProperties = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R | Database.Service> =>
   Effect.zipRight(
     Effect.gen(function* () {
       // TODO(wittjosiah): Remove cast.
-      yield* DatabaseService.add(
-        Obj.make(PropertiesType as any, {
+      yield* Database.add(
+        Obj.make(SpaceProperties, {
           [Collection.Collection.typename]: Ref.make(Collection.make()),
         }) as any,
       );

package/src/translations.ts

@@ -3,50 +3,65 @@
 //
 
 import { type Resource } from '@dxos/react-ui';
+import { translations as editorTranslations } from '@dxos/react-ui-editor';
 
-import { meta } from './meta';
-import { Markdown } from './types';
+import { meta } from '#meta';
+import { Markdown } from '#types';
 
 export const translations = [
   {
     'en-US': {
       [Markdown.Document.typename]: {
-        'typename label': 'Document',
-        'typename label_zero': 'Documents',
-        'typename label_one': 'Document',
-        'typename label_other': 'Documents',
-        'object name placeholder': 'New document',
-        'rename object label': 'Rename document',
-        'delete object label': 'Delete document',
+        'typename.label': 'Document',
+        'typename.label_zero': 'Documents',
+        'typename.label_one': 'Document',
+        'typename.label_other': 'Documents',
+        'object-name.placeholder': 'New document',
+        'add-object.label': 'Add document',
+        'rename-object.label': 'Rename document',
+        'delete-object.label': 'Delete document',
+        'object-deleted.label': 'Document deleted',
       },
       [meta.id]: {
-        'plugin name': 'Editor',
-        'settings title': 'Editor settings',
-        'choose markdown from space dialog title': 'Choose one or more documents to add',
+        'plugin.name': 'Editor',
+        'settings.title': 'Editor settings',
+        'choose-markdown-from-space-dialog.title': 'Choose one or more documents to add',
         // TODO(burdon): Style-guide for user-facing text (e.g., hints, questions, capitalization, etc.)
-        'empty choose markdown from space message': 'None available; try creating a new one instead?',
-        'chooser done label': 'Add selected',
-        'editor placeholder': '',
-        'editor input mode label': 'Editor input mode',
-        'select editor input mode placeholder': 'Select editor input mode…',
-        'settings editor input mode default label': 'Default',
-        'settings editor input mode vim label': 'Vim',
-        'settings editor input mode vscode label': 'VS Code',
-        'settings toolbar label': 'Show toolbar',
-        'settings numbered headings label': 'Numbered headings',
-        'settings folding label': 'Folding',
-        'settings experimental label': 'Enable experimental features',
-        'settings debug label': 'Enable debugging features',
-        'settings debug placeholder': 'Typewriter script...',
-        'toggle view mode label': 'Toggle read-only',
-        'default view mode label': 'Default view mode',
-        'upload image label': 'Upload image',
-        'fallback title': 'Untitled',
-        'navigate to document label': 'Open document',
-        'words label_zero': 'words',
-        'words label_one': 'word',
-        'words label_other': 'words',
+        'empty-choose-markdown-from-space.message': 'None available; try creating a new one instead?',
+        'chooser-done.label': 'Add selected',
+        'editor.placeholder': 'Start typing…',
+        'editor-input-mode.label': 'Editor input mode',
+        'editor-input-mode.description': 'Choose keyboard bindings for the editor.',
+        'select-editor-input-mode.placeholder': 'Select editor input mode…',
+        'settings.editor-input-mode.default.label': 'Default',
+        'settings.editor-input-mode.vim.label': 'Vim',
+        'settings.editor-input-mode.vscode.label': 'VS Code',
+        'settings.toolbar.label': 'Show toolbar',
+        'settings.toolbar.description': 'Display a formatting toolbar above the editor.',
+        'settings.numbered-headings.label': 'Numbered headings',
+        'settings.numbered-headings.description': 'Automatically number heading levels in the document.',
+        'settings.folding.label': 'Folding',
+        'settings.folding.description': 'Allow collapsing and expanding sections by heading.',
+        'settings.experimental.label': 'Enable experimental features',
+        'settings.experimental.description': 'Turn on features that are still in development.',
+        'settings.debug.label': 'Enable debugging features',
+        'settings.debug.description': 'Show developer tools and diagnostics for the editor.',
+        'settings.debug-typewriter.label': 'Typewriter script',
+        'settings.debug-typewriter.description': 'Script to replay typed input for testing purposes.',
+        'settings.debug-typewriter.placeholder': 'Typewriter script...',
+        'toggle-view-mode.label': 'Toggle read-only',
+        'default-view-mode.label': 'Default view mode',
+        'default-view-mode.description': 'Set whether documents open in editing or read-only mode.',
+        'upload-image.label': 'Upload image',
+        'fallback.title': 'Untitled',
+        'navigate-to-document.label': 'Open document',
+
+        'words.label': 'words',
+        'words.label_zero': 'words',
+        'words.label_one': 'word',
+        'words.label_other': 'words',
       },
     },
   },
+  ...editorTranslations,
 ] as const satisfies Resource[];

package/src/types/Markdown.ts

@@ -4,10 +4,14 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Obj, Ref, Type } from '@dxos/echo';
-import { DescriptionAnnotation, FormAnnotation, LabelAnnotation } from '@dxos/echo/internal';
-import { EditorInputMode, EditorViewMode } from '@dxos/react-ui-editor/types';
-import { ItemAnnotation, Text } from '@dxos/schema';
+import { Annotation, Obj, Ref, Type } from '@dxos/echo';
+import { DescriptionAnnotation, FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
+import { Text } from '@dxos/schema';
+
+// Re-export Settings as merged const/type (not as namespace).
+import * as SettingsModule from './Settings';
+export const Settings = SettingsModule.Settings;
+export type Settings = SettingsModule.Settings;
 
 /**
  * Document Item type.
@@ -15,16 +19,19 @@ import { ItemAnnotation, Text } from '@dxos/schema';
 export const Document = Schema.Struct({
   name: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
-  fallbackName: Schema.String.pipe(FormAnnotation.set(false), Schema.optional),
-  content: Type.Ref(Text.Text).pipe(FormAnnotation.set(false)),
+  fallbackName: Schema.String.pipe(FormInputAnnotation.set(false), Schema.optional),
+  content: Ref.Ref(Text.Text).pipe(FormInputAnnotation.set(false)),
 }).pipe(
-  Type.Obj({
-    typename: 'dxos.org/type/Document',
+  Type.object({
+    typename: 'org.dxos.type.document',
     version: '0.1.0',
   }),
   LabelAnnotation.set(['name', 'fallbackName']),
   DescriptionAnnotation.set('description'),
-  ItemAnnotation.set(true),
+  Annotation.IconAnnotation.set({
+    icon: 'ph--text-aa--regular',
+    hue: 'indigo',
+  }),
 );
 
 export type Document = Schema.Schema.Type<typeof Document>;
@@ -35,24 +42,9 @@ export type Document = Schema.Schema.Type<typeof Document>;
 export const make = ({
   content = '',
   ...props
-}: Partial<{ name: string; fallbackName: string; content: string }> = {}) =>
-  Obj.make(Document, { ...props, content: Ref.make(Text.make(content)) });
-
-/**
- * Plugin settings.
- */
-export const Settings = Schema.mutable(
-  Schema.Struct({
-    defaultViewMode: EditorViewMode,
-    editorInputMode: Schema.optional(EditorInputMode),
-    experimental: Schema.optional(Schema.Boolean),
-    debug: Schema.optional(Schema.Boolean),
-    toolbar: Schema.optional(Schema.Boolean),
-    typewriter: Schema.optional(Schema.String),
-    // TODO(burdon): Per document settings.
-    numberedHeadings: Schema.optional(Schema.Boolean),
-    folding: Schema.optional(Schema.Boolean),
-  }),
-);
-
-export interface Settings extends Schema.Schema.Type<typeof Settings> {}
+}: Partial<{ name: string; fallbackName: string; content: string }> = {}) => {
+  const doc = Obj.make(Document, { ...props, content: Ref.make(Text.make({ content })) });
+  // TODO(dmaretskyi): We need a better way to set parents when creating hierarchies.
+  Obj.setParent(doc.content.target!, doc);
+  return doc;
+};

package/src/types/Settings.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+import { EditorInputMode, EditorViewMode } from '@dxos/ui-editor/types';
+
+/**
+ * Plugin settings.
+ */
+export const Settings = Schema.mutable(
+  Schema.Struct({
+    defaultViewMode: EditorViewMode,
+    editorInputMode: Schema.optional(EditorInputMode),
+    experimental: Schema.optional(Schema.Boolean),
+    debug: Schema.optional(Schema.Boolean),
+    toolbar: Schema.optional(Schema.Boolean),
+    typewriter: Schema.optional(Schema.String),
+    // TODO(burdon): Per document settings.
+    numberedHeadings: Schema.optional(Schema.Boolean),
+    folding: Schema.optional(Schema.Boolean),
+  }),
+);
+
+export type Settings = Schema.Schema.Type<typeof Settings>;

package/src/types/capabilities.ts

@@ -0,0 +1,50 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import { type Atom } from '@effect-atom/atom-react';
+import * as Schema from 'effect/Schema';
+
+import { Capability } from '@dxos/app-framework';
+import { type EditorStateStore, type EditorViewMode } from '@dxos/ui-editor';
+
+import { meta } from '#meta';
+
+import type * as Markdown from './Markdown';
+import { type MarkdownExtensionProvider } from './types';
+
+/** Schema for persisted markdown state. */
+export const MarkdownStateSchema = Schema.mutable(
+  Schema.Struct({
+    viewMode: Schema.Record({ key: Schema.String, value: Schema.String }),
+  }),
+);
+
+export type MarkdownState = {
+  viewMode: Record<string, EditorViewMode>;
+};
+
+export type EditorViewEntry = { view: EditorView; documentId: string };
+
+export type EditorViewRegistry = {
+  register: (attendableId: string, view: EditorView, documentId: string) => void;
+  unregister: (attendableId: string) => void;
+  get: (attendableId: string) => EditorViewEntry | undefined;
+};
+
+export namespace MarkdownCapabilities {
+  export const Settings = Capability.make<Atom.Writable<Markdown.Settings>>(`${meta.id}.capability.settings`);
+
+  /** Persisted state atom for view mode per document. */
+  export const State = Capability.make<Atom.Writable<MarkdownState>>(`${meta.id}.capability.state`);
+
+  /** Editor state store for cursor positions, scroll state, etc. */
+  export const EditorState = Capability.make<EditorStateStore>(`${meta.id}.capability.editor-state`);
+
+  /** Registry of active EditorView instances keyed by attendable ID. */
+  export const EditorViews = Capability.make<EditorViewRegistry>(`${meta.id}.capability.editor-views`);
+
+  // TODO(burdon): Move to ./types (external API)?
+  export const Extensions = Capability.make<MarkdownExtensionProvider[]>(`${meta.id}.capability.extensions`);
+}

package/src/types/events.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ActivationEvent } from '@dxos/app-framework';
+import { AppActivationEvents } from '@dxos/app-toolkit';
+
+import { meta } from '#meta';
+
+export namespace MarkdownEvents {
+  export const SetupExtensions: ActivationEvent.ActivationEvent = AppActivationEvents.createStateEvent(
+    `${meta.id}.event.setup-extensions`,
+  );
+}

package/src/types/index.ts

@@ -2,7 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-export * as MarkdownAction from './MarkdownAction';
-export * as Markdown from './Markdown';
-
+export * from './capabilities';
+export * from './events';
 export * from './types';
+
+export * as Markdown from './Markdown';
+export * as Settings from './Settings';

package/src/types/types.ts

@@ -2,8 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Extension } from '@dxos/react-ui-editor';
-import { type EditorViewMode } from '@dxos/react-ui-editor/types';
+import { type Extension } from '@codemirror/state';
+
+import { type EditorViewMode } from '@dxos/ui-editor/types';
 
 import { type Document } from './Markdown';
 

package/src/util.test.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from 'vitest';
+
+import { trim } from '@dxos/util';
+
+import { getFallbackName } from './util';
+
+describe('markdown utils', () => {
+  it('getFallbackName', () => {
+    const tests = [
+      {
+        content: '',
+        expected: '',
+      },
+      {
+        content: trim`
+          ![img](https://dxos.network/dxos-logotype-blue.png)
+
+          # Welcome to Composer by DXOS
+
+          ## What is Composer?
+        `,
+        expected: 'Welcome to Composer by DXOS',
+      },
+      {
+        content: trim`
+          ![img](https://dxos.network/dxos-logotype-blue.png)
+
+          ---
+
+          This document is about the decetralized platform DXOS.
+        `,
+        expected: 'This document is about the…',
+      },
+    ];
+
+    tests.forEach(({ content, expected }) => {
+      expect(getFallbackName(content)).toBe(expected);
+    });
+  });
+});