collabmd 0.1.46 → 0.1.48

package/src/client/export/export-host.js

@@ -3,7 +3,7 @@ import { resolveAppUrl } from '../infrastructure/runtime-config.js';
 const EXPORT_PAGE_SOURCE = 'collabmd-export-page';
 const EXPORT_HOST_SOURCE = 'collabmd-export-host';
 const EXPORT_JOB_CLOSE_POLL_MS = 500;
-const EXPORT_JOB_TIMEOUT_MS = 60_000;
+const EXPORT_JOB_TIMEOUT_MS = 300_000;
 const pendingJobs = new Map();
 let exportBridgeErrorHandler = null;
 
@@ -12,34 +12,32 @@ function createJobId() {
 }
 
 function normalizeFormat(format) {
-  return format === 'pdf' ? 'pdf' : 'docx';
-}
-
-function buildExportUrl({ filePath, format, jobId }) {
-  const url = new URL(resolveAppUrl('/export-document.html'), window.location.origin);
-  url.searchParams.set('action', normalizeFormat(format));
-  url.searchParams.set('job', jobId);
-  if (filePath) {
-    url.searchParams.set('file', filePath);
-  }
-  return url.toString();
+  return ['html', 'pdf'].includes(format) ? format : 'docx';
 }
 
 function createBootstrapPayload({
+  currentFilePath = '',
+  currentMarkdownText = '',
+  directoryPath = '',
   fileList = [],
   filePath,
   format,
   jobId,
   markdownText = '',
+  theme = 'light',
   title = '',
 }) {
   return {
     action: normalizeFormat(format),
+    currentFilePath: String(currentFilePath ?? ''),
+    currentMarkdownText: String(currentMarkdownText ?? ''),
+    directoryPath: String(directoryPath ?? ''),
     fileList: Array.isArray(fileList) ? fileList.slice() : [],
     filePath: String(filePath ?? ''),
     jobId,
     markdownText: String(markdownText ?? ''),
     source: EXPORT_HOST_SOURCE,
+    theme: theme === 'dark' ? 'dark' : 'light',
     title: String(title ?? ''),
     type: 'bootstrap',
   };
@@ -136,26 +134,9 @@ export function initializeExportBridge({
   window.__collabmdExportBridgeInitialized = true;
 }
 
-export async function exportDocument({
-  fileList = [],
-  filePath,
-  format,
-  markdownText = '',
-  title = '',
-} = {}) {
-  const normalizedFilePath = String(filePath ?? '').trim();
-  if (!normalizedFilePath) {
-    throw new Error('No markdown note is open');
-  }
-
+async function startExport(payload) {
   const jobId = createJobId();
-  const url = buildExportUrl({
-    filePath: normalizedFilePath,
-    format,
-    jobId,
-  });
-
-  const exportWindow = window.open(url, '_blank');
+  const exportWindow = globalThis.open('', jobId);
   if (!exportWindow) {
     throw new Error('Export popup was blocked');
   }
@@ -172,12 +153,9 @@ export async function exportDocument({
       });
     }, EXPORT_JOB_CLOSE_POLL_MS),
     payload: createBootstrapPayload({
-      fileList,
-      filePath: normalizedFilePath,
-      format,
+      ...payload,
       jobId,
-      markdownText,
-      title,
+      theme: document.documentElement.dataset.theme,
     }),
     timeoutId: window.setTimeout(() => {
       finishPendingJob(jobId, {
@@ -188,6 +166,49 @@ export async function exportDocument({
     window: exportWindow,
   });
 
+  exportWindow.location.replace(resolveAppUrl('/export-document.html'));
   exportWindow.focus?.();
   return jobId;
 }
+
+export async function exportDirectory({
+  currentFilePath = '',
+  currentMarkdownText = '',
+  directoryPath,
+  fileList = [],
+  format,
+} = {}) {
+  const normalizedDirectoryPath = String(directoryPath ?? '').replace(/\\/gu, '/').replace(/^\/+|\/+$/gu, '').trim();
+  if (!normalizedDirectoryPath) {
+    throw new Error('No folder was selected');
+  }
+
+  return startExport({
+    currentFilePath,
+    currentMarkdownText,
+    directoryPath: normalizedDirectoryPath,
+    fileList,
+    format,
+  });
+}
+
+export async function exportDocument({
+  fileList = [],
+  filePath,
+  format,
+  markdownText = '',
+  title = '',
+} = {}) {
+  const normalizedFilePath = String(filePath ?? '').trim();
+  if (!normalizedFilePath) {
+    throw new Error('No markdown note is open');
+  }
+
+  return startExport({
+    fileList,
+    filePath: normalizedFilePath,
+    format,
+    markdownText,
+    title,
+  });
+}

package/src/client/export/export-page.js

@@ -1,5 +1,6 @@
 import {
   postExportPageMessage,
+  prepareDirectoryExportSnapshot,
   prepareExportSnapshot,
   runExportAdapter,
   waitForBootstrapPayload,
@@ -7,6 +8,10 @@ import {
 } from './export-pipeline.js';
 import { groupHeadingWithFollowingBlock } from './export-print-layout.js';
 
+function getExportJobId() {
+  return new URLSearchParams(window.location.search).get('job') || window.name || '';
+}
+
 function setStatus(message) {
   const status = document.getElementById('exportStatus');
   if (status) {
@@ -38,7 +43,8 @@ function renderSnapshot(snapshot) {
   }
 
   document.title = `${snapshot.title} — Export`;
-  mount.innerHTML = snapshot.html;
+  const parsed = new DOMParser().parseFromString(`<body>${snapshot.html}</body>`, 'text/html');
+  mount.replaceChildren(...parsed.body.childNodes);
   groupHeadingWithFollowingBlock(mount);
   renderWarnings(snapshot);
   return mount;
@@ -48,18 +54,26 @@ async function bootstrap() {
   try {
     setStatus('Loading export content…');
     const payload = await waitForBootstrapPayload();
-    const snapshot = await prepareExportSnapshot(payload);
+    document.documentElement.dataset.theme = payload.theme;
+    document.body.dataset.theme = payload.theme;
+    const snapshot = payload.directoryPath
+      ? await prepareDirectoryExportSnapshot(payload)
+      : await prepareExportSnapshot(payload);
     const mount = renderSnapshot(snapshot);
     snapshot.html = await waitForRenderedExportContent(mount);
-    setStatus(payload.action === 'pdf' ? 'Opening print dialog…' : 'Preparing DOCX download…');
+    setStatus(payload.action === 'pdf'
+      ? 'Opening print dialog…'
+      : `Preparing ${payload.action.toUpperCase()} download…`);
     await runExportAdapter(snapshot, payload.action);
-    setStatus(payload.action === 'pdf' ? 'Print dialog opened.' : 'DOCX download started.');
-    postExportPageMessage('complete', { jobId: new URL(window.location.href).searchParams.get('job') || '' });
+    setStatus(payload.action === 'pdf'
+      ? 'Print dialog opened.'
+      : `${payload.action.toUpperCase()} download started.`);
+    postExportPageMessage('complete', { jobId: getExportJobId() });
   } catch (error) {
     const message = error instanceof Error ? error.message : 'Export failed';
     setStatus(message);
     postExportPageMessage('error', {
-      jobId: new URL(window.location.href).searchParams.get('job') || '',
+      jobId: getExportJobId(),
       message,
     });
   }