@iwonz/ywtc 3.4.1 → 3.5.0

package/dist/migrator.js

@@ -1,8 +1,10 @@
 import { createHash } from 'node:crypto';
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 import PQueue from 'p-queue';
 import { createProviderAdapter } from './adapters/factory.js';
+import { secretValues } from './config.js';
 import { appendGridSnapshots, assertDestinationContent, emptyRendererFallbackReason, isLegacyTransferPlaceholder, normalizePageContent, normalizedPreviewHtml, rawContentFallback, renderedPreviewHtml, renderConfluenceStorage, renderYfm, setSourceResourceBinding, sourceResourceBindings, verifyDestinationContent, } from './content-model.js';
 import { commentAttachmentUses, createCommentArchiveZip, renderCommentArchive, renderCommentArchiveIndex, resolveCommentAttachmentReferences, verifyCommentArchive, } from './comments.js';
 import { ConfirmedDestinationMissingError, verifyConfirmedDestinationPage } from './consistency.js';
@@ -186,6 +188,19 @@ function destinationFromState(state, adapter) {
     };
 }
 function reportPage(input) {
+    const inventory = input.commentInventory;
+    const commentResourceIds = new Set();
+    for (const thread of inventory?.threads ?? []) {
+        const stack = [thread.root];
+        while (stack.length > 0) {
+            const entry = stack.pop();
+            for (const attachment of entry.attachments) {
+                if (attachment.resourceId)
+                    commentResourceIds.add(attachment.resourceId);
+            }
+            stack.push(...entry.replies);
+        }
+    }
     const transferable = input.resources.filter((resource) => resource.kind !== 'grid');
     const resourceItems = transferable.map((resource) => {
         const state = input.resourceStates?.[resource.id];
@@ -194,12 +209,16 @@ function reportPage(input) {
         return {
             sourceId: resource.id,
             sourceName: resource.name,
-            kind: resource.kind,
+            ...(resource.downloadUrl ? { sourceUrl: resource.downloadUrl } : {}),
+            ...(resource.referenceAliases?.[0] ? { sourceReference: resource.referenceAliases[0] } : {}),
+            kind: commentResourceIds.has(resource.id) ? 'comment-attachment' : resource.kind,
             status,
             ...(sourceBytes !== undefined ? { sourceBytes } : {}),
             ...(status === 'complete' && sourceBytes !== undefined ? { transferredBytes: sourceBytes } : {}),
             ...(state?.destinationId ? { destinationId: state.destinationId } : {}),
             ...(state?.destinationName ? { destinationName: state.destinationName } : {}),
+            ...(state?.destinationUrl ? { destinationUrl: state.destinationUrl } : {}),
+            ...(state?.sha256 ? { sha256: state.sha256 } : {}),
             ...(state?.lastError ? { error: state.lastError } : {}),
             ...(status === 'blocked' && input.blockedBy ? input.blockedBy : {}),
         };
@@ -207,24 +226,57 @@ function reportPage(input) {
     const knownBytes = resourceItems.reduce((total, resource) => total + (resource.sourceBytes ?? 0), 0);
     const transferredBytes = resourceItems.reduce((total, resource) => total + (resource.transferredBytes ?? 0), 0);
     const commentsEnabled = input.commentsEnabled ?? true;
-    const inventory = input.commentInventory;
     const commentState = input.commentState;
     const commentStatus = !commentsEnabled
         ? 'skipped'
         : commentState?.status
             ?? (inventory?.status === 'failed' ? 'failed' : inventory?.status === 'empty' ? 'complete' : 'planned');
     const commentError = commentState?.lastError ?? inventory?.error;
+    const commentItems = inventory?.threads.flatMap((thread) => {
+        const result = [];
+        const visit = (entry) => {
+            const author = entry.author.displayName
+                ?? entry.author.username
+                ?? entry.author.publicName
+                ?? entry.author.providerId;
+            result.push({
+                threadId: thread.id,
+                commentId: entry.id,
+                ...(entry.parentId ? { parentId: entry.parentId } : {}),
+                author,
+                ...(entry.createdAt ? { createdAt: entry.createdAt } : {}),
+                ...(entry.status ? { sourceStatus: entry.status } : {}),
+                outcome: commentStatus,
+                sourceUrl: `${input.page.url}#comment-${encodeURIComponent(entry.id)}`,
+                ...(commentState?.destinationUrl ? { destinationUrl: commentState.destinationUrl } : {}),
+                ...(commentError ? { error: commentError } : {}),
+            });
+            for (const reply of entry.replies)
+                visit(reply);
+        };
+        visit(thread.root);
+        return result;
+    });
     return {
         sourceCanonicalId: input.page.canonicalId,
         sourceId: input.page.id,
         sourceTitle: input.page.title,
         sourceUrl: input.page.url,
+        ...(input.page.parentId ? { sourceParentId: input.page.parentId } : {}),
+        ...(input.page.ancestorIds?.length ? { sourceAncestorIds: input.page.ancestorIds } : {}),
         ...(input.destination ? {
             destinationId: input.destination.id,
             destinationTitle: input.destination.title,
             destinationUrl: input.destination.url,
+            ...(input.destination.parentId ? { destinationParentId: input.destination.parentId } : {}),
         } : {}),
-        ...(input.page.projectedParentId ? { parentId: input.page.projectedParentId } : {}),
+        ...(input.destinationFile ? {
+            destinationId: input.destinationFile.id,
+            destinationTitle: input.page.title,
+            destinationUrl: input.destinationFile.url,
+            ...(input.destinationFile.parentId ? { destinationParentId: input.destinationFile.parentId } : {}),
+        } : {}),
+        ...(input.page.projectedParentId ? { parentId: input.page.projectedParentId, projectedParentId: input.page.projectedParentId } : {}),
         depth: input.page.depth,
         status: input.status,
         inventoryStatus: input.inventoryStatus ?? 'complete',
@@ -252,11 +304,14 @@ function reportPage(input) {
             attachments: commentState?.attachments ?? inventory?.attachments ?? 0,
             bytes: commentState?.bytes ?? inventory?.knownBytes ?? 0,
             ...(commentState?.archiveName ? { archiveName: commentState.archiveName } : {}),
+            ...(commentState?.archiveUrl ? { archiveUrl: commentState.archiveUrl } : {}),
             ...(commentState?.destinationId ? { destinationId: commentState.destinationId } : {}),
+            ...(commentState?.destinationUrl ? { destinationUrl: commentState.destinationUrl } : {}),
             ...(commentState?.previousDestinationIds?.length ? { revision: true } : {}),
             ...(commentState?.status === 'stale' ? { stale: true } : {}),
             ...(commentError ? { error: commentError } : {}),
             ...(commentState?.preview ? { preview: commentState.preview } : {}),
+            ...(commentItems?.length ? { items: commentItems } : {}),
             ...(commentStatus === 'blocked' && input.blockedBy ? input.blockedBy : {}),
         },
     };
@@ -380,6 +435,7 @@ export class Migrator {
             await store.save();
         const run = await store.beginRun(options.scope, options.dryRun, sourceStatus, commentsEnabled);
         const report = new TransferReport({
+            secrets: secretValues(this.config),
             dryRun: options.dryRun,
             commentsEnabled,
             scope: options.scope,
@@ -590,6 +646,8 @@ export class Migrator {
                 const result = await this.exportFilesystem(source, graph, options.destination, options, stateLocation.id, store, report, sourceFingerprints, resourcesByPage, commentsByPage);
                 output = result.directory;
                 archive = result.archive;
+                const exportEntry = path.join(result.directory, options.destination.format === 'html' ? 'index.html' : 'index.md');
+                report.setDestinationUrl(pathToFileURL(exportEntry).toString());
                 report.output('directory', result.directory);
                 if (result.archive)
                     report.output('archive', result.archive);
@@ -684,6 +742,7 @@ export class Migrator {
                         sourceName: sourceResource?.name ?? resource.name,
                         destinationId: resource.path,
                         destinationName: resource.name,
+                        destinationUrl: pathToFileURL(path.join(destination.path, resource.path)).toString(),
                         ...(resource.sha256 ? { sha256: resource.sha256 } : {}),
                         ...(resource.size !== undefined ? { size: resource.size } : {}),
                         status: options.dryRun ? 'planned' : 'complete',
@@ -722,8 +781,16 @@ export class Migrator {
                     } } : {}),
                 updatedAt: new Date().toISOString(),
             });
+            const parentManifestPage = manifestPage?.parentId
+                ? result.manifest.pages.find((item) => item.sourceCanonicalId === manifestPage.parentId)
+                : undefined;
             report.addPage(reportPage({
                 page,
+                ...(manifestPage ? { destinationFile: {
+                        id: manifestPage.path,
+                        url: pathToFileURL(path.join(destination.path, manifestPage.path)).toString(),
+                        ...(parentManifestPage ? { parentId: parentManifestPage.path } : {}),
+                    } } : {}),
                 status: pageStatus,
                 resources: sourceResources,
                 document,
@@ -928,6 +995,7 @@ export class Migrator {
             const archiveState = zip ? {
                 ...(archiveResource ? { archiveResourceId: archiveResource.id } : {}),
                 archiveName: archiveResource?.name ?? zip.name,
+                ...(archiveResource?.url ? { archiveUrl: archiveResource.url } : {}),
                 archivePath: zip.path,
                 archiveSha256: zip.sha256,
             } : {};
@@ -1047,6 +1115,7 @@ export class Migrator {
                 fingerprint,
                 destinationId: verified.id,
                 destinationFingerprint: verified.fingerprint,
+                ...(verified.url ? { destinationUrl: verified.url } : {}),
                 ...(previousIds?.length ? { previousDestinationIds: previousIds } : {}),
                 ...archiveState,
                 ...fullArchiveState,
@@ -1535,6 +1604,7 @@ export class Migrator {
                                 sourceName: resource.name,
                                 destinationId: mappedRemote.id,
                                 destinationName: mappedRemote.name,
+                                ...(mappedRemote.url ? { destinationUrl: mappedRemote.url } : {}),
                                 sha256: downloaded.sha256,
                                 size: downloaded.size,
                                 cachePath: downloaded.path,
@@ -1558,6 +1628,7 @@ export class Migrator {
                                 sourceName: resource.name,
                                 destinationId: reconciled.id,
                                 destinationName: reconciled.name,
+                                ...(reconciled.url ? { destinationUrl: reconciled.url } : {}),
                                 sha256: downloaded.sha256,
                                 size: downloaded.size,
                                 cachePath: downloaded.path,
@@ -1621,6 +1692,7 @@ export class Migrator {
                             sourceName: resource.name,
                             destinationId: result.id,
                             destinationName: result.name,
+                            ...(result.url ? { destinationUrl: result.url } : {}),
                             sha256: downloaded.sha256,
                             size: downloaded.size,
                             cachePath: downloaded.path,