@gpdoc/cli 1.4.0 → 1.5.0

package/lib/remote.js

@@ -1,5 +1,10 @@
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
+const {
+  convertDocument,
+  detectFormat,
+  readDocument,
+} = await import('@gpdoc/filekit').catch(() => import('../../gpdoc-filekit/src/index.js'));
 
 export class RemoteError extends Error {
   constructor(code, message) {
@@ -49,6 +54,19 @@ function titleFrom(filePath, fallback = 'GPDoc Export') {
   return path.basename(filePath).replace(/\.gpdoc\.md$/i, '').replace(/\.[^.]+$/, '') || fallback;
 }
 
+async function readExportDocument(filePath) {
+  const format = detectFormat(filePath);
+  if (['docx', 'pptx'].includes(format)) return null;
+  return readDocument(await readFile(filePath, 'utf8'), filePath);
+}
+
+function microsoftFilename(filename, title) {
+  const preferred = String(filename || `${title || 'GPDoc Export'}.docx`).trim() || 'GPDoc Export.docx';
+  return /\.docx$/i.test(preferred)
+    ? preferred
+    : `${preferred.replace(/\.[^.]+$/, '')}.docx`;
+}
+
 async function githubToken({ auth, env, fetchImpl }) {
   const token = await auth.getAccessToken();
   const payload = await jsonRequest(fetchImpl, `${apiBase(env)}/.netlify/functions/get-user-profile`, { headers: bearer(token) }, 'GITHUB_IDENTITY_REQUIRED');
@@ -70,7 +88,7 @@ function githubHeaders(token) {
   return { Authorization: `Bearer ${token}`, Accept: 'application/vnd.github+json', 'Content-Type': 'application/json', 'X-GitHub-Api-Version': '2022-11-28' };
 }
 
-// @spec CLI-019, CLI-020, CLI-021, CLI-022, CLI-023, CLI-024, CLI-025
+// @spec CLI-019, CLI-020, CLI-021, CLI-022, CLI-023, CLI-024, CLI-025, CLI-037
 export function createRemoteClient({ auth, env = process.env, fetchImpl = globalThis.fetch } = {}) {
   if (!auth) throw new Error('Remote client requires an auth manager.');
   async function provider(functionName, body, method = 'POST', onProgress) {
@@ -90,10 +108,12 @@ export function createRemoteClient({ auth, env = process.env, fetchImpl = global
     async googleSave({ filePath, title, mode = 'new', driveId, itemId, expectedRevision, filetype = 'document', onProgress }) {
       await auth.getAccessToken();
       onProgress?.({ provider: 'google', stage: 'preparing', current: 1, total: 3, filePath });
-      const markdown = await readFile(filePath, 'utf8');
+      const document = await readExportDocument(filePath);
+      if (!document) throw new RemoteError('GOOGLE_FILE_TYPE_UNSUPPORTED', 'Google Drive upload requires a text-based GPDoc document. Convert Office files before uploading.');
+      const markdown = convertDocument(document, 'markdown');
       onProgress?.({ provider: 'google', stage: 'uploading', current: 2, total: 3, filePath, bytes: Buffer.byteLength(markdown) });
       const payload = await provider('google-drive-source-save', {
-        title: title || titleFrom(filePath), markdown, mode, driveId, itemId, expectedRevision, filetype,
+        title: title || document.title || titleFrom(filePath), markdown, mode, driveId, itemId, expectedRevision, filetype,
       }, 'POST', () => {});
       onProgress?.({ provider: 'google', stage: 'complete', current: 3, total: 3, filePath });
       return { provider: 'google', mode, item: payload.item, warning: payload.warning || null };
@@ -102,11 +122,23 @@ export function createRemoteClient({ auth, env = process.env, fetchImpl = global
     async microsoftSave({ filePath, mode = 'new', driveId, itemId, filename, onProgress }) {
       await auth.getAccessToken();
       onProgress?.({ provider: 'microsoft', stage: 'preparing', current: 1, total: 3, filePath });
-      const bytes = await readFile(filePath);
+      const document = await readExportDocument(filePath);
+      if (document && document.filetype !== 'document') {
+        throw new RemoteError('MICROSOFT_FILE_TYPE_UNSUPPORTED', 'Microsoft 365 CLI export supports GPDoc documents.');
+      }
+      const bytes = document
+        ? Buffer.from(convertDocument(document, 'docx'))
+        : await readFile(filePath);
+      const remoteFilename = document
+        ? microsoftFilename(filename, document.title || titleFrom(filePath))
+        : filename || path.basename(filePath);
+      const remoteMimeType = document
+        ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+        : mimeType(filePath);
       if (bytes.byteLength > 4 * 1024 * 1024) throw new RemoteError('MICROSOFT_FILE_TOO_LARGE', 'Microsoft files must be 4 MiB or smaller.');
       onProgress?.({ provider: 'microsoft', stage: 'uploading', current: 2, total: 3, filePath, bytes: bytes.byteLength });
       const payload = await provider('microsoft-drive-export', {
-        mode, driveId, itemId, filename: filename || path.basename(filePath), mimeType: mimeType(filePath), bytes: bytes.toString('base64'),
+        mode, driveId, itemId, filename: remoteFilename, mimeType: remoteMimeType, bytes: bytes.toString('base64'),
       }, 'POST', () => {});
       onProgress?.({ provider: 'microsoft', stage: 'complete', current: 3, total: 3, filePath });
       return { provider: 'microsoft', mode, item: payload.item || payload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpdoc/cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "type": "module",
   "description": "GPDoc command-line file conversion and validation tools",
   "repository": "https://github.com/repetere/gpdoc.git",