progress on 2-pass link updates

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -540,12 +540,17 @@ export const updateLinks = (
   spaceChanges: ConfluenceSpaceChange[],
   server: string,
   parent: ConfluenceParent
-): ConfluenceSpaceChange[] => {
+): {
+  pass1Changes: ConfluenceSpaceChange[];
+  pass2Changes: ConfluenceSpaceChange[];
+} => {
   const root = `${server}`;
   const url = `${ensureTrailingSlash(server)}wiki/spaces/${
     parent.space
   }/pages/`;
 
+  let collectedPass2Changes: ConfluenceSpaceChange[] = [];
+
   const changeMapper = (
     changeToProcess: ConfluenceSpaceChange
   ): ConfluenceSpaceChange => {
@@ -598,6 +603,9 @@ export const updateLinks = (
         updated = updated.replace(linkFullFileName, pagePath);
       } else {
         console.warn(`Link not found for ${siteFilePath}`);
+        if (!collectedPass2Changes.includes(changeToProcess)) {
+          collectedPass2Changes = [...collectedPass2Changes, changeToProcess];
+        }
       }
 
       return updated;
@@ -621,7 +629,7 @@ export const updateLinks = (
   const updatedChanges: ConfluenceSpaceChange[] =
     spaceChanges.map(changeMapper);
 
-  return updatedChanges;
+  return { pass1Changes: updatedChanges, pass2Changes: collectedPass2Changes };
 };
 
 export const updateImagePaths = (body: ContentBody): ContentBody => {

src/publish/confluence/confluence.ts

@@ -571,7 +571,7 @@ async function publish(
       parent: parentId,
     };
 
-    const existingSite: SitePage[] = await fetchExistingSite(parentId);
+    let existingSite: SitePage[] = await fetchExistingSite(parentId);
 
     const publishFiles: PublishFiles = await renderSite(render);
     const metadataByInput: Record<string, InputMetadata> =
@@ -620,7 +620,8 @@ async function publish(
 
     trace("fileMetadata", fileMetadata);
 
-    const metadataByFilename = buildFileToMetaTable(existingSite);
+    let metadataByFilename = buildFileToMetaTable(existingSite);
+    console.log("metadataByFilename", metadataByFilename);
 
     trace("metadataByFilename", metadataByFilename);
 
@@ -631,13 +632,15 @@ async function publish(
       existingSite
     );
 
-    changeList = updateLinks(
+    const { pass1Changes, pass2Changes } = updateLinks(
       metadataByFilename,
       changeList,
       server,
       siteParent
     );
 
+    changeList = pass1Changes;
+
     trace("changelist", changeList);
 
     let pathsToId: Record<string, string> = {}; // build from existing site
@@ -704,8 +707,27 @@ async function publish(
       await doChange(currentChange);
     }
 
-    const parentPage: Content = await client.getContent(parentId);
+    if (pass2Changes.length) {
+      //PASS #2 to update links to newly created pages
+      console.log("do pass 2 link updates");
+
+      // reload the existing site
+      existingSite = await fetchExistingSite(parentId);
+      metadataByFilename = buildFileToMetaTable(existingSite);
+
+      console.log("metadataByFilename", metadataByFilename);
+      console.log("pass2Changes", pass2Changes);
 
+      const pass2Result = updateLinks(
+        metadataByFilename,
+        pass2Changes,
+        server,
+        parent
+      );
+      console.log("pass2Changes after", pass2Result);
+    }
+
+    const parentPage: Content = await client.getContent(parentId);
     return buildPublishRecordForContent(server, parentPage);
   };
 

tests/unit/confluence.test.ts

@@ -3,7 +3,6 @@
  * Copyright (C) 2020 by RStudio, PBC
  *
  */
-import { posix, win32 } from "path/mod.ts";
 import { unitTest } from "../test.ts";
 import { assertEquals, assertThrows } from "testing/asserts.ts";
 
@@ -3357,14 +3356,22 @@ const runUpdateLinks = () => {
   };
 
   const check = (
-    expected: ConfluenceSpaceChange[],
+    expectedPass1Changes: ConfluenceSpaceChange[],
     changes: ConfluenceSpaceChange[],
     fileMetadataTable: Record<string, SitePage>,
     server = "fake-server",
-    parent = FAKE_PARENT
+    parent = FAKE_PARENT,
+    expectedPass2Changes: ConfluenceSpaceChange[] = []
   ) => {
-    const result = updateLinks(fileMetadataTable, changes, server, parent);
-    assertEquals(expected, result);
+    const { pass1Changes, pass2Changes } = updateLinks(
+      fileMetadataTable,
+      changes,
+      server,
+      parent
+    );
+
+    assertEquals(expectedPass1Changes, pass1Changes);
+    assertEquals(expectedPass2Changes, pass2Changes);
   };
 
   test(suiteLabel("no_files"), async () => {
@@ -3392,7 +3399,15 @@ const runUpdateLinks = () => {
       },
     };
     const expected: ConfluenceSpaceChange[] = [expectedUpdate];
-    check(expected, changes, fileMetadataTable);
+    const expectedPass2Changes: ConfluenceSpaceChange[] = [expectedUpdate];
+    check(
+      expected,
+      changes,
+      fileMetadataTable,
+      "fake-server",
+      FAKE_PARENT,
+      expectedPass2Changes
+    );
   });
 
   test(suiteLabel("one_update_link_nested_dot_slash"), async () => {
@@ -3459,7 +3474,15 @@ const runUpdateLinks = () => {
       },
     };
     const expected: ConfluenceSpaceChange[] = [expectedUpdate];
-    check(expected, changes, fileMetadataTable);
+    const expectedSecondPassChanges: ConfluenceSpaceChange[] = [expectedUpdate];
+    check(
+      expected,
+      changes,
+      fileMetadataTable,
+      "fake-server",
+      FAKE_PARENT,
+      expectedSecondPassChanges
+    );
   });
 
   test(suiteLabel("one_change_several_update_links"), async () => {
@@ -3475,7 +3498,15 @@ const runUpdateLinks = () => {
       },
     };
     const expected: ConfluenceSpaceChange[] = [expectedUpdate];
-    check(expected, changes, fileMetadataTable);
+    const expectedSecondPassChanges: ConfluenceSpaceChange[] = [expectedUpdate];
+    check(
+      expected,
+      changes,
+      fileMetadataTable,
+      "fake-server",
+      FAKE_PARENT,
+      expectedSecondPassChanges
+    );
   });
 
   test(suiteLabel("two_changes_several_update_links"), async () => {
@@ -3507,7 +3538,18 @@ const runUpdateLinks = () => {
       expectedUpdateSeveralLinks,
       expectedUpdateOneLink,
     ];
-    check(expected, changes, fileMetadataTable);
+    const expectedSecondPassChanges: ConfluenceSpaceChange[] = [
+      expectedUpdateSeveralLinks,
+      expectedUpdateOneLink,
+    ];
+    check(
+      expected,
+      changes,
+      fileMetadataTable,
+      "fake-server",
+      FAKE_PARENT,
+      expectedSecondPassChanges
+    );
   });
 };
 
@@ -3801,5 +3843,5 @@ if (RUN_ALL_TESTS) {
   runUpdateImagePathsForContentBody();
   runCapFirstLetter();
 } else {
-  runSpaceCreatesWithNesting();
+  runUpdateLinks();
 }