@dxos/plugin-thread 0.8.4-main.2c6827d → 0.8.4-main.3c1ae3b

package/dist/lib/node-esm/{markdown-GG5566TL.mjs → markdown-MC5OP2UR.mjs}

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   ThreadAction
-} from "./chunk-MEIWWPR2.mjs";
+} from "./chunk-P2M364TO.mjs";
 import {
   ThreadCapabilities
 } from "./chunk-RT6NRL2I.mjs";
@@ -21,7 +21,8 @@ import { EditorView } from "@codemirror/view";
 import { computed, effect } from "@preact/signals-core";
 import { createIntent } from "@dxos/app-framework";
 import { Filter, Obj, Query, Relation } from "@dxos/echo";
-import { createDocAccessor, getSource, getSpace, getTextInRange } from "@dxos/react-client/echo";
+import { createDocAccessor, getTextInRange } from "@dxos/echo-db";
+import { getSpace } from "@dxos/react-client/echo";
 import { comments, createExternalCommentSync } from "@dxos/react-ui-editor";
 import { AnchoredTo, Thread } from "@dxos/types";
 var getName = (doc, anchor) => {
@@ -39,9 +40,9 @@ var threads = (state, doc, dispatch) => {
       comments()
     ];
   }
-  const query = space.db.query(Query.select(Filter.ids(doc.id)).targetOf(AnchoredTo.AnchoredTo));
+  const query = space.db.query(Query.select(Filter.id(doc.id)).targetOf(AnchoredTo.AnchoredTo));
   const unsubscribe = query.subscribe();
