@dxos/plugin-thread 0.6.10 → 0.6.11-staging.e6894a4

package/dist/lib/browser/{chunk-TL3JITN7.mjs → chunk-GKPZHUT3.mjs}

@@ -9,6 +9,7 @@ var ThreadAction;
   ThreadAction2[ThreadAction2["CREATE"] = `${THREAD_ACTION}/create`] = "CREATE";
   ThreadAction2[ThreadAction2["SELECT"] = `${THREAD_ACTION}/select`] = "SELECT";
   ThreadAction2[ThreadAction2["DELETE"] = `${THREAD_ACTION}/delete`] = "DELETE";
+  ThreadAction2[ThreadAction2["ON_MESSAGE_ADD"] = `${THREAD_ACTION}/on-message-add`] = "ON_MESSAGE_ADD";
   ThreadAction2[ThreadAction2["DELETE_MESSAGE"] = `${THREAD_ACTION}/delete-message`] = "DELETE_MESSAGE";
   ThreadAction2[ThreadAction2["TOGGLE_RESOLVED"] = `${THREAD_ACTION}/toggle-resolved`] = "TOGGLE_RESOLVED";
 })(ThreadAction || (ThreadAction = {}));
@@ -16,4 +17,4 @@ var ThreadAction;
 export {
   ThreadAction
 };
-//# sourceMappingURL=chunk-TL3JITN7.mjs.map
+//# sourceMappingURL=chunk-GKPZHUT3.mjs.map

package/dist/lib/browser/chunk-GKPZHUT3.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/types.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport type {\n  GraphBuilderProvides,\n  IntentResolverProvides,\n  MetadataRecordsProvides,\n  SettingsProvides,\n  SurfaceProvides,\n  TranslationsProvides,\n} from '@dxos/app-framework';\nimport { type SchemaProvides } from '@dxos/plugin-client';\nimport { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';\nimport { type ThreadType } from '@dxos/plugin-space/types';\n\nimport { THREAD_PLUGIN } from './meta';\n\nconst THREAD_ACTION = `${THREAD_PLUGIN}/action`;\nexport enum ThreadAction {\n  CREATE = `${THREAD_ACTION}/create`,\n  SELECT = `${THREAD_ACTION}/select`,\n  DELETE = `${THREAD_ACTION}/delete`,\n  ON_MESSAGE_ADD = `${THREAD_ACTION}/on-message-add`,\n  DELETE_MESSAGE = `${THREAD_ACTION}/delete-message`,\n  TOGGLE_RESOLVED = `${THREAD_ACTION}/toggle-resolved`,\n}\n\n// TODO(Zan): Move this to the plugin-space plugin or another common location\n// when we implement threads in sheets.\nexport type ThreadProvides<T> = {\n  thread: {\n    predicate: (obj: any) => obj is T;\n    createSort: (obj: T) => (anchorA: string, anchorB: string) => number;\n  };\n};\n\nexport type ThreadPluginProvides = SurfaceProvides &\n  IntentResolverProvides &\n  GraphBuilderProvides &\n  MetadataRecordsProvides &\n  SettingsProvides &\n  TranslationsProvides &\n  SchemaProvides &\n  MarkdownExtensionProvides;\n\nexport type ThreadSettingsProps = { standalone?: boolean };\n\nexport interface ThreadModel {\n  root: ThreadType;\n}\n"],
+  "mappings": ";;;;;AAkBA,IAAMA,gBAAgB,GAAGC,aAAAA;;UACbC,eAAAA;0CACD,GAAGF,aAAAA,SAAsB,IAAA;0CACzB,GAAGA,aAAAA,SAAsB,IAAA;0CACzB,GAAGA,aAAAA,SAAsB,IAAA;kDACjB,GAAGA,aAAAA,iBAA8B,IAAA;kDACjC,GAAGA,aAAAA,iBAA8B,IAAA;mDAChC,GAAGA,aAAAA,kBAA+B,IAAA;GAN1CE,iBAAAA,eAAAA,CAAAA,EAAAA;",
+  "names": ["THREAD_ACTION", "THREAD_PLUGIN", "ThreadAction"]
+}

