@dxos/plugin-markdown 0.8.4-main.72ec0f3 → 0.8.4-main.937b3ca

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.937b3ca",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -15,11 +19,17 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
-    "./toolkit": {
-      "source": "./src/toolkit.ts",
-      "types": "./dist/types/src/toolkit.d.ts",
-      "browser": "./dist/lib/browser/toolkit.mjs",
-      "node": "./dist/lib/node-esm/toolkit.mjs"
+    "./blueprints": {
+      "browser": "./dist/lib/browser/blueprints/index.mjs",
+      "node": "./dist/lib/node-esm/blueprints/index.mjs",
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts"
+    },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "browser": "./dist/lib/browser/cli/index.mjs",
+      "node": "./dist/lib/node-esm/cli/index.mjs"
     },
     "./types": {
       "source": "./src/types/index.ts",
@@ -31,6 +41,9 @@
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "blueprints": [
+        "dist/types/src/blueprints/index.d.ts"
+      ],
       "toolkit": [
         "dist/types/src/toolkit.d.ts"
       ],
@@ -44,76 +57,78 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.2",
+    "@automerge/automerge": "3.2.3",
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@effect/ai": "0.29.1",
-    "@effect/experimental": "0.56.0",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
-    "@radix-ui/react-context": "^1.1.1",
+    "@effect-atom/atom": "^0.4.13",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/ai": "0.32.1",
+    "@effect/experimental": "0.57.11",
+    "@radix-ui/react-context": "1.1.1",
     "react-dropzone": "^14.2.3",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/assistant": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/client-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-preview": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-hooks": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.937b3ca",
+    "@dxos/app-framework": "0.8.4-main.937b3ca",
+    "@dxos/async": "0.8.4-main.937b3ca",
+    "@dxos/blueprints": "0.8.4-main.937b3ca",
+    "@dxos/assistant": "0.8.4-main.937b3ca",
+    "@dxos/echo-db": "0.8.4-main.937b3ca",
+    "@dxos/client-protocol": "0.8.4-main.937b3ca",
+    "@dxos/echo": "0.8.4-main.937b3ca",
+    "@dxos/effect": "0.8.4-main.937b3ca",
+    "@dxos/functions": "0.8.4-main.937b3ca",
+    "@dxos/functions-runtime": "0.8.4-main.937b3ca",
+    "@dxos/invariant": "0.8.4-main.937b3ca",
+    "@dxos/lit-ui": "0.8.4-main.937b3ca",
+    "@dxos/keys": "0.8.4-main.937b3ca",
+    "@dxos/operation": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca",
+    "@dxos/plugin-attention": "0.8.4-main.937b3ca",
+    "@dxos/plugin-client": "0.8.4-main.937b3ca",
+    "@dxos/plugin-deck": "0.8.4-main.937b3ca",
+    "@dxos/plugin-graph": "0.8.4-main.937b3ca",
+    "@dxos/plugin-preview": "0.8.4-main.937b3ca",
+    "@dxos/plugin-space": "0.8.4-main.937b3ca",
+    "@dxos/plugin-theme": "0.8.4-main.937b3ca",
+    "@dxos/react-client": "0.8.4-main.937b3ca",
+    "@dxos/react-hooks": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-menu": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
+    "@dxos/schema": "0.8.4-main.937b3ca",
+    "@dxos/types": "0.8.4-main.937b3ca",
+    "@dxos/ui": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-mosaic": "0.8.4-main.937b3ca",
+    "@dxos/ui-editor": "0.8.4-main.937b3ca",
+    "@dxos/util": "0.8.4-main.937b3ca"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-storybook-layout": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@dxos/plugin-testing": "0.8.4-main.937b3ca",
+    "@dxos/debug": "0.8.4-main.937b3ca",
+    "@dxos/plugin-theme": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca",
+    "@dxos/random": "0.8.4-main.937b3ca",
+    "@dxos/storybook-utils": "0.8.4-main.937b3ca",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.937b3ca",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -2,127 +2,98 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common, Plugin } from '@dxos/app-framework';
 import { type Obj, Ref } from '@dxos/echo';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
-import { createDocAccessor, getTextInRange } from '@dxos/react-client/echo';
+import { createDocAccessor, getTextInRange } from '@dxos/echo-db';
+import { Operation } from '@dxos/operation';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { type CreateObject } from '@dxos/plugin-space/types';
 import { translations as editorTranslations } from '@dxos/react-ui-editor';
 import { Text } from '@dxos/schema';
 
+import { MarkdownBlueprint } from './blueprints';
 import {
   AnchorSort,
   AppGraphSerializer,
   BlueprintDefinition,
-  IntentResolver,
-  MARKDOWN_BLUEPRINT_KEY,
   MarkdownSettings,
   MarkdownState,
+  OperationResolver,
   ReactSurface,
 } from './capabilities';
-import { MarkdownEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { Markdown, MarkdownAction } from './types';
+import { Markdown, MarkdownEvents, MarkdownOperation } from './types';
 import { serializer } from './util';
 
-export const MarkdownPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, [...translations, ...editorTranslations]),
-  }),
-  defineModule({
-    id: `${meta.id}/module/settings`,
-    activatesOn: Events.SetupSettings,
+export const MarkdownPlugin = Plugin.define(meta).pipe(
+  Common.Plugin.addTranslationsModule({ translations: [...translations, ...editorTranslations] }),
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.SetupSettings,
     activate: MarkdownSettings,
   }),
-  defineModule({
-    id: `${meta.id}/module/state`,
+  Plugin.addModule({
+    id: 'state',
     // TODO(wittjosiah): Does not integrate with settings store.
     //   Should this be a different event?
     //   Should settings store be renamed to be more generic?
-    activatesOn: Events.SetupSettings,
+    activatesOn: Common.ActivationEvent.SetupSettings,
     activate: MarkdownState,
   }),
-  defineModule({
-    id: `${meta.id}/module/metadata`,
-    activatesOn: Events.SetupMetadata,
-    activate: () =>
-      contributes(Capabilities.Metadata, {
-        id: Markdown.Document.typename,
-        metadata: {
-          label: (object: Markdown.Document) => object.name || object.fallbackName,
-          icon: 'ph--text-aa--regular',
-          iconHue: 'indigo',
-          blueprints: [MARKDOWN_BLUEPRINT_KEY],
-          graphProps: {
-            managesAutofocus: true,
-          },
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (doc: Markdown.Document) => await Ref.Array.loadAll<Obj.Any>([doc.content]),
-          serializer,
-          // TODO(wittjosiah): Consider how to do generic comments without these.
-          comments: 'anchored',
-          selectionMode: 'multi-range',
-          getAnchorLabel: (doc: Markdown.Document, anchor: string): string | undefined => {
-            if (doc.content) {
-              const [start, end] = anchor.split(':');
-              return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
-            }
-          },
+  Common.Plugin.addMetadataModule({
+    metadata: {
+      id: Markdown.Document.typename,
+      metadata: {
+        label: (object: Markdown.Document) => object.name || object.fallbackName,
+        icon: 'ph--text-aa--regular',
+        iconHue: 'indigo',
+        blueprints: [MarkdownBlueprint.Key],
+        graphProps: {
+          managesAutofocus: true,
         },
-      }),
+        // TODO(wittjosiah): Move out of metadata.
+        loadReferences: async (doc: Markdown.Document) => await Ref.Array.loadAll<Obj.Unknown>([doc.content]),
+        serializer,
+        // TODO(wittjosiah): Consider how to do generic comments without these.
+        comments: 'anchored',
+        selectionMode: 'multi-range',
+        getAnchorLabel: (doc: Markdown.Document, anchor: string): string | undefined => {
+          if (doc.content) {
+            const [start, end] = anchor.split(':');
+            return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
+          }
+        },
+        createObject: ((props) => Effect.sync(() => Markdown.make(props))) satisfies CreateObject,
+      },
+    },
   }),
-  defineModule({
-    id: `${meta.id}/module/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
+  Common.Plugin.addSchemaModule({ schema: [Markdown.Document, Text.Text] }),
+  Plugin.addModule({
+    id: 'on-space-created',
+    activatesOn: SpaceEvents.SpaceCreated,
     activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: Markdown.Document,
-          getIntent: () => createIntent(MarkdownAction.Create, {}),
-        }),
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(MarkdownOperation.OnCreateSpace, params),
+        ),
       ),
   }),
-  defineModule({
-    id: `${meta.id}/module/schema`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () => contributes(ClientCapabilities.Schema, [Text.Text]),
-  }),
-  defineModule({
-    id: `${meta.id}/module/whitelist-schema`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () => contributes(ClientCapabilities.SchemaWhiteList, [Markdown.Document]),
-  }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    // TODO(wittjosiah): Should occur before the editor is loaded when surfaces activation is more granular.
-    activatesBefore: [MarkdownEvents.SetupExtensions],
+  Common.Plugin.addSurfaceModule({
     activate: ReactSurface,
+    activatesBefore: [MarkdownEvents.SetupExtensions],
   }),
-  defineModule({
-    id: `${meta.id}/module/intent-resolver`,
-    activatesOn: Events.SetupIntentResolver,
-    activate: IntentResolver,
-  }),
-  defineModule({
-    id: `${meta.id}/module/app-graph-serializer`,
-    activatesOn: Events.AppGraphReady,
+  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.AppGraphReady,
     activate: AppGraphSerializer,
   }),
-  defineModule({
-    id: `${meta.id}/module/anchor-sort`,
+  Plugin.addModule({
     // TODO(wittjosiah): More relevant event?
-    activatesOn: Events.AppGraphReady,
+    activatesOn: Common.ActivationEvent.AppGraphReady,
     activate: AnchorSort,
   }),
-  defineModule({
-    id: `${meta.id}/module/blueprint`,
-    activatesOn: Events.SetupArtifactDefinition,
-    activate: BlueprintDefinition,
-  }),
-]);
+  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  Plugin.make,
+);