-  const anchors = computed(() => query.objects.filter((anchor) => {
+  const anchors = computed(() => query.results.filter((anchor) => {
     const thread = Relation.getSource(anchor);
     return Obj.instanceOf(Thread.Thread, thread) && thread.status !== "resolved";
   }).concat(state.drafts[Obj.getDXN(doc).toString()] ?? []));
@@ -86,7 +87,7 @@ var threads = (state, doc, dispatch) => {
             draft.splice(index, 1);
           }
         }
-        const thread = query.objects.find((object) => getSource(object).id === id);
+        const thread = query.results.find((object) => Relation.getSource(object).id === id);
         if (thread) {
           thread.anchor = void 0;
         }
@@ -98,9 +99,9 @@ var threads = (state, doc, dispatch) => {
           thread.name = getName(doc, cursor);
           draft.anchor = cursor;
         }
-        const relation = query.objects.find((object) => getSource(object).id === id);
+        const relation = query.results.find((object) => Relation.getSource(object).id === id);
         if (relation) {
-          const thread = getSource(relation);
+          const thread = Relation.getSource(relation);
           if (Obj.instanceOf(Thread.Thread, thread)) {
             thread.name = getName(doc, cursor);
             relation.anchor = cursor;
@@ -169,4 +170,4 @@ var selectionOverlapsComment = (state) => {
 export {
   markdown_default as default
 };
-//# sourceMappingURL=markdown-GG5566TL.mjs.map
+//# sourceMappingURL=markdown-MC5OP2UR.mjs.map

package/dist/lib/node-esm/markdown-MC5OP2UR.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/markdown.ts", "../../../src/extensions/threads.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { EditorView } from '@codemirror/view';\n\nimport { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';\nimport { Obj } from '@dxos/echo';\nimport { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';\nimport { MarkdownCapabilities } from '@dxos/plugin-markdown';\nimport { type EditorState, commentClickedEffect, commentsState, overlap } from '@dxos/react-ui-editor';\n\nimport { threads } from '../extensions';\n\nimport { ThreadCapabilities } from './capabilities';\n\nexport default (context: PluginContext) =>\n  contributes(MarkdownCapabilities.Extensions, [\n    ({ document: doc }) => {\n      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n      const { state } = context.getCapability(ThreadCapabilities.MutableState);\n      return threads(state, doc, dispatch);\n    },\n    ({ document: doc }) => {\n      if (!doc) return [];\n      const { state } = context.getCapability(ThreadCapabilities.MutableState);\n\n      return EditorView.updateListener.of((update) => {\n        if (update.docChanged || update.selectionSet) {\n          state.toolbar[Obj.getDXN(doc).toString()] = selectionOverlapsComment(update.state);\n        }\n      });\n    },\n    ({ document: doc }) => {\n      if (!doc) return [];\n      const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n      const id = Obj.getDXN(doc).toString();\n\n      return EditorView.updateListener.of((update) => {\n        update.transactions.forEach((transaction) => {\n          transaction.effects.forEach(async (effect) => {\n            if (effect.is(commentClickedEffect)) {\n              void dispatch(\n                createIntent(DeckAction.ChangeCompanion, {\n                  primary: id,\n                  companion: `${id}${ATTENDABLE_PATH_SEPARATOR}comments`,\n                }),\n              );\n            }\n          });\n        });\n      });\n    },\n  ]);\n\nconst selectionOverlapsComment = (state: EditorState): boolean => {\n  // May not be defined if thread plugin not installed.\n  const commentState = state.field(commentsState, false);\n  if (commentState === undefined) {\n    return false;\n  }\n\n  const { selection } = state;\n  for (const range of selection.ranges) {\n    if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {\n      return true;\n    }\n  }\n\n  return false;\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Extension } from '@codemirror/state';\nimport { EditorView } from '@codemirror/view';\nimport { computed, effect } from '@preact/signals-core';\n\nimport { type PromiseIntentDispatcher, createIntent } from '@dxos/app-framework';\nimport { Filter, Obj, Query, Relation } from '@dxos/echo';\nimport { createDocAccessor, getTextInRange } from '@dxos/echo-db';\nimport { type Markdown } from '@dxos/plugin-markdown/types';\nimport { getSpace } from '@dxos/react-client/echo';\nimport { comments, createExternalCommentSync } from '@dxos/react-ui-editor';\nimport { AnchoredTo, Thread } from '@dxos/types';\n\nimport { ThreadAction, type ThreadState } from '../types';\n\n// TODO(burdon): Factor out.\nconst getName = (doc: Markdown.Document, anchor: string): string | undefined => {\n  if (doc.content) {\n    const [start, end] = anchor.split(':');\n    return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);\n  }\n};\n\n/**\n * Construct plugins.\n */\nexport const threads = (state: ThreadState, doc?: Markdown.Document, dispatch?: PromiseIntentDispatcher): Extension => {\n  const space = getSpace(doc);\n  if (!doc || !space || !dispatch) {\n    // Include no-op comments extension here to ensure that the facets are always present when they are expected.\n    // TODO(wittjosiah): The Editor should only look for these facets when comments are available.\n    return [comments()];\n  }\n\n  const query = space.db.query(Query.select(Filter.id(doc.id)).targetOf(AnchoredTo.AnchoredTo));\n  const unsubscribe = query.subscribe();\n\n  const anchors = computed(() =>\n    query.results\n      .filter((anchor) => {\n        const thread = Relation.getSource(anchor);\n        return Obj.instanceOf(Thread.Thread, thread) && thread.status !== 'resolved';\n      })\n      .concat(state.drafts[Obj.getDXN(doc).toString()] ?? []),\n  );\n\n  return [\n    EditorView.domEventHandlers({\n      destroy: () => {\n        unsubscribe();\n      },\n    }),\n\n    EditorView.updateListener.of((update) => {\n      if (update.docChanged) {\n        anchors.value.forEach((anchor) => {\n          if (anchor.anchor) {\n            // Only update if the name has changed, otherwise this will cause an infinite loop.\n            // Skip if the name is empty; this means comment text was deleted, but thread name should remain.\n            const name = getName(doc, anchor.anchor);\n            const thread = Relation.getSource(anchor) as Thread.Thread;\n            if (name && name !== thread.name) {\n              thread.name = name;\n            }\n          }\n        });\n      }\n    }),\n\n    createExternalCommentSync(\n      Obj.getDXN(doc).toString(),\n      (sink) => effect(() => sink()),\n      () =>\n        anchors.value\n          .filter((anchor) => anchor.anchor)\n          .map((anchor) => ({\n            id: Obj.getDXN(Relation.getSource(anchor)).toString(),\n            cursor: anchor.anchor,\n          })),\n    ),\n\n    comments({\n      id: Obj.getDXN(doc).toString(),\n      onCreate: ({ cursor }) => {\n        const name = getName(doc, cursor);\n        void dispatch(\n          createIntent(ThreadAction.Create, {\n            anchor: cursor,\n            name,\n            subject: doc,\n          }),\n        );\n      },\n      onDelete: ({ id }) => {\n        const draft = state.drafts[Obj.getDXN(doc).toString()];\n        if (draft) {\n          const index = draft.findIndex((thread) => Obj.getDXN(thread).toString() === id);\n          if (index !== -1) {\n            draft.splice(index, 1);\n          }\n        }\n\n        const thread = query.results.find((object) => Relation.getSource(object).id === id);\n        if (thread) {\n          thread.anchor = undefined;\n        }\n      },\n      onUpdate: ({ id, cursor }) => {\n        const draft = state.drafts[Obj.getDXN(doc).toString()]?.find((thread) => Obj.getDXN(thread).toString() === id);\n        if (draft) {\n          const thread = Relation.getSource(draft) as Thread.Thread;\n          thread.name = getName(doc, cursor);\n          draft.anchor = cursor;\n        }\n\n        const relation = query.results.find((object) => Relation.getSource(object).id === id);\n        if (relation) {\n          const thread = Relation.getSource(relation);\n          if (Obj.instanceOf(Thread.Thread, thread)) {\n            thread.name = getName(doc, cursor);\n            relation.anchor = cursor;\n          }\n        }\n      },\n      onSelect: ({ selection }) => {\n        const current = selection.current ?? selection.closest;\n        if (current) {\n          void dispatch(createIntent(ThreadAction.Select, { current }));\n        }\n      },\n    }),\n  ];\n};\n"],
+  "mappings": "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",
+  "names": ["EditorView", "Capabilities", "contributes", "createIntent", "Obj", "ATTENDABLE_PATH_SEPARATOR", "DeckAction", "MarkdownCapabilities", "commentClickedEffect", "commentsState", "overlap", "EditorView", "computed", "effect", "createIntent", "Filter", "Obj", "Query", "Relation", "createDocAccessor", "getTextInRange", "getSpace", "comments", "createExternalCommentSync", "AnchoredTo", "Thread", "getName", "doc", "anchor", "content", "start", "end", "split", "getTextInRange", "createDocAccessor", "target", "threads", "state", "dispatch", "space", "getSpace", "comments", "query", "db", "Query", "select", "Filter", "id", "targetOf", "AnchoredTo", "unsubscribe", "subscribe", "anchors", "computed", "results", "filter", "thread", "Relation", "getSource", "Obj", "instanceOf", "Thread", "status", "concat", "drafts", "getDXN", "toString", "EditorView", "domEventHandlers", "destroy", "updateListener", "of", "update", "docChanged", "value", "forEach", "name", "createExternalCommentSync", "sink", "effect", "map", "cursor", "onCreate", "createIntent", "ThreadAction", "Create", "subject", "onDelete", "draft", "index", "findIndex", "splice", "find", "object", "undefined", "onUpdate", "relation", "onSelect", "selection", "current", "closest", "Select", "context", "contributes", "MarkdownCapabilities", "Extensions", "document", "doc", "dispatchPromise", "dispatch", "getCapability", "Capabilities", "IntentDispatcher", "state", "ThreadCapabilities", "MutableState", "threads", "EditorView", "updateListener", "of", "update", "docChanged", "selectionSet", "toolbar", "Obj", "getDXN", "toString", "selectionOverlapsComment", "id", "transactions", "forEach", "transaction", "effects", "effect", "is", "commentClickedEffect", "createIntent", "DeckAction", "ChangeCompanion", "primary", "companion", "ATTENDABLE_PATH_SEPARATOR", "commentState", "field", "commentsState", "undefined", "selection", "range", "ranges", "comments", "some", "commentRange", "overlap"]
+}