tandem-editor 0.2.6 → 0.2.7

package/dist/cli/index.js

@@ -337,7 +337,7 @@ var init_start = __esm({
 
 // src/cli/index.ts
 import updateNotifier from "update-notifier";
-var version = true ? "0.2.6" : "0.0.0-dev";
+var version = true ? "0.2.7" : "0.0.0-dev";
 updateNotifier({ pkg: { name: "tandem-editor", version } }).notify();
 var args = process.argv.slice(2);
 if (args.includes("--help") || args.includes("-h")) {

package/dist/server/index.js

@@ -60,9 +60,6 @@ function getOrCreateDocument(name) {
   }
   return doc;
 }
-function removeDocument(name) {
-  return documents.delete(name);
-}
 async function startHocuspocus(port) {
   hocuspocusInstance = new Hocuspocus({
     port,
@@ -119,9 +116,6 @@ async function startHocuspocus(port) {
   }
   return hocuspocusInstance;
 }
-function getHocuspocus() {
-  return hocuspocusInstance;
-}
 var hocuspocusInstance, documents, shouldKeepDocument, onDocSwapped, onDocUnloaded;
 var init_provider = __esm({
   "src/server/yjs/provider.ts"() {
@@ -2827,7 +2821,25 @@ async function openFileByPath(filePath, options) {
     };
   }
   if (forceReload) {
-    await forceCloseDocument(id, existing);
+    const doc2 = getDocument(id) ?? getOrCreateDocument(id);
+    const fileName2 = path5.basename(resolved);
+    await clearAndReload(id, doc2, resolved, format, existing);
+    addDoc(id, { id, filePath: resolved, format, readOnly, source: "file" });
+    setActiveDocId(id);
+    broadcastOpenDocs();
+    ensureAutoSave();
+    return {
+      ...buildResult(doc2, {
+        documentId: id,
+        filePath: resolved,
+        fileName: fileName2,
+        format,
+        readOnly,
+        source: "file",
+        restoredFromSession: false
+      }),
+      forceReloaded: true
+    };
   }
   const doc = getOrCreateDocument(id);
   const fileName = path5.basename(resolved);
@@ -2868,7 +2880,7 @@ async function openFileByPath(filePath, options) {
       source: "file",
       restoredFromSession
     }),
-    forceReloaded: forceReload === true
+    forceReloaded: false
   };
 }
 async function openFileFromContent(fileName, content) {
@@ -2908,57 +2920,64 @@ async function openFileFromContent(fileName, content) {
     restoredFromSession: false
   });
 }
-async function forceCloseDocument(id, existing) {
-  console.error(`[Tandem] forceCloseDocument: tearing down ${id}`);
-  let errors = 0;
-  try {
-    detachObservers(id);
-  } catch (err) {
-    errors++;
-    console.error(`[Tandem] forceCloseDocument: detachObservers failed for ${id}:`, err);
-  }
-  try {
-    removeDoc(id);
-    broadcastOpenDocs();
-  } catch (err) {
-    errors++;
-    console.error(`[Tandem] forceCloseDocument: removeDoc/broadcast failed for ${id}:`, err);
-  }
-  try {
-    const hp = getHocuspocus();
-    if (hp) {
-      hp.closeConnections(id);
-      const hpDoc = hp.documents.get(id);
-      if (hpDoc) {
-        hp.documents.delete(id);
-        hpDoc.destroy();
-      }
-      hp.loadingDocuments.delete(id);
-    }
-  } catch (err) {
-    errors++;
-    console.error(`[Tandem] forceCloseDocument: Hocuspocus cleanup failed for ${id}:`, err);
-  }
-  try {
-    const oldDoc = getDocument(id);
-    if (oldDoc) {
-      oldDoc.destroy();
-      removeDocument(id);
-    }
-  } catch (err) {
-    errors++;
-    console.error(`[Tandem] forceCloseDocument: Y.Doc removal failed for ${id}:`, err);
+async function clearAndReload(id, doc, filePath, format, existing) {
+  console.error(`[Tandem] clearAndReload: reloading ${id} from disk`);
+  const isDocx = format === "docx";
+  let preparedHtml;
+  let preparedComments;
+  let preparedContent;
+  if (isDocx) {
+    const buffer3 = await fs3.readFile(filePath);
+    [preparedHtml, preparedComments] = await Promise.all([
+      loadDocx(buffer3),
+      extractDocxComments(buffer3).catch((err) => {
+        console.error(
+          "[docx-comments] Comment extraction failed; document will reload without imported comments:",
+          err
+        );
+        return [];
+      })
+    ]);
+  } else {
+    preparedContent = await fs3.readFile(filePath, "utf-8");
   }
   try {
-    await deleteSession(existing.filePath);
+    doc.transact(() => {
+      const annotations = doc.getMap(Y_MAP_ANNOTATIONS);
+      annotations.forEach((_, k) => annotations.delete(k));
+      const awareness = doc.getMap(Y_MAP_AWARENESS);
+      awareness.forEach((_, k) => awareness.delete(k));
+      const userAwareness = doc.getMap(Y_MAP_USER_AWARENESS);
+      userAwareness.forEach((_, k) => userAwareness.delete(k));
+      if (isDocx && preparedHtml !== void 0) {
+        htmlToYDoc(doc, preparedHtml);
+        if (preparedComments && preparedComments.length > 0) {
+          injectCommentsAsAnnotations(doc, preparedComments);
+        }
+      } else if (format === "md" && preparedContent !== void 0) {
+        loadMarkdown(doc, preparedContent);
+      } else if (preparedContent !== void 0) {
+        populateYDoc(doc, preparedContent);
+      }
+      const meta = doc.getMap(Y_MAP_DOCUMENT_META);
+      meta.set("readOnly", isDocx);
+      meta.set("format", format);
+      meta.set("documentId", id);
+      meta.set("fileName", path5.basename(filePath));
+      meta.set(Y_MAP_SAVED_AT_VERSION, Date.now());
+    }, MCP_ORIGIN);
+    attachObservers(id, doc);
   } catch (err) {
-    errors++;
-    console.error(`[Tandem] forceCloseDocument: deleteSession failed for ${id}:`, err);
+    console.error(
+      `[Tandem] clearAndReload: failed for ${id} (format=${format}). Y.Doc may be in a partially cleared state:`,
+      err
+    );
+    throw err;
   }
-  await new Promise((resolve) => setTimeout(resolve, 100));
-  console.error(
-    `[Tandem] forceCloseDocument: teardown complete for ${id}${errors > 0 ? ` with ${errors} error(s)` : ""}`
-  );
+  await deleteSession(existing.filePath).catch((err) => {
+    console.error(`[Tandem] clearAndReload: deleteSession failed for ${id}:`, err);
+  });
+  console.error(`[Tandem] clearAndReload: complete for ${id}`);
 }
 function initSavedBaseline(doc) {
   const meta = doc.getMap(Y_MAP_DOCUMENT_META);
@@ -3010,6 +3029,10 @@ var init_file_opener = __esm({
     init_constants();
     init_queue();
     init_file_io();
+    init_markdown();
+    init_docx();
+    init_docx_html();
+    init_docx_comments();
     init_manager();
     init_document_model();
     init_document_service();