package/dist/lib/browser/index.mjs

@@ -1,6 +1,6 @@
 import {
   ThreadAction
-} from "./chunk-TL3JITN7.mjs";
+} from "./chunk-GKPZHUT3.mjs";
 import {
   ChatContainer,
   ChatHeading,
@@ -20,8 +20,8 @@ import {
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
 import { Chat } from "@phosphor-icons/react";
 import { computed, effect } from "@preact/signals-core";
-import React5 from "react";
-import { LayoutAction, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, parseGraphPlugin, SLUG_PATH_SEPARATOR, SLUG_COLLECTION_INDICATOR, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
+import React5, { useCallback as useCallback2 } from "react";
+import { LayoutAction, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, parseGraphPlugin, SLUG_PATH_SEPARATOR, SLUG_COLLECTION_INDICATOR, isLayoutParts, parseMetadataResolverPlugin, useResolvePlugins } from "@dxos/app-framework";
 import { getTypename } from "@dxos/echo-schema";
 import { create as create2 } from "@dxos/echo-schema";
 import { LocalStorageStore } from "@dxos/local-storage";
@@ -32,7 +32,7 @@ import { DocumentType } from "@dxos/plugin-markdown/types";
 import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { SpaceAction } from "@dxos/plugin-space";
 import { ThreadType, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
-import { getSpace as getSpace2, getTextInRange, Filter, createDocAccessor, fullyQualifiedId, getRangeFromCursor, loadObjectReferences } from "@dxos/react-client/echo";
+import { getSpace as getSpace2, getTextInRange, Filter, createDocAccessor, fullyQualifiedId, loadObjectReferences } from "@dxos/react-client/echo";
 import { ScrollArea } from "@dxos/react-ui";
 import { createAttendableAttributes } from "@dxos/react-ui-attention";
 import { comments, createExternalCommentSync, listener as listener2 } from "@dxos/react-ui-editor";
@@ -591,6 +591,12 @@ var ThreadPlugin = () => {
             case "article":
             case "complementary": {
               const location = navigationPlugin?.provides.location;
+              const providesThreadsConfig = useCallback2((plugin) => (
+                // TODO(Zan): More robust runtime check.
+                "thread" in plugin.provides ? plugin : void 0
+              ), []);
+              const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
+              const threadProvides = threadsIntegrators.map((p) => p.provides.thread);
               if (data.object instanceof ChannelType && data.object.threads[0]) {
                 const channel = data.object;
                 if (isLayoutParts(location?.active) && location.active.main) {
@@ -609,39 +615,27 @@ var ThreadPlugin = () => {
                   thread: data.object.threads[0]
                 });
               }
-              if (data.subject instanceof DocumentType) {
-                const doc = data.subject;
-                const accessor = doc.content ? createDocAccessor(doc.content, [
-                  "content"
-                ]) : void 0;
-                if (!accessor) {
-                  return null;
+              if (data.subject instanceof ThreadType) {
+                return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(ChatHeading, {
+                  attendableId: data.subject.id
+                }), /* @__PURE__ */ React5.createElement(ChatContainer, {
+                  thread: data.subject
+                }));
+              }
+              if (data.subject && typeof data.subject === "object" && "threads" in data.subject && Array.isArray(data.subject.threads)) {
+                const threads = data.subject.threads.concat(state.staging[fullyQualifiedId(data.subject)]).filter(nonNullable2);
+                const createSort = threadProvides.find((p) => p.predicate(data.subject))?.createSort;
+                if (createSort) {
+                  const sort = createSort(data.subject);
+                  threads.sort((a, b) => sort(a.anchor, b.anchor));
                 }
-                const getStartPosition = (cursor) => {
-                  const range = cursor ? getRangeFromCursor(accessor, cursor) : void 0;
-                  return range?.start ?? Number.MAX_SAFE_INTEGER;
-                };
-                const threads = doc.threads.concat(state.staging[data.subject.id]).filter(nonNullable2).sort((a, b) => getStartPosition(a.anchor) - getStartPosition(b.anchor));
                 const detached = data.subject.threads.filter(nonNullable2).filter(({ anchor }) => !anchor).map((thread) => thread.id);
-                const qualifiedSubjectId = fullyQualifiedId(doc);
+                const qualifiedSubjectId = fullyQualifiedId(data.subject);
                 const attention = attentionPlugin?.provides.attention?.attended ?? /* @__PURE__ */ new Set([
                   qualifiedSubjectId
                 ]);
                 const attendableAttrs = createAttendableAttributes(qualifiedSubjectId);
-                const space = getSpace2(doc);
                 const { showResolvedThreads } = getViewState(qualifiedSubjectId);
-                const dispatchAnalytic = (name, meta) => {
-                  void dispatch?.({
-                    action: ObservabilityAction.SEND_EVENT,
-                    data: {
-                      name,
-                      properties: {
-                        ...meta,
-                        space: space?.id
-                      }
-                    }
-                  });
-                };
                 return /* @__PURE__ */ React5.createElement("div", {
                   role: "none",
                   className: "contents group/attention",
@@ -673,7 +667,7 @@ var ThreadPlugin = () => {
                     plugin: THREAD_PLUGIN,
                     action: ThreadAction.DELETE,
                     data: {
-                      document: data.subject,
+                      subject: data.subject,
                       thread
                     }
                   }),
@@ -681,7 +675,7 @@ var ThreadPlugin = () => {
                     plugin: THREAD_PLUGIN,
                     action: ThreadAction.DELETE_MESSAGE,
                     data: {
-                      document: data.subject,
+                      subject: data.subject,
                       thread,
                       messageId
                     }
@@ -694,32 +688,18 @@ var ThreadPlugin = () => {
                     }
                   }),
                   onComment: (thread) => {
-                    const doc2 = data.subject;
-                    if (state.staging[doc2.id]?.find((t) => t === thread)) {
-                      thread.status = "active";
-                      doc2.threads ? doc2.threads.push(thread) : doc2.threads = [
-                        thread
-                      ];
-                      state.staging[doc2.id] = state.staging[doc2.id]?.filter((t) => t.id !== thread.id);
-                      dispatchAnalytic("threads.thread-created", {
-                        threadId: thread.id
-                      });
-                    }
-                    dispatchAnalytic("threads.message-added", {
-                      threadId: thread.id,
-                      threadLength: thread.messages.length
+                    void intentPlugin?.provides.intent.dispatch({
+                      action: ThreadAction.ON_MESSAGE_ADD,
+                      data: {
+                        thread,
+                        subject: data.subject
+                      }
                     });
                   }
                 }), /* @__PURE__ */ React5.createElement("div", {
                   role: "none",
                   className: "bs-10"
                 }), /* @__PURE__ */ React5.createElement(ScrollArea.Scrollbar, null, /* @__PURE__ */ React5.createElement(ScrollArea.Thumb, null)))));
-              } else if (data.subject instanceof ThreadType) {
-                return /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(ChatHeading, {
-                  attendableId: data.subject.id
-                }), /* @__PURE__ */ React5.createElement(ChatContainer, {
-                  thread: data.subject
-                }));
               }
             }
           }
@@ -730,15 +710,64 @@ var ThreadPlugin = () => {
         resolver: async (intent) => {
           switch (intent.action) {
             case ThreadAction.CREATE: {
-              return {
-                data: create2(ChannelType, {
-                  threads: [
-                    create2(ThreadType, {
-                      messages: []
-                    })
+              if (intent.data && intent.data.cursor !== void 0) {
+                const { cursor, name, subject } = intent.data;
+                const subjectId = fullyQualifiedId(subject);
+                const thread = create2(ThreadType, {
+                  name,
+                  anchor: cursor,
+                  messages: [],
+                  status: "staged"
+                });
+                const stagingArea = state.staging[subjectId];
+                if (stagingArea) {
+                  stagingArea.push(thread);
+                } else {
+                  state.staging[subjectId] = [
+                    thread
+                  ];
+                }
+                return {
+                  data: thread,
+                  intents: [
+                    [
+                      {
+                        action: NavigationAction.OPEN,
+                        data: {
+                          activeParts: {
+                            complementary: `${subjectId}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
+                          }
+                        }
+                      },
+                      {
+                        action: ThreadAction.SELECT,
+                        data: {
+                          current: thread.id,
+                          focus: true
+                        }
+                      },
+                      {
+                        action: LayoutAction.SET_LAYOUT,
+                        data: {
+                          element: "complementary",
+                          subject: subjectId,
+                          state: true
+                        }
+                      }
+                    ]
                   ]
-                })
-              };
+                };
+              } else {
+                return {
+                  data: create2(ChannelType, {
+                    threads: [
+                      create2(ThreadType, {
+                        messages: []
+                      })
+                    ]
+                  })
+                };
+              }
             }
             case ThreadAction.SELECT: {
               state.focus = intent.data?.current === state.current ? state.focus : intent.data?.focus;
@@ -777,27 +806,28 @@ var ThreadPlugin = () => {
               };
             }
             case ThreadAction.DELETE: {
-              const { document: doc, thread } = intent.data ?? {};
-              if (!(doc instanceof DocumentType) || !(thread instanceof ThreadType)) {
+              const { subject, thread } = intent.data ?? {};
+              if (!(subject instanceof DocumentType) || !(thread instanceof ThreadType)) {
                 return;
               }
-              const stagingArea = state.staging[doc.id];
+              const subjectId = fullyQualifiedId(subject);
+              const stagingArea = state.staging[subjectId];
               if (stagingArea) {
-                const index = state.staging[doc.id]?.findIndex((t) => t.id === thread.id);
+                const index = stagingArea.findIndex((t) => t.id === thread.id);
                 if (index !== -1) {
-                  state.staging[doc.id]?.splice(index, 1);
+                  stagingArea.splice(index, 1);
                   return;
                 }
               }
               const space = getSpace2(thread);
-              if (!space || !doc.threads) {
+              if (!space || !subject.threads) {
                 return;
               }
               if (!intent.undo) {
-                const index = doc.threads.findIndex((t) => t?.id === thread.id);
-                const cursor = doc.threads[index]?.anchor;
+                const index = subject.threads.findIndex((t) => t?.id === thread.id);
+                const cursor = subject.threads[index]?.anchor;
                 if (index !== -1) {
-                  doc.threads?.splice(index, 1);
+                  subject.threads?.splice(index, 1);
                 }
                 space.db.remove(thread);
                 return {
@@ -824,7 +854,7 @@ var ThreadPlugin = () => {
                 };
               } else if (intent.undo) {
                 const savedThread = space.db.add(thread);
-                doc.threads.push(savedThread);
+                subject.threads.push(savedThread);
                 return {
                   data: true,
                   intents: [
@@ -845,10 +875,53 @@ var ThreadPlugin = () => {
               }
               break;
             }
+            case ThreadAction.ON_MESSAGE_ADD: {
+              const { thread, subject } = intent.data ?? {};
+              if (!(thread instanceof ThreadType) || !(subject && typeof subject === "object" && "threads" in subject)) {
+                return;
+              }
+              const subjectId = fullyQualifiedId(subject);
+              const space = getSpace2(subject);
+              const intents = [];
+              const analyticsProperties = {
+                threadId: thread.id,
+                spaceId: space?.id
+              };
+              if (state.staging[subjectId]?.find((t) => t === thread)) {
+                thread.status = "active";
+                subject.threads ? subject.threads.push(thread) : subject.threads = [
+                  thread
+                ];
+                state.staging[subjectId] = state.staging[subjectId]?.filter((t) => t.id !== thread.id);
+                intents.push({
+                  action: ObservabilityAction.SEND_EVENT,
+                  data: {
+                    name: "threads.thread-created",
+                    properties: analyticsProperties
+                  }
+                });
+              }
+              intents.push({
+                action: ObservabilityAction.SEND_EVENT,
+                data: {
+                  name: "threads.message-added",
+                  properties: {
+                    ...analyticsProperties,
+                    threadLength: thread.messages.length
+                  }
+                }
+              });
+              return {
+                data: thread,
+                intents: [
+                  intents
+                ]
+              };
+            }
             case ThreadAction.DELETE_MESSAGE: {
-              const { document: doc, thread, messageId } = intent.data ?? {};
-              const space = getSpace2(doc);
-              if (!(doc instanceof DocumentType) || !(thread instanceof ThreadType) || !space) {
+              const { subject, thread, messageId } = intent.data ?? {};
+              const space = getSpace2(subject);
+              if (!(subject instanceof DocumentType) || !(thread instanceof ThreadType) || !space) {
                 return;
               }
               if (!intent.undo) {
@@ -864,7 +937,7 @@ var ThreadPlugin = () => {
                         {
                           action: ThreadAction.DELETE,
                           data: {
-                            document: doc,
+                            subject,
                             thread
                           }
                         }
@@ -937,7 +1010,7 @@ var ThreadPlugin = () => {
           }
           const threads = computed(() => [
             ...doc.threads.filter(nonNullable2),
-            ...state.staging[doc.id] ?? []
+            ...state.staging[fullyQualifiedId(doc)] ?? []
           ].filter((thread) => !(thread?.status === "resolved")));
           return [
             listener2({
@@ -966,49 +1039,17 @@ var ThreadPlugin = () => {
                 const name = doc.content && getTextInRange(createDocAccessor(doc.content, [
                   "content"
                 ]), start, end);
-                const thread = create2(ThreadType, {
-                  name,
-                  anchor: cursor,
-                  messages: [],
-                  status: "staged"
-                });
-                const stagingArea = state.staging[doc.id];
-                if (stagingArea) {
-                  stagingArea.push(thread);
-                } else {
-                  state.staging[doc.id] = [
-                    thread
-                  ];
-                }
-                void intentPlugin?.provides.intent.dispatch([
-                  {
-                    action: NavigationAction.OPEN,
-                    data: {
-                      activeParts: {
-                        complementary: `${fullyQualifiedId(doc)}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
-                      }
-                    }
-                  },
-                  {
-                    action: ThreadAction.SELECT,
-                    data: {
-                      current: thread.id,
-                      focus: true
-                    }
-                  },
-                  {
-                    action: LayoutAction.SET_LAYOUT,
-                    data: {
-                      element: "complementary",
-                      subject: doc,
-                      state: true
-                    }
+                void intentPlugin?.provides.intent.dispatch({
+                  action: ThreadAction.CREATE,
+                  data: {
+                    cursor,
+                    name,
+                    subject: doc
                   }
-                ]);
-                return thread.id;
+                });
               },
               onDelete: ({ id }) => {
-                const stagingArea = state.staging[doc.id];
+                const stagingArea = state.staging[fullyQualifiedId(doc)];
                 if (stagingArea) {
                   const index = stagingArea.findIndex((thread2) => thread2.id === id);
                   if (index !== -1) {
@@ -1021,7 +1062,7 @@ var ThreadPlugin = () => {
                 }
               },
               onUpdate: ({ id, cursor }) => {
-                const thread = state.staging[doc.id]?.find((thread2) => thread2.id === id) ?? doc.threads.find((thread2) => thread2?.id === id);
+                const thread = state.staging[fullyQualifiedId(doc)]?.find((thread2) => thread2.id === id) ?? doc.threads.find((thread2) => thread2?.id === id);
                 if (thread instanceof ThreadType && thread.anchor) {
                   const [start, end] = thread.anchor.split(":");
                   thread.name = doc.content && getTextInRange(createDocAccessor(doc.content